diff -Nru libxfce4ui-4.8.1/aclocal.m4 libxfce4ui-4.12.1/aclocal.m4 --- libxfce4ui-4.8.1/aclocal.m4 2011-12-23 16:12:55.000000000 +0000 +++ libxfce4ui-4.12.1/aclocal.m4 2015-03-15 18:14:46.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. 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'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -336,7 +337,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -456,7567 +456,8007 @@ fi]) -dnl -*- mode: autoconf -*- +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 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. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# serial 1 +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], [ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled 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]) +]) - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) - fi - fi +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# 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_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[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` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac +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 --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi +$$1_PKG_ERRORS -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - 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 $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.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 $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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 $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.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 $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.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 $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + 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. -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) +_PKG_TEXT -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -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 - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +To get pkg-config, see .])[]dnl + ]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR -IT_PO_SUBDIR([po]) -]) +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # -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 executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl +# 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. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 +# Copyright (C) 2001-2013 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. +# 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. -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # -# This file is part of GNU Libtool. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir # -# GNU Libtool 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. +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. # -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# serial 57 LT_INIT +# AM_CONDITIONAL -*- Autoconf -*- +# Copyright (C) 1997-2013 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. -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) +# Copyright (C) 1999-2013 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. -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -_LT_SETUP + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) +# Generate code to set up dependency tracking. -*- Autoconf -*- -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS +# Copyright (C) 1999-2013 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. -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a +# Do all the work for Automake. -*- Autoconf -*- -with_gnu_ld="$lt_cv_prog_gnu_ld" +# Copyright (C) 1996-2013 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. -old_CC="$CC" -old_CFLAGS="$CFLAGS" +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) -_LT_CC_BASENAME([$compiler]) +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo fi - ;; -esac +fi +AC_SUBST([CYGPATH_W]) -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +# Copyright (C) 2001-2013 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. -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) +# Copyright (C) 2003-2013 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. +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) +# Copyright (C) 1996-2013 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. +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) +# Check to see how 'make' treats includes. -*- Autoconf -*- +# Copyright (C) 2001-2013 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. -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# Copyright (C) 1997-2013 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. +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi ]) +# Helper functions for option handling. -*- Autoconf -*- -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - +# Copyright (C) 2001-2013 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. -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) +# Copyright (C) 1999-2013 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. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) +# Copyright (C) 2001-2013 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. -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) +# Copyright (C) 1996-2013 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. +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # 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". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - +# 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. -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +# 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], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +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 +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) +# 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. +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) +# Copyright (C) 2006-2013 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. +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# Check how to create a tarball. -*- Autoconf -*- -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) +# Copyright (C) 2004-2013 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. +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + [pax], + [], -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' + [m4_fatal([Unknown tar format])]) -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} + AC_MSG_CHECKING([how to create a $1 tar archive]) -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false ;; esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. +dnl -*- mode: autoconf -*- -Usage: $[0] [[OPTIONS]] +# serial 2 - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -Report bugs to ." + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. + dnl check for tools we added during development + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG -_LT_EOF +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ;; - esac - - _LT_PROG_LTMAIN + *) + ;; +esac - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi - _LT_PROG_REPLACE_SHELLFNS +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +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 + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) +IT_PO_SUBDIR([po]) -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG +]) -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +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 executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -m4_ifndef([AC_PROG_GO], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# 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. -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) +m4_define([_LT_COPYING], [dnl +# Copyright (C) 2014 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. -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) +# GNU Libtool 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 of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 . +]) -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +# serial 58 LT_INIT -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac +]) -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl +_LT_SETUP -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi +# _LT_CC_BASENAME(CC) +# ------------------- +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. +m4_defun([_LT_CC_BASENAME], +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST fi -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} +_LT_CHECK_OBJDIR -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; +m4_require([_LT_TAG_COMPILER])dnl + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; esac -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) +# Global variables: +ofile=libtool +can_build_shared=yes -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +with_gnu_ld=$lt_cv_prog_gnu_ld -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +old_CC=$CC +old_CFLAGS=$CFLAGS -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; +_LT_CC_BASENAME([$compiler]) -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC fi - rm -rf conftest* ;; esac -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from 'configure', and 'config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain=$ac_aux_dir/ltmain.sh +])# _LT_PROG_LTMAIN -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the 'libtool' +# label. -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) ]) -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) +# _LT_FORMAT_COMMENT([COMMENT]) +# ----------------------------- +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl ]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) -#if HAVE_DLFCN_H -#include -#endif -#include +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags='_LT_TAGS'dnl +]) - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* +_LT_OUTPUT_LIBTOOL_INIT ]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# '#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test 0 = "$lt_write_fail" && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR +lt_cl_help="\ +'$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. +Usage: $[0] [[OPTIONS]] -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) +Report bugs to ." -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; +while test 0 != $[#] +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try '$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try '$[0] --help' for more information.]) ;; esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB +_LTEOF +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test yes = "$silent" && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; +_LT_COPYING +_LT_LIBTOOL_TAGS -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no +_LT_EOF - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes + cat <<'_LT_EOF' >> "$cfgfile" - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac +# ### END FUNCTIONS SHARED WITH CONFIGURE - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; +_LT_EOF - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF ;; esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; + _LT_PROG_LTMAIN -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -rdos*) - dynamic_linker=no - ;; +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS=$save_LDFLAGS + ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} _LT_EOF - fi ;; - esac - fi - break + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else - MAGIC_CMD=: + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + m4_if([$1], [CXX], +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) fi -])# _LT_PATH_MAGIC +])# _LT_SYS_MODULE_PATH_AIX -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 /dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - AC_MSG_RESULT(no) + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -_LT_PATH_LD_GNU -AC_SUBST([LD]) -_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) -])# LT_PATH_LD +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} -# Old names: -AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) -AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_LD], []) -dnl AC_DEFUN([AC_PROG_LD], []) +case $ECHO in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) -# _LT_PATH_LD_GNU -#- -------------- -m4_defun([_LT_PATH_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 @], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], +[], [with_sysroot=no]) -beos*) - lt_cv_deplibs_check_method=pass_all - ;; +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([$with_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac -bsdi[[45]]*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and where our libraries should be installed.])]) -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test no = "$enable_libtool_lock" || enable_libtool_lock=yes -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac fi + rm -rf conftest* ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* ;; -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* ;; -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; esac - else - lt_cv_deplibs_check_method=pass_all fi + rm -rf conftest* ;; -gnu*) - lt_cv_deplibs_check_method=pass_all +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* ;; +esac -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; +need_locks=$enable_libtool_lock +])# _LT_ENABLE_LOCK -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; - pc) - lt_cv_deplibs_check_method=pass_all + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - ;; + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* ]) -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac +if test yes = "[$]$2"; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) fi +])# _LT_COMPILER_OPTION -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS +]) -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test yes = "[$]$2"; then + m4_if([$4], , :, [$4]) else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi + m4_if([$5], , :, [$5]) fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM +])# _LT_LINKER_OPTION -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring=ABCD + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +]) +if test -n "$lt_cv_sys_max_cmd_len"; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes = "$cross_compiling"; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac +#if HAVE_DLFCN_H +#include +#endif -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +#include -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* 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@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -#ifdef __cplusplus -extern "C" { -#endif + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; - cat <<_LT_EOF >> conftest.$ac_ext + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen=shl_load], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen=dlopen], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) + ]) + ]) + ]) + ]) + ]) + ;; + esac -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 + enable_dlopen=yes fi - rm -rf conftest* conftst* - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then + + # We can hardcode non-existent directories. + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +} +]])# _LT_PREPARE_PATH_LIST + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ;; esac fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + sys_lib_dlsearch_path_spec='/usr/lib' + ;; - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test no = "$dynamic_linker" && can_build_shared=no - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) +])# _LT_SYS_DYNAMIC_LINKER - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program that can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac fi - ;; + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac]) +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac + +# _LT_PATH_MAGIC +# -------------- +# find a file program that can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test no = "$withval" || with_gnu_ld=yes], + [with_gnu_ld=no])dnl - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac + test yes != "$with_gnu_ld" && break ;; esac - ;; + fi + done + IFS=$lt_save_ifs +else + lt_cv_path_LD=$LD # Let the user override the test with a path. +fi]) +LD=$lt_cv_path_LD +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +_LT_PATH_LD_GNU +AC_SUBST([LD]) + +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) +])# LT_PATH_LD + +# Old names: +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_LD], []) +dnl AC_DEFUN([AC_PROG_LD], []) + + +# _LT_PATH_LD_GNU +#- -------------- +m4_defun([_LT_PATH_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, +[# I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +# _LT_CHECK_MAGIC_METHOD +# ---------------------- +# how to check for library dependencies +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_MAGIC_METHOD], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +AC_CACHE_CHECK([how to recognize dependent libraries], +lt_cv_deplibs_check_method, +[lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +case $host_os in +aix[[4-9]]*) + lt_cv_deplibs_check_method=pass_all + ;; - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; +beos*) + lt_cv_deplibs_check_method=pass_all + ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +bsdi[[45]]*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac + else + lt_cv_deplibs_check_method=pass_all fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; -esac + esac + ;; -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ncr) + lt_cv_deplibs_check_method=pass_all ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all ;; esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` fi ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; esac +fi - _LT_TAGVAR(ld_shlibs, $1)=yes +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; *) - lt_use_gnu_ld_interface=yes + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags ;; + esac + ;; esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi]) +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi + *) + DUMPBIN=: ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM=-lm) + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + # Check to see that the pipe works correctly. + pipe_works=no - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + rm -f "$nlist"T fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* 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 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; +#ifdef __cplusplus +extern "C" { +#endif - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + cat <<_LT_EOF >> conftest.$ac_ext - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= - *nto* | *qnx*) - ;; +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac ;; - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ;; esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64, which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; esac fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) +], +[ + if test yes = "$GCC"; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -# Source file extension for C++ test sources. -ac_ext=cpp + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac + ;; - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + ;; - if test "$GXX" = yes; then - # Set up default GNU C++ configuration + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - LT_PATH_LD + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - else - GXX=no - with_gnu_ld=no - wlarc= - fi + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + esac - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(ld_shlibs, $1)=yes - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; esac ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) + *) + lt_use_gnu_ld_interface=yes ;; + esac + fi - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' +_LT_EOF + fi + ;; - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes ;; + esac + ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; + case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; esac - ;; + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - lynxos*) - # FIXME: insert proper C++ library support +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else _LT_TAGVAR(ld_shlibs, $1)=no - ;; + fi + ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +_LT_EOF ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - openbsd2*) - # C++ shared libraries are fairly broken + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else _LT_TAGVAR(ld_shlibs, $1)=no - ;; + fi + ;; + esac - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(ld_shlibs, $1)=no + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi - ;; + aix_use_runtimelinking=no - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + if test yes = "$GCC"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - output_verbose_link_cmd='func_echo_all' + hpux9*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + linux*) case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; esac ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - _LT_CONFIG($1) - fi # test -n "$compiler" + *nto* | *qnx*) + ;; - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + osf3*) + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf 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). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - 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_cnf -])# _LT_FUNC_STRIPNAME_CNF + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; - *) ;; # Ignore the rest. + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes + if test yes,yes = "$GCC,$enable_shared"; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting $shlibpath_var if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC=$CC +AC_LANG_PUSH(C) -# Source file extension for f77 test sources. -ac_ext=f +# Source file extension for C test sources. +ac_ext=c -# Object file extension for compiled f77 test sources. +# Object file extension for compiled C test sources. objext=o _LT_TAGVAR(objext, $1)=$objext -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) + # Report what library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; - _LT_CONFIG($1) - fi # test -n "$compiler" + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) + _LT_CONFIG($1) +fi AC_LANG_POP -])# _LT_LANG_F77_CONFIG - +CC=$lt_save_CC +])# _LT_LANG_C_CONFIG -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes fi +AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported _LT_TAGVAR(hardcode_automatic, $1)=no _LT_TAGVAR(inherit_rpath, $1)=no _LT_TAGVAR(module_cmds, $1)= @@ -8029,30 +8469,23 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} +# Source file extension for C++ test sources. +ac_ext=cpp -# Object file extension for compiled fc test sources. +# Object file extension for compiled C++ test sources. objext=o _LT_TAGVAR(objext, $1)=$objext # No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) +# the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" + lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -8062,2506 +8495,2700 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC + lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test yes = "$GXX"; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + if test yes = "$GXX"; then + # Set up default GNU C++ configuration - _LT_CONFIG($1) - fi # test -n "$compiler" + LT_PATH_LD - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -AC_LANG_POP -])# _LT_LANG_FC_CONFIG + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='$wl' -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= -# Source file extension for Java test sources. -ac_ext=java + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" + else + GXX=no + with_gnu_ld=no + wlarc= + fi -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + aix_use_runtimelinking=no -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + if test yes = "$GXX"; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_CONFIG($1) -fi + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; -AC_LANG_RESTORE + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; -# Source file extension for Go test sources. -ac_ext=go + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + hpux10*|hpux11*) + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac - _LT_CONFIG($1) -fi + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -AC_LANG_RESTORE + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' -# Source file extension for RC test sources. -ac_ext=rc + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + output_verbose_link_cmd='func_echo_all' -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require '-G' NOT '-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' + runpath_var='LD_RUN_PATH' -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no ;; esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS - -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# 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 7 ltoptions.m4 -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_CONFIG($1) + fi # test -n "$compiler" -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test yes != "$_lt_caught_CXX_error" +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf 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). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + for p in `eval "$output_verbose_link_cmd"`; do + case $prev$p in + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test x-L = "$p" || + test x-R = "$p"; then + prev=$p + continue + fi -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test no = "$pre_test_object_deps_done"; then + case $prev in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)=$prev$p + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" + fi + fi + prev= + ;; + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) + if test no = "$pre_test_object_deps_done"; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)=$p + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)=$p + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) + *) ;; # Ignore the rest. -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + esac + done + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= ;; esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test no = "$F77"; then + _lt_disable_F77=yes +fi -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) +# Source file extension for f77 test sources. +ac_ext=f -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_F77"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_CONFIG($1) + fi # test -n "$compiler" + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) +AC_LANG_POP +])# _LT_LANG_F77_CONFIG -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) +if test -z "$FC" || test no = "$FC"; then + _lt_disable_FC=yes +fi -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test yes != "$_lt_disable_FC"; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) + AC_MSG_CHECKING([whether to build shared libraries]) + test no = "$can_build_shared" && enable_shared=no -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# 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. + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + AC_MSG_RESULT([$enable_static]) -# serial 6 ltsugar.m4 + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_CONFIG($1) + fi # test -n "$compiler" -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_FC" +AC_LANG_POP +])# _LT_LANG_FC_CONFIG -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) +# Source file extension for Java test sources. +ac_ext=java +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + _LT_CONFIG($1) +fi -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) +AC_LANG_RESTORE +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) +# Source file extension for Go test sources. +ac_ext=go -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# 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. +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -# @configure_input@ +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# 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. +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)=$LD +_LT_CC_BASENAME([$compiler]) -# serial 5 lt~obsolete.m4 +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + _LT_CONFIG($1) +fi -# 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. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +AC_LANG_RESTORE -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG -AC_PREREQ([2.50]) -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled 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]) -]) +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to 'libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# Source file extension for RC test sources. +ac_ext=rc -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# 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_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# Code to be used in simple link tests +lt_simple_link_test_code=$lt_simple_compile_test_code -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[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` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG -pkg_failed=no -AC_MSG_CHECKING([for $1]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -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 --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: -$$1_PKG_ERRORS +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - 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 +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) ]) -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f "$lt_ac_sed" && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test 10 -lt "$lt_ac_count" && break + lt_ac_count=`expr $lt_ac_count + 1` + if test "$lt_ac_count" -gt "$lt_ac_max"; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef -# Copyright (C) 2001, 2003, 2005 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. +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine what file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac ]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl -# AM_CONDITIONAL -*- Autoconf -*- +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Helper functions for option handling. -*- Autoconf -*- # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # -# 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. +# 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 10 +# serial 8 ltoptions.m4 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option '$2'])])[]dnl +]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl ]) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) + ]) +])# _LT_SET_OPTIONS -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) -# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) -#serial 5 -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# 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. +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'dlopen' option into LT_INIT's first parameter.]) +]) -# serial 8 +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# Do all the work for Automake. -*- Autoconf -*- +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac -# serial 16 +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.]) +]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -# Copyright (C) 2003, 2005 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. + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC -# serial 2 +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) -# serial 5 -# AM_MAINTAINER_MODE([DEFAULT-MODE]) + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL -# Check to see how 'make' treats includes. -*- Autoconf -*- +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'fast-install' option into LT_INIT's first parameter.]) +]) -# serial 4 +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the 'disable-fast-install' option into LT_INIT's first parameter.]) +]) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix ;; esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' +# LT_INIT options. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac], + [pic_mode=m4_default([$1], [default])]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC -# serial 6 +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'pic-only' option into LT_INIT's first parameter.]) ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# 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. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# 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 6 +# serial 6 ltsugar.m4 -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -# Copyright (C) 2003, 2004, 2005, 2006 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. -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59, which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) -# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 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. +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# serial 5 +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # 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". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -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. +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) -# 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 +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# ltversion.m4 -- version numbers -*- Autoconf -*- # -# 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. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 # -# 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. +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. -# serial 2 +# @configure_input@ -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# serial 4179 ltversion.m4 +# This file is part of GNU Libtool -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) -# Check how to create a tarball. -*- Autoconf -*- +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.6' +macro_revision='2.4.6' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# 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. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. -# serial 2 +# serial 5 lt~obsolete.m4 -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# These exist entirely to fool aclocal when bootstrapping libtool. # -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. # -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -10589,7 +11216,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) @@ -10763,30 +11390,6 @@ -dnl BM_DEPEND(varname, package, version) -dnl -dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept -dnl for backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND], -[ - XDT_CHECK_PACKAGE([$1], [$2], [$3]) -]) - - - -dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default) -dnl -dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_DEPEND_CHECK], -[ - XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6]) -]) - - - dnl XDT_CHECK_LIBX11() dnl dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS @@ -10923,69 +11526,7 @@ ]) - -dnl BM_LIBX11() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11], -[ - AC_REQUIRE([XDT_CHECK_LIBX11]) -]) - - - -dnl BM_LIBX11_REQUIRE() -dnl -dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBX11_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE]) -]) - - - -dnl BM_LIBSM() -dnl -dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBSM], -[ - AC_REQUIRE([XDT_CHECK_LIBSM]) -]) - - - -dnl BM_LIBXPM -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward -dnl compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM]) -]) - - - -dnl BM_LIBXPM_REQUIRE -dnl -dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for -dnl backward compatibility. Will be removed in the future. -dnl -AC_DEFUN([BM_LIBXPM_REQUIRE], -[ - AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE]) -]) - - -dnl $Id$ -dnl -dnl Copyright (c) 2002-2006 +dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. dnl dnl Written for Xfce by Benedikt Meurer . @@ -11013,7 +11554,7 @@ dnl We need recent a autoconf version -AC_PREREQ([2.53]) +AC_PREREQ([2.60]) dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS) @@ -11027,7 +11568,7 @@ AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) CFLAGS="$saved_CFLAGS" AC_MSG_RESULT([$flag_supported]) @@ -11061,10 +11602,10 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -11104,7 +11645,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" AC_MSG_RESULT([no]) else AC_MSG_RESULT([minimum]) @@ -11131,7 +11672,7 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -11144,7 +11685,7 @@ test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) @@ -11205,87 +11746,7 @@ fi ]) -dnl BM_DEBUG_SUPPORT() -dnl -AC_DEFUN([BM_DEBUG_SUPPORT], -[ -dnl # --enable-debug - AC_REQUIRE([XDT_FEATURE_DEBUG]) - -dnl # --enable-profiling - AC_ARG_ENABLE([profiling], -AC_HELP_STRING([--enable-profiling], - [Generate extra code to write profile information]) -AC_HELP_STRING([--disable-profiling], - [No extra code for profiling (default)]), - [], [enable_profiling=no]) - - AC_MSG_CHECKING([whether to build with profiling support]) - if test x"$enable_profiling" != x"no"; then - CFLAGS="$CFLAGS -pg" - LDFLAGS="$LDFLAGS -pg" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - -dnl # --enable-gcov - AC_ARG_ENABLE([gcov], -AC_HELP_STRING([--enable-gcov], - [compile with coverage profiling instrumentation (gcc only)]) -AC_HELP_STRING([--disable-gcov], - [do not generate coverage profiling instrumentation (default)]), - [], [enable_gcov=no]) - - AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation]) - if test x"$enable_gcov" != x"no"; then - CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - -dnl # --disable-asserts - AC_ARG_ENABLE([asserts], -AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]), - [], [enable_asserts=yes]) - - AC_MSG_CHECKING([whether to disable assertions]) - if test x"$enable_asserts" = x"no"; then - AC_MSG_RESULT([yes]) - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT" - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" - else - AC_MSG_RESULT([no]) - fi - -dnl # --enable-final - AC_REQUIRE([AC_PROG_LD]) - AC_ARG_ENABLE([final], -AC_HELP_STRING([--enable-final], [Build final version]), - [], [enable_final=yes]) - - AC_MSG_CHECKING([whether to build final version]) - if test x"$enable_final" = x"yes"; then - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether $LD accepts -O1]) - case `$LD -O1 -v 2>&1 . @@ -11361,16 +11822,3 @@ ]) - -dnl BM_I18N(PACKAGE, LINGUAS) -dnl -dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for -dnl backward compatibility. Will be removed in the -dnl future. -dnl -AC_DEFUN([BM_I18N], -[ - XDT_I18N([$2], [$1]) -]) - - diff -Nru libxfce4ui-4.8.1/ChangeLog libxfce4ui-4.12.1/ChangeLog --- libxfce4ui-4.8.1/ChangeLog 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/ChangeLog 2015-03-15 18:14:58.000000000 +0000 @@ -1,250 +1,5919 @@ -commit 93732d0e1f783ad33c2123aafadfd3324de129ed +commit 1964cb1aa084b4f6282c11de4bd897158ee02a10 +Author: Harald Judt +Date: Sun Mar 15 19:13:37 2015 +0100 + + Updates for release + +commit 13b0ef72f8d64b32a69961a798461090901e5aec +Merge: 20ba8d0 2315d06 +Author: Harald Judt +Date: Sun Mar 15 19:11:26 2015 +0100 + + Merge branch 'master' into xfce-4.12 + +commit 2315d06f9680094f3804749c0164aa0af767964a +Author: Harald Judt +Date: Sun Mar 15 19:07:28 2015 +0100 + + Update NEWS + +commit 514641566542f84a3a1dddaf9e5c227c16725720 +Author: Harald Judt +Date: Sun Mar 15 17:47:45 2015 +0100 + + Update translators in xfce4-about + +commit 946e4880ed3b29a66abd8a7e01a1f342014f7833 +Author: Natavan Mirzayeva +Date: Sun Mar 15 06:30:15 2015 +0100 + + I18n: Update translation tr (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 54ad329a22cb7e66eb715c89fd29277b59778aea +Author: Nuno Miguel +Date: Fri Mar 13 18:30:13 2015 +0100 + + I18n: Update translation pt (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7d3ba0e3e1ca24b30987611300db7f8c19a042c2 +Author: Piotr Strębski +Date: Fri Mar 13 18:30:13 2015 +0100 + + I18n: Update translation pl (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 33e8eade8420e21f5ea02fe84b1548edd2dc90f9 +Author: Anonymous +Date: Thu Mar 12 00:30:13 2015 +0100 + + I18n: Update translation lt (82%). + + 140 translated messages, 29 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c59e49a16ee9a92b4fd4f83da8b108560aecd0d4 +Author: Yarema aka Knedlyk +Date: Tue Mar 10 06:30:13 2015 +0100 + + I18n: Update translation uk (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dc63ad31c0e55264be69c13dc5e24b04d8ccb794 +Author: Tobias Bannert +Date: Mon Mar 9 18:30:12 2015 +0100 + + I18n: Update translation de (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 87b69a0015647d873721658d1792ea9bcbb65426 +Author: Theppitak Karoonboonyanan +Date: Mon Mar 9 12:30:12 2015 +0100 + + I18n: Update translation th (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cfd70294ce32360510e811074c72db1e8f214cd9 +Author: 玉堂白鹤 +Date: Mon Mar 9 06:30:13 2015 +0100 + + I18n: Update translation zh_CN (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2e3fccaedb2f21963d0aa6628c94ed8f7ffe8f59 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Mon Mar 9 06:30:13 2015 +0100 + + I18n: Update translation es (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 20ba8d060c5a1a0a99f76074f45894e49b044c1d +Merge: 4e8297e 45970e0 +Author: Harald Judt +Date: Sun Mar 8 23:38:04 2015 +0100 + + Merge branch 'master' into xfce-4.12 + +commit 45970e066cf7d65aab28c8d26a694cc74e0890cc +Author: Marius Tolzmann +Date: Thu Dec 4 17:02:22 2014 +0100 + + Fix glade directory information in .pc file (bug #11353) + + This is still used by xfce4-session in xinitrc. + +commit 4e8297e7e1d1e9c01d63698aaa03a3a1a7dec295 +Author: Marius Tolzmann +Date: Thu Dec 4 17:02:22 2014 +0100 + + Fix glade directory information in .pc file (bug #11353) + + This is still used by xfce4-session in xinitrc. + +commit 6cd7a1589a063a9e00caa85c730a6ba54610f305 +Author: Slavko +Date: Sun Mar 8 18:30:18 2015 +0100 + + I18n: Update translation sk (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c78523027651b5eccebddfd489174a5dc0f9e75d +Author: Sergey Alyoshin +Date: Sun Mar 8 18:30:18 2015 +0100 + + I18n: Update translation ru (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e59574eee0dccc637fae26def178a5eb5fb00606 +Author: Pjotr +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation nl (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 45ac756d870d2ef8bb4ea580507904784f025b3e +Author: Baurzhan Muftakhidinov +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation kk (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ee027b57785516b93824a3869ba43531db320465 +Author: Masato HASHIMOTO +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation ja (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0b136a9106511565e6219cd8972049401828b828 +Author: Cristian Marchi +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation it (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0a905c15d068f63a572e20c1e11a243686a73d59 +Author: Edin Veskovic +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation hr (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6222baf952655890259ca5bdfbb0a441b99b37a2 +Author: GenghisKhan +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation he (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit db7c4f5bc0cff5c1f49d21b56a9e2e3d1fdcd67e +Author: Georg Eckert +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation de (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ed579daf8f39c86a5ba81cbc7a4a15c385935e7e +Author: Michal Várady +Date: Sun Mar 8 18:30:17 2015 +0100 + + I18n: Update translation cs (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5bda123643134897485f6d90fd1ca09929daf68e +Author: Саша Петровић +Date: Sun Mar 8 12:30:14 2015 +0100 + + I18n: Update translation sr (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 76a94b9fd2345fa70bcaf32ec20282a5c773b443 +Author: Yannick Le Guen +Date: Sun Mar 8 12:30:14 2015 +0100 + + I18n: Update translation fr (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8a9fbb0d84f9a97bbce024bcb09dee924d34b298 +Author: Kiril Kirilov +Date: Sun Mar 8 12:30:14 2015 +0100 + + I18n: Update translation bg (100%). + + 169 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1101fbf4f78106a116858d0bdb24eabfcc2eaab0 +Author: Harald Judt +Date: Sat Mar 7 22:32:22 2015 +0100 + + Add shortcuts for xfwm4 to tile windows to corners (bug #11652) + +commit 904e0c1e3cee078f34836ebfe92ffce57160087d +Author: Matt Thirtytwo +Date: Sat Mar 7 21:58:52 2015 +0100 + + Remove unused 'has_member' variable in xfce4-about (bug #11654) + +commit 54ec1afd50c28a6aecceff15c9ee14d7b94b8f23 +Author: Harald Judt +Date: Fri Mar 6 12:46:29 2015 +0100 + + Update NEWS + +commit 2e521d4c8c9344eb00f774212b08081bd10330c1 +Author: Harald Judt +Date: Fri Mar 6 12:42:10 2015 +0100 + + Update .gitignore + +commit 7d3fce2a6ef6709f1fb60956fd679d5cff7f3420 +Author: Harald Judt +Date: Fri Mar 6 12:38:33 2015 +0100 + + Increase xfce4-about default size + +commit 5b6a49fb9fe7e1b2b54693adefeae9ec29a1708c +Author: Harald Judt +Date: Fri Mar 6 12:14:49 2015 +0100 + + Improve formatting of translators list + +commit 2f001d17238524ab7643b133e654dbbdf2aae540 +Author: Harald Judt +Date: Fri Mar 6 11:57:54 2015 +0100 + + Update translation contributors in xfce4-about + +commit 2ce3b2ae760d69c34772cf624216d3503471c615 +Author: Harald Judt +Date: Fri Mar 6 12:13:13 2015 +0100 + + Fix typo in active contributors list + +commit f7cf1a5322a0bca9e4704ca923c53c5ca730337d +Author: Ivica Kolić +Date: Fri Mar 6 12:30:12 2015 +0100 + + I18n: Update translation hr (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 514f46533f8f40740daac855e9374410e0e1ee59 +Author: Ardjuna +Date: Thu Mar 5 12:30:18 2015 +0100 + + I18n: Update translation id (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6718852b31ae6243bc63cd177c79e9faac6e322e +Author: Harald Judt +Date: Mon Mar 2 22:39:59 2015 +0100 + + Update contributors lists + +commit 023de76b7752a2728510cf41e01a5aa896ba4964 +Author: Piotr Strębski +Date: Tue Mar 3 12:30:18 2015 +0100 + + I18n: Update translation pl (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 253bec2b0870171ce50fd2ddfee27dcafb9d2001 +Author: abuyop +Date: Tue Mar 3 00:30:18 2015 +0100 + + I18n: Update translation ms (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 77e9a3a2dac8645b7874587064d404b6c17df68a +Author: Seong-ho Cho +Date: Mon Mar 2 12:30:18 2015 +0100 + + I18n: Update translation ko (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dd6546f02cd1a15a0f5aa6b366eabc4f30c7f0d4 +Author: Harald Judt +Date: Sat Feb 28 16:14:35 2015 +0100 + + Post release tag bump + +commit 6344dd498d831fe8561906a7298ca63b6776cb7e +Author: Harald Judt +Date: Sat Feb 28 15:59:08 2015 +0100 + + Updates for release + +commit 18c9dd17949a479973c8d786984315edc67f9ee1 +Author: Mișu Moldovan +Date: Fri Feb 27 18:30:24 2015 +0100 + + I18n: Update translation ro (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6d4381ad5ea83d11ac317929944c3083539c2131 +Author: Slavko +Date: Thu Feb 26 18:30:24 2015 +0100 + + I18n: Update translation sk (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9d2c6ed548a54ce279c60eb88ba8d97bc5966572 +Author: GenghisKhan +Date: Thu Feb 26 18:30:24 2015 +0100 + + I18n: Update translation he (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 82a432a4c7b1be8cc09df7415bcbea5145d8412c +Author: Slavko +Date: Thu Feb 26 12:30:20 2015 +0100 + + I18n: Update translation sk (99%). + + 164 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bbb238a893a3bdaddcc02b1080760072318f1468 +Author: Pasi Lallinaho +Date: Thu Feb 26 00:30:20 2015 +0100 + + I18n: Update translation fi (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3a6dd4c54495ac30c83635880f55b6225a03d612 +Author: Tobias Bannert +Date: Tue Feb 24 12:30:13 2015 +0100 + + I18n: Update translation de (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f0e3da3f0f014996c7fb0490a26c5038ba9aaf3e +Author: Саша Петровић +Date: Tue Feb 24 00:30:20 2015 +0100 + + I18n: Update translation sr (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b9b930c0b2174d0e670401901ebef46db9907941 +Author: Anonymous +Date: Mon Feb 23 12:30:28 2015 +0100 + + I18n: Update translation bg (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 120fab870832c23dc8dd23a7b4d88bfe716a0c50 +Author: enolp +Date: Mon Feb 23 06:30:20 2015 +0100 + + I18n: Update translation ast (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3b0a636ac416fa8ba587a3327df955d6689ea478 +Author: Yannick Le Guen +Date: Sun Feb 22 00:30:19 2015 +0100 + + I18n: Update translation fr (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit afb1cc1bc9e78ca1bef29b3d5de176210b5e7d5f +Author: Sergey Alyoshin +Date: Sat Feb 21 18:30:20 2015 +0100 + + I18n: Update translation ru (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4879d50fc534ee610be7d04a96c9063e49a835c9 +Author: Manolo Díaz +Date: Sat Feb 21 06:30:19 2015 +0100 + + I18n: Update translation es (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8844880de07e721a9c447b521f9eb7beba1441b5 +Author: Michal Várady +Date: Sat Feb 21 06:30:19 2015 +0100 + + I18n: Update translation cs (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e84a22e1e3556f7bf35ad1674264dfbc91b5dd0e +Author: 白铭骢 +Date: Sat Feb 21 00:30:26 2015 +0100 + + I18n: Update translation zh_CN (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5b6028f9b8b5e8173fa15b657f347ab436561bc8 +Author: Allan Nordhøy +Date: Sat Feb 21 00:30:26 2015 +0100 + + I18n: Update translation nb (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5aa6f909e75ec9abed174b253243df197171f914 +Author: Cristian Marchi +Date: Sat Feb 21 00:30:26 2015 +0100 + + I18n: Update translation it (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c83bf9f695169ac4e0156c69665beaf33cdc6fb9 +Author: Manolo Díaz +Date: Sat Feb 21 00:30:26 2015 +0100 + + I18n: Update translation es (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8289971b3208a5ac371ccadd702f44e4043b5f6b +Author: Masato HASHIMOTO +Date: Fri Feb 20 18:30:13 2015 +0100 + + I18n: Update translation ja (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d98aae4a84c6319737688141465278c9b155c21 +Author: Theppitak Karoonboonyanan +Date: Fri Feb 20 12:30:20 2015 +0100 + + I18n: Update translation th (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c3690b63a730e724f6ec039ad9bac7740021c6e9 +Author: André Miranda +Date: Fri Feb 20 06:30:13 2015 +0100 + + I18n: Update translation pt_BR (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d868f091964ce5d81ce6c9af3a1d51d0b49fad85 +Author: Nuno Miguel +Date: Thu Feb 19 18:30:27 2015 +0100 + + I18n: Update translation pt (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 738e670b9775d16b5f5bc279e04f433d4a3be5a5 +Author: Pjotr +Date: Thu Feb 19 18:30:26 2015 +0100 + + I18n: Update translation nl (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 84223ac2c9a0a0caa7840a39f9f99e90451eaead +Author: Baurzhan Muftakhidinov +Date: Thu Feb 19 18:30:26 2015 +0100 + + I18n: Update translation kk (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bf8d0b630a2cc438146658e1dbc92c4b337ac7e1 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Thu Feb 19 18:30:26 2015 +0100 + + I18n: Update translation es (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 06d0da20e05a439c05f82b2bf82bb6b7e610b2f7 +Author: Jeff Huang +Date: Thu Feb 19 12:30:19 2015 +0100 + + I18n: Update translation zh_TW (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9b563821d5a0e21fac58db26e7a6f4ed5fa1eafd +Author: Aputsiaĸ Niels Janussen +Date: Thu Feb 19 06:30:21 2015 +0100 + + I18n: Update translation da (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0497310d233a0342317ce42266442ac07072a35b +Author: enolp +Date: Thu Feb 19 06:30:21 2015 +0100 + + I18n: Update translation ast (100%). + + 165 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 085ce580b3ec07776d4de00822c53acef1469402 +Author: Harald Judt +Date: Wed Feb 18 20:45:07 2015 +0100 + + Post release tag bump + +commit b9e6a57385ff6f0c15bbc637b76472211e3696b0 +Author: Harald Judt +Date: Wed Feb 18 20:36:35 2015 +0100 + + Updates for release + +commit 51c58dbb6c3f74b27f4254deb5ffaa84124816ff +Author: Harald Judt +Date: Wed Feb 18 20:31:24 2015 +0100 + + Bump copyright year in xfce4-about + +commit 9ad90dbce54cd966f36a514f6102144dfe7c0249 +Author: Harald Judt +Date: Wed Feb 18 19:20:34 2015 +0100 + + Bump dependencies versions + +commit 85c14a493a348fb9d7efbde7892e6c174ee47b37 +Author: Harald Judt +Date: Wed Feb 18 19:22:06 2015 +0100 + + Remove SVN $Id$ tags + +commit f991dcbb333a8369f94b4e11c88af6a5aacf1e39 +Author: Harald Judt +Date: Wed Feb 18 18:57:40 2015 +0100 + + Properly quote AC_LANG_SOURCE + + Arguments were underquoted, resulting in the following warning: + AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body + +commit 3aa672b5d3ea2012a54a208ce4559c8a460d5826 +Author: Harald Judt +Date: Wed Feb 18 18:39:52 2015 +0100 + + Fix autoconf m4 directory warning + +commit 250262087fefef18a974341b017e4476698efea3 +Author: Harald Judt +Date: Wed Feb 18 18:30:46 2015 +0100 + + Fix IT_PROG_INTLTOOL warning + + xdt-autogen: It is recommended to use IT_PROG_INTLTOOL([0.35.0]) + in your configure.ac file and remove AC_PROG_INTLTOOL + + See http://bugzilla.xfce.org/show_bug.cgi?id=8930 for + more information. + +commit ca1729ba6097d91df02d1bf85fac370a5ac9335a +Author: Eric Koegel +Date: Wed Feb 18 17:59:21 2015 +0100 + + Fix build with --enable-debug=full and GTK3 (bug #11176) + + This patch updates libxfce4ui for all the current deprecation + warnings when the GTK3 version is built. Mostly that GTK_STOCK + has been deprecated in 3.10 and dialog_set_image in 3.12. + +commit 04f13f11a66fd1cea9c47137198fd14aac090048 +Author: Harald Judt +Date: Wed Feb 18 17:49:57 2015 +0100 + + Add .gitignore + +commit b680e8b9f6b0cf1c706ed430a548590daa1f4565 +Author: Harald Judt +Date: Wed Feb 18 17:03:23 2015 +0100 + + Fix grabbing shortcuts with modifier (bug #10373) + + This is only considered a hack but has been proven to fix this bug, so far + without doing any harm. It turns mod4 modifiers into the Super modifier + and enables filtering for Super. In short, it restores proper functionality + for use-cases like the following: + + 1) Assign xfrun4 to . + 2) Assign xfce4-about to -. + + Expected behaviour: + Pressing - will execute xfce4-about, as assigned in step 2). + + Actual behaviour: + Pressing - will execute xfrun4, not xfce4-about. + + It is not clear why some people can reproduce this bug while others cannot. + Marking this as FIX ME in the comment because a proper solution would be + desirable. + +commit 9808f176fae55e5aa2ab478faabb7a7df0a63970 +Author: GenghisKhan +Date: Tue Jan 20 18:30:12 2015 +0100 + + I18n: Update translation he (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 99412c214775b0f4e2056fe62e161ebda67e6fb5 +Author: Lasse Liehu +Date: Sat Jan 10 18:30:12 2015 +0100 + + I18n: Update translation fi (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c024991b4615fe61c98772e9d0843644741e6e50 +Author: GenghisKhan +Date: Sat Jan 3 18:30:12 2015 +0100 + + I18n: Update translation he (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4d13e440c2da132c22670bc147caf53e2c772ad6 +Author: GenghisKhan +Date: Thu Jan 1 12:30:12 2015 +0100 + + I18n: Update translation he (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 95b6c9a368045afd7ce5e69d0bd81355d52a2f19 +Author: GenghisKhan +Date: Thu Jan 1 06:30:12 2015 +0100 + + I18n: Update translation he (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8b8be9f3c70ded2ac42bd22578e936c18d3456ea +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Thu Jan 1 00:30:12 2015 +0100 + + I18n: Update translation es (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 034d9daaeee91afdd378ee8e5f97c58ee6799b0d +Author: GenghisKhan +Date: Mon Dec 29 00:30:19 2014 +0100 + + I18n: Update translation he (57%). + + 94 translated messages, 70 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f577b42e35215a395c14d23f2b41f5e11f8b2fad +Author: Efstathios Iosifidis +Date: Sat Dec 27 00:30:20 2014 +0100 + + I18n: Update translation el (97%). + + 160 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4cfc5c2464e94dc72c1ee5311f540f448a8a5924 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Fri Dec 26 00:30:26 2014 +0100 + + I18n: Update translation es (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ca1f67b2e113e2091c578e918bfbdf836232da5b +Author: Ḷḷumex03 +Date: Sat Dec 13 18:30:12 2014 +0100 + + I18n: Update translation ast (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7608895826506f7a0698243d12f9184b5a899ee7 +Author: Slavko +Date: Fri Nov 28 18:30:12 2014 +0100 + + I18n: Update translation sk (94%). + + 155 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 30952275cce325ae308161855db4ffd5589f922e +Author: Adolfo Jayme Barrientos +Date: Fri Nov 28 06:30:12 2014 +0100 + + I18n: Update translation es (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 6423eaab729081e163ef94e2c1fcc7dce9d5d5b4 +Author: Anonymous +Date: Wed Nov 26 06:30:12 2014 +0100 + + I18n: Update translation sl (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 422b388f4eca8122172e2c86854eddda1d192b14 +Author: Michal Várady +Date: Mon Oct 27 00:30:12 2014 +0100 + + I18n: Update translation cs (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cede3bbc595affe26f3e58606d14e0b0805ca537 +Author: Ḷḷumex03 +Date: Sun Oct 26 00:30:18 2014 +0200 + + I18n: Update translation ast (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3ab1b5c652aff4d4c2428f1d18d4deee2db19733 +Author: Ivica Kolić +Date: Mon Oct 13 12:30:12 2014 +0200 + + I18n: Update translation hr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a9f0b67df2b6b552325df28787b220862921bf11 +Author: Ivica Kolić +Date: Thu Oct 9 18:30:12 2014 +0200 + + I18n: Update translation hr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c5db61c6ceb7d0a28d7b9232bc8774cec0eed4f3 +Author: Yannick Le Guen +Date: Sun Sep 14 00:30:12 2014 +0200 + + I18n: Update translation fr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4f40fb53689693513026b557c9db19e8bd17b43e +Author: Michael Findlay +Date: Fri Sep 5 06:30:12 2014 +0200 + + I18n: Update translation en_AU (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d88536c303fc34f693a6a80b13aecdee897696cd +Author: Seong-ho Cho +Date: Sun Aug 24 12:30:15 2014 +0200 + + I18n: Update translation ko (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f94678c9a1fe94058f41acdb0c4c64974279ffb0 +Author: Pasi Lallinaho +Date: Sat Aug 23 00:30:12 2014 +0200 + + I18n: Update translation fi (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1edd270d41a5df3a8d383db9518575cbc882c419 +Author: Anonymous +Date: Mon Aug 4 00:30:12 2014 +0200 + + I18n: Update translation de (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1a3f58f5de8184a2855dcae854fd766b9f4cd5d4 +Author: Anonymous +Date: Sun Aug 3 18:30:12 2014 +0200 + + I18n: Update translation de (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4742d095a21ddced8406af3a80035bd840af23c7 +Author: Jannis Pohlmann +Date: Sun Jul 27 16:25:57 2014 +0200 + + Avoid double forking when spawning external apps (bug #9373) + + Some security conscious applications such as pkexec detect double forks + and refuse to operate. Avoiding the double fork here is very simple. + + See https://bugzilla.xfce.org/show_bug.cgi?id=9373 + and https://bugzilla.gnome.org/show_bug.cgi?id=686059 + +commit 75b776202b4f21d9d87c4e87a07b6e9cb567f1f8 +Author: Alistair Buxton +Date: Mon Jan 13 19:59:27 2014 +0000 + + Don't drop startup notify hint when resetting to defaults (bug #10630) + +commit 635521fe76d5969d49f2da98a8013e32fa394848 +Author: Marc Maurice +Date: Fri Jul 25 15:32:01 2014 +0200 + + Add l shortcut for screen locking (xflock4) (bug #10728) + +commit 9e5e5395da5bc1533b86adb7343b516d5be4ff0f +Author: Yannick Le Guen +Date: Wed Jun 18 18:30:12 2014 +0200 + + I18n: Update translation fr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b089019b29c324fe2621bfee405960a3082e6652 +Author: OSWorld +Date: Mon Jun 2 00:30:18 2014 +0200 + + I18n: Update translation pl (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a10c5f137747b3b4598e5fe427658db2b8ad5eef +Author: Pablo Lezaeta +Date: Mon May 19 12:30:15 2014 +0200 + + I18n: Update translation es (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f051687b0ea9ccc69b910891b8cbef94758e2876 +Author: kingu +Date: Sun May 11 18:30:12 2014 +0200 + + I18n: Update translation nb (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a576a7ff243f5961f9f5e1b93047890f656240c3 +Author: haarek +Date: Sat May 10 18:30:14 2014 +0200 + + I18n: Update translation nb (66%). + + 109 translated messages, 55 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ec6476d4452c2e1a0594124617db5e161cd8bd49 +Author: haarek +Date: Sat Apr 26 00:30:14 2014 +0200 + + I18n: Update translation nb (65%). + + 108 translated messages, 56 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f80f32a73623dce0f61ec00a8828b069d1be022a +Author: Tornes Llume +Date: Sun Apr 13 06:30:16 2014 +0200 + + I18n: Update translation ast (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0352abf8fe051909e1cdd278185114c72c77b428 +Author: Tornes Llume +Date: Sat Apr 12 00:30:15 2014 +0200 + + I18n: Update translation ast (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 284f5aff693a99e79b51c50cd0d3806d9384c8b4 +Author: Tornes Llume +Date: Fri Apr 11 18:30:16 2014 +0200 + + I18n: Update translation ast (81%). + + 134 translated messages, 30 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0f3b2f8d9fd40f0885f20b4a1fa17890d38f063f +Author: Tornes Llume +Date: Wed Apr 9 18:30:19 2014 +0200 + + I18n: Update translation ast (69%). + + 114 translated messages, 50 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 60ff4b64a3b82292daa9e1567201f9ddc9dfbd96 +Author: Urides +Date: Mon Mar 24 18:30:16 2014 +0100 + + I18n: Update translation fr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 686267e52e340f9160f050abb6949b2b7a469c7c +Author: Eric Koegel +Date: Sat Mar 8 21:24:34 2014 +0300 + + Fix xfce_dialog_show_help + + Commit d5467df1c64ff6cf6884cd7347a3c8c62c49b32e turned + xfce_dialog_show_help into a no-op function. This patch changes it + so that it will use xfce_dialog_show_help_with_version with NULL + for the version. This will restore the previous functionality. + +commit 529dea47cd93143a0be92ca10068ebfa89e67739 +Author: PavelNicklasson +Date: Mon Feb 24 00:30:13 2014 +0100 + + I18n: Update translation sv (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 46ad184caa4c806125a2dd3794fb27c8c674c955 +Author: Nick Schermer +Date: Sat Feb 22 23:36:11 2014 +0100 + + Post release tag bump + +commit 83cc23d03e9ab732c53deaaa9b7d7811eb3de005 +Author: Nick Schermer +Date: Sat Feb 22 23:31:20 2014 +0100 + + Updates for release. + +commit 87afbc3ee82715ac50a21515a4da67a8294b8fcb +Author: schizo +Date: Sat Feb 22 00:30:14 2014 +0100 + + I18n: Update translation hr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d5467df1c64ff6cf6884cd7347a3c8c62c49b32e +Author: Nick Schermer +Date: Sun Feb 16 23:01:19 2014 +0100 + + Add xfce_dialog_show_help_with_version(). + + Allow applications to send their own version string to the wiki + help.php script. + +commit 835861af91de444561b7c0de420332de68d32587 +Author: Anonymous +Date: Sun Jan 26 12:30:14 2014 +0100 + + I18n: Update translation sl (97%). + + 160 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 149330bcf69e2aac8650ce20c879b2b81725da97 +Author: Anonymous +Date: Thu Jan 2 18:30:12 2014 +0100 + + I18n: Update translation de (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 47ff0ec3b28b063f93c7f5618f39379f559d98a8 +Author: gem +Date: Mon Dec 30 00:30:13 2013 +0100 + + I18n: Update translation de (97%). + + 160 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 363cfcc0b8070873dba101812a273e0c6962ae7b +Author: Walter Cheuk +Date: Sun Dec 15 12:30:18 2013 +0100 + + I18n: Add new translation zh_HK (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e8230c9e345309a74c8bd971f59ab94777ff67cc +Author: anthonmanix +Date: Tue Dec 3 00:30:13 2013 +0100 + + I18n: Add new translation sl (73%). + + 121 translated messages, 43 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 882092cfc2d742aeebe87e18d582fce58654183a +Author: Cedric31 +Date: Tue Nov 19 18:33:58 2013 +0100 + + I18n: Add new translation oc (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7d0048ff05769c1bdeb9a606f045dc2e7a8f468d +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation zh_TW (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 67d9924adb073de65a7c586f0aa994a7f9c2dce6 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation zh_CN (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5ee90f4b4415bbf1f97382b0235ee723c441c38e +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation uk (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5f94591040275cc7cb1c80c73796e7517a156c76 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation te (60%). + + 100 translated messages, 64 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9fe3a263cf4c5ed63d5b0b3e02e80480e37a2115 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation sr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ff210e98797d0ca51694e78e74489f9b5c759479 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation sk (81%). + + 134 translated messages, 30 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 89ebf7f12865a4a3e309908c99b3d6db42dd4d2a +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation ru (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7aef986ee0c83cc4cb3be711c218cf2ea9999ad5 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation ro (84%). + + 138 translated messages, 26 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f49c038aefd2902854c9f79a8e585da7f0924ef0 +Author: Nick +Date: Tue Nov 19 12:30:37 2013 +0100 + + I18n: Update translation pt (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 56a16ff64b5f22cbc2524a2bae09fb7f3e6e61e6 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation pt_BR (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit dd447ca2f0ec53a3cd47aa89aaa0806557b32531 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation nn (84%). + + 138 translated messages, 26 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ea3b2e91362605573cf13018909d744c576fb42f +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation nb (51%). + + 84 translated messages, 80 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1eb90abfee67c61a0d0363dbd96eb7104c2ba3d4 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation lt (84%). + + 138 translated messages, 26 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1ec38266a0cc91727b347804ce97f8042d5d1aa9 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation ko (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8f144d2ea5bf1da2badf55c0620b5ae9f5389d51 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation kk (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 04202b3c40ff1e0170694561e2d3e71dfd3a4207 +Author: Nick +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation ja (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2dd90c565a430e2e09a79d5ef18e490047772765 +Author: Leandro Regueiro +Date: Tue Nov 19 12:30:36 2013 +0100 + + I18n: Update translation gl (88%). + + 145 translated messages, 19 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9b227bb5dcd5974b9f54159a00324bc39c5d45e3 +Author: Nick +Date: Tue Nov 19 12:30:35 2013 +0100 + + I18n: Update translation el (84%). + + 138 translated messages, 26 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d908c1ecf1d2a9a60399a8d5eea51d6a7352d6b8 +Author: Nick +Date: Tue Nov 19 12:30:35 2013 +0100 + + I18n: Update translation bn (51%). + + 84 translated messages, 80 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7f3ea482828250486b996bb510240de82e0ffd54 +Author: Nick +Date: Tue Nov 19 12:30:35 2013 +0100 + + I18n: Update translation bg (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 666675cac094369000fb65fd245981a4958a8619 +Author: Puretech +Date: Thu Nov 14 12:30:15 2013 +0100 + + I18n: Add new translation ms (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit aae68589aa2be0f9b1f5a83819ae56e94d11c226 +Author: Jiri Grönroos +Date: Tue Nov 12 00:30:15 2013 +0100 + + I18n: Update translation fi (89%). + + 147 translated messages, 17 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d4ef9143f65b1a4d6ac222b54a04b191f84f06ab +Author: Aputsiaĸ Niels Janussen +Date: Fri Nov 8 18:30:16 2013 +0100 + + I18n: Update translation da (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 199fc48f5d8df078e59f1f5f6d0b0802d04a569e +Author: Sveinn í Felli +Date: Tue Oct 15 18:30:12 2013 +0200 + + I18n: Update translation is (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e5a6113f9c91832efb31cf89fcc6c71786000d5d +Author: hjudt +Date: Wed Oct 2 00:30:15 2013 +0200 + + I18n: Add new translation de (96%). + + 159 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 496db4a7876ccbe74340292e8b37d92f2975b185 +Author: mohammad alhargan +Date: Mon Sep 30 18:30:13 2013 +0200 + + I18n: Update translation ar (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f319502646597dd3507f5c4f7fbfa70e5ce6edcc +Author: Nick Schermer +Date: Mon Sep 23 19:29:27 2013 +0200 + + Post release tag bump. + +commit 26dfdaffd7a8418d8b27a2e6bb378139b742b31e +Author: Nick Schermer +Date: Mon Sep 23 19:15:29 2013 +0200 + + Updates for release. + +commit b551e2d029afae034213754991711e9c363c50e1 +Author: theppitak +Date: Sun Sep 22 12:30:13 2013 +0200 + + I18n: Add new translation th (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0046432a3621c50840b915a2dc38d52cbb71e47a +Author: Pjotr123 +Date: Thu Sep 19 18:30:16 2013 +0200 + + I18n: Update translation nl (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b14ffcf4628a5aab70b5c439934451344375ff9b +Author: Karim Oulad Chalha +Date: Sun Sep 15 06:30:14 2013 +0200 + + I18n: Add new translation ar (91%). + + 150 translated messages, 14 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4866bc6581b4f5ddd615edff87e238c289898c23 +Author: Sveinn í Felli +Date: Fri Sep 13 18:30:15 2013 +0200 + + I18n: Update translation is (90%). + + 149 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2d1e88d1a45665053b61cda1f9fff87a87b9f6cd +Author: cri +Date: Sat Sep 7 18:30:18 2013 +0200 + + I18n: Update translation it (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 530b72f50fcbd8cb4b970fcc97be0321bf78183e +Author: Ivica Kolić +Date: Tue Aug 27 00:30:20 2013 +0200 + + I18n: Update translation hr (84%). + + 139 translated messages, 25 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ce0102a5c96bad757cf4e94319302d5267000482 +Author: Abduqadir Abliz +Date: Sat Aug 17 06:30:18 2013 +0200 + + I18n: Update translation ug (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2aaf0b982a2fe212db8650eb4b4aee0ebbc375d2 +Author: Alois Nešpor +Date: Mon Aug 12 12:30:18 2013 +0200 + + I18n: Add new translation cs (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fd6452024299545b747cdfcaee096785bfae2da3 +Author: jc1 +Date: Wed Jul 31 00:30:17 2013 +0200 + + I18n: Update translation fr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit eb6a0b1b4c97f51a99e205a7b50ca9f733998ce1 +Author: volkangezer +Date: Tue Jul 30 12:30:17 2013 +0200 + + I18n: Update translation tr (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 50860b87080a3307d8a74e8b3b47571503ebe910 +Author: k3lt01 +Date: Mon Jul 29 12:30:21 2013 +0200 + + I18n: Add new translation en_AU (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 10028a423643ec79942c17dc0f320a0e78423879 +Author: carlesmu +Date: Sat Jul 27 18:30:17 2013 +0200 + + I18n: Update translation ca (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit daaba11551bf991e618dcb0017d9d22baca76ea0 +Author: Noskcaj +Date: Sat Jul 27 12:30:18 2013 +0200 + + I18n: Update translation en_GB (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4196b6295a6f36c865331619ac9d7ffdb8c5a011 +Author: Noskcaj +Date: Sat Jul 27 00:30:16 2013 +0200 + + I18n: Update translation en_GB (90%). + + 149 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b343bda3e0e5f99d75c226f5a7fb10555fce8add +Author: Anonymous +Date: Wed Jul 17 12:30:17 2013 +0200 + + I18n: Update translation ug (85%). + + 140 translated messages, 24 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 885a75cd8664ffe19eb1db032df75a1c41d9656b +Author: MC +Date: Fri Jul 12 18:30:22 2013 +0200 + + I18n: Update translation es (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 60e4e090d3f1bbf7cd35acb7fe697fffe66fa1a7 +Author: MC +Date: Fri Jul 12 00:30:17 2013 +0200 + + I18n: Update translation es (92%). + + 151 translated messages, 13 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c509aa68a608216019998218d82a958c35474d2f +Author: MC +Date: Wed Jul 10 18:30:17 2013 +0200 + + I18n: Add new translation es (58%). + + 96 translated messages, 68 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 294d8a3fc4a21383a942c9c483dc5df2415c9536 +Author: kelemeng +Date: Wed Jul 10 00:30:17 2013 +0200 + + I18n: Add new translation hu (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ae587383ebd8d32b92d4ca2b37dbd6d1f375c96f +Author: Ardjuna +Date: Sun Jul 7 12:10:32 2013 +0200 + + I18n: Add new translation id (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f338072ea0705b8422d266dd48ec5245d43871ce +Author: Piarres Beobide +Date: Fri Jul 5 22:56:43 2013 +0200 + + I18n: Add new translation eu (100%). + + 164 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2953babd49a995ae59dad05f6171559b130e5102 +Author: Nick Schermer +Date: Tue Jul 2 22:33:54 2013 +0200 + + I18n: Remove broken / unsupported translations. + + See http://users.xfce.org/~nick/broken-i18n/ for files and logs. + + Use https://www.transifex.com/projects/p/xfce/ to upload fixed versions or request a translation team. + +commit 112aee43a0bb51f5c941ce16e8d82fc5e028ffb2 +Author: Transifex +Date: Sun Jun 30 00:21:08 2013 +0200 + + Update translators, week 25. + +commit 84df1ce73ac870fa00114f4328aa1cc1974bcc17 +Author: Masato Hashimoto +Date: Wed Jun 26 13:38:11 2013 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cbd00dff5076c01716ce27014aa0570af52ad8ef +Author: Transifex +Date: Sun Jun 23 00:21:04 2013 +0200 + + Update translators, week 24. + +commit 06bb6134d4935f3cde9bd438d31dd166b75c3693 +Author: Transifex +Date: Sun Jun 16 00:21:07 2013 +0200 + + Update translators, week 23. + +commit 34b89173ecb5dcc11306e23c36e9b2369f5f9a50 +Author: Ardjuna +Date: Sat Jun 15 06:18:23 2013 +0200 + + l10n: Updated Indonesian (id) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 017e1bf56639c4ac706e29cbca23be307147ab5f +Author: Piotr Strębski +Date: Tue Jun 11 14:49:00 2013 +0200 + + l10n: Updated Polish (pl) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 98350edc11b806d1f374adeb19d21ecc672f78a9 +Author: Neliton Pereira Junior +Date: Tue Jun 11 04:55:35 2013 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 22c52a0dcce54a2b76ea39945a8783e78a45e3ef +Author: Nick Schermer +Date: Sun Jun 9 11:44:13 2013 +0200 + + Add error domain for XfceSmClient. + +commit 8edf5a0a59ef054c9b9e71953ea0f3c5a64988cc +Author: Transifex +Date: Sun Jun 9 00:21:14 2013 +0200 + + Update translators, week 22. + +commit ccd59b8c4ea7744f537a684f5e577f7eba659383 +Author: Ardjuna +Date: Thu Jun 6 05:54:42 2013 +0200 + + l10n: Updated Indonesian (id) translation to 87% + + New status: 144 messages complete with 17 fuzzies and 3 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8d5ff90c3806b3de70420d0d9dcaa84eef19f915 +Author: Transifex +Date: Sun Jun 2 00:21:04 2013 +0200 + + Update translators, week 21. + +commit 1ad034b12a450468c7432ac8a98799ab21478b81 +Author: Transifex +Date: Sun May 26 00:21:03 2013 +0200 + + Update translators, week 20. + +commit 4ae4c364167e271afc8fb72d16622c77e2d37b70 +Author: Transifex +Date: Sun May 19 00:21:05 2013 +0200 + + Update translators, week 19. + +commit 566ad5d914c94a8e8881c8c0db70e0576754469b +Author: Transifex +Date: Sun May 12 00:21:14 2013 +0200 + + Update translators, week 18. + +commit a9591e0cb013d850df71a7c1fdc2403a6a6ee7fd +Author: Transifex +Date: Sun May 5 00:21:09 2013 +0200 + + Update translators, week 17. + +commit 947737103fc62de1a9d0c398d74278ba93618e0e +Author: Masato Hashimoto +Date: Sat May 4 16:05:29 2013 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a27c43ce06de60ea8764dc38eff91c4483fedfb1 +Author: Transifex +Date: Sun Apr 28 00:21:09 2013 +0200 + + Update translators, week 16. + +commit 217d9c7d2a1dac7a5f0b9791708f9be5b51b2e7c +Author: Pjotr vertaalt +Date: Wed Apr 24 15:36:13 2013 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 770a0db8cfeda995a7f360e350a086a702fa5b5f +Author: Transifex +Date: Sun Apr 21 00:21:03 2013 +0200 + + Update translators, week 15. + +commit e86cd59bdd7ff29613b9596185ed15d0a7dc8775 +Author: Transifex +Date: Sun Apr 14 00:21:03 2013 +0200 + + Update translators, week 14. + +commit 3f30444708b7a4f5fea92813fd2c4be200894f2b +Author: Transifex +Date: Sun Apr 7 00:21:09 2013 +0200 + + Update translators, week 13. + +commit 2fd3cbf03d66aa541ab7d7f39dca01c3387b7305 +Author: Ivica Kolić +Date: Thu Apr 4 05:29:06 2013 +0200 + + l10n: Updated Croatian (hr) translation to 84% + + New status: 139 messages complete with 0 fuzzies and 25 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2eacb95c63a1226b125d778a5a5998b979168dab +Author: Transifex +Date: Sun Mar 31 00:21:05 2013 +0100 + + Update translators, week 12. + +commit ed0091828542a7502e0f2bf234d08c7f862fddec +Author: Transifex +Date: Sun Mar 24 00:21:09 2013 +0100 + + Update translators, week 11. + +commit 49caa98d78c8f2dd84605b2629973aa07a8c214b +Author: Nick Schermer +Date: Tue Mar 19 19:13:40 2013 +0100 + + Only define distclean files in maintainer mode (bug #8974). + +commit 8cc25aec926c1b2dcb27686977537de928e06c56 +Author: Mike Massonnet +Date: Sat Mar 16 21:40:28 2013 +0100 + + Use class style Frame in XfceHeading for Gtk3. + +commit bf9648f01337bc9ae4b3f459d9e64f1fc25e38e7 +Author: Transifex +Date: Sun Mar 17 00:21:09 2013 +0100 + + Update translators, week 10. + +commit 309ed30e161d7e9ccb6351e634ee99bf7026427c +Author: Imre Benedek +Date: Sat Mar 16 00:09:06 2013 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 822dc81bbb980703602ddfe275e11ede4425aaa9 +Author: Imre Benedek +Date: Fri Mar 15 23:44:02 2013 +0100 + + l10n: Updated Hungarian (hu) translation to 99% + + New status: 163 messages complete with 0 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2174b14a2d24cfb9e8cd9dc569b4ad9064e032f4 +Author: Imre Benedek +Date: Fri Mar 15 02:34:47 2013 +0100 + + l10n: Updated Hungarian (hu) translation to 98% + + New status: 162 messages complete with 0 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ad132d9ad1fc7d7f2107e969e8e1324f60f697c2 +Author: Imre Benedek +Date: Wed Mar 13 02:42:09 2013 +0100 + + l10n: Updated Hungarian (hu) translation to 98% + + New status: 162 messages complete with 0 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 038c30c9a123efa3dd8506c81a00aaabf33d1a6d +Author: Transifex +Date: Sun Mar 10 00:21:08 2013 +0100 + + Update translators, week 09. + +commit d45d2a00033274375fb7669b02461c853f377056 +Author: Саша Петровић +Date: Tue Mar 5 15:14:36 2013 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9854be2e56f70b2c4d2181b6dca40f748dfd8d9c +Author: Саша Петровић +Date: Tue Mar 5 13:54:35 2013 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d095aaf7a18deeaf8214bd7e3a3f1d27a95e18fb +Author: Ivica Kolić +Date: Tue Mar 5 07:10:50 2013 +0100 + + l10n: Updated Croatian (hr) translation to 82% + + New status: 136 messages complete with 0 fuzzies and 28 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 95185f9229d6389fe26ec6d8645e56dd793d2ec4 +Author: Transifex +Date: Sun Mar 3 00:21:08 2013 +0100 + + Update translators, week 08. + +commit 313bc039365acbf46cc7d30e105f17878935f82e +Author: Piarres Beobide +Date: Sun Feb 24 22:59:59 2013 +0100 + + l10n: Updated Basque (eu) translation to 98% + + New status: 161 messages complete with 0 fuzzies and 3 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 44d33bcd666e4167fcb5649fc07d2f05f611f4a4 +Author: Piarres Beobide +Date: Sun Feb 24 22:59:09 2013 +0100 + + l10n: Updated Basque (eu) translation to 96% + + New status: 158 messages complete with 3 fuzzies and 3 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4ba87e3b79497cf54fd4e51fb500d5bda790defa +Author: Transifex +Date: Sun Feb 24 00:21:03 2013 +0100 + + Update translators, week 07. + +commit 915d01d46f5a580b26e7e04e7d7fb5569a680c9e +Author: Transifex +Date: Sun Feb 17 00:21:09 2013 +0100 + + Update translators, week 06. + +commit cd812045282795e5466763e31041ee0b02ab4c56 +Author: Yarema aka Knedlyk +Date: Sat Feb 16 17:35:36 2013 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6dea9f083c36f1814879f5177b8b21e3fd5889c9 +Author: Francisco Javier Serrador +Date: Sun Feb 10 19:51:15 2013 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a0379f31aba25244963dbe07d3c106a4526493e8 +Author: Transifex +Date: Sun Feb 10 00:21:08 2013 +0100 + + Update translators, week 05. + +commit 4f4b1edc8b96f973cf1bdd3901bd26349453f994 +Author: كريم أولاد الشلحة +Date: Tue Feb 5 20:41:22 2013 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 76bcbd6e9de656552420c7b7f70a042f02c71917 +Author: Jérôme Guelfucci +Date: Sun Feb 3 11:45:57 2013 +0100 + + Fix some some shortcut comparisons with default shortcuts. + + As we compare the strings represeting the shortcuts, we need to set + default shortcuts to use the same string as the one resulting from GTK+ + functions. + + * shortcuts thus need to be changed to *. + +commit 19f4d73d341330297a13c13781be0fbb3603b864 +Author: Jérôme Guelfucci +Date: Sun Feb 3 11:41:24 2013 +0100 + + Don't show escaped text in the shortcut conflict dialog (bug #5076). + +commit 1b66b0d24f3c789e579f06c11d2ee90ac6515285 +Author: Transifex +Date: Sun Feb 3 00:21:09 2013 +0100 + + Update translators, week 04. + +commit fc893792dfe1fe71b96e64dc8bdd79b9815a0bff +Author: كريم أولاد الشلحة +Date: Sat Feb 2 13:50:40 2013 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e37224a03b0ccdadfcdc9eb6f8ee98c86edeac93 +Author: كريم أولاد الشلحة +Date: Sat Feb 2 12:39:00 2013 +0100 + + l10n: Updated Arabic (ar) translation to 99% + + New status: 163 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bfba2afda010b78b2f9b5911c7b2763dfaf9b781 +Author: كريم أولاد الشلحة +Date: Sat Feb 2 12:37:11 2013 +0100 + + l10n: Updated Arabic (ar) translation to 97% + + New status: 160 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9881d94f4901c6d1b345b77c798f75112a81bf9e +Author: Cheng-Chia Tseng +Date: Mon Jan 28 03:59:16 2013 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2d7202e19196aa65ba0b4bea21ff4d8f4f292360 +Author: Michal Várady +Date: Sun Jan 27 18:33:29 2013 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c4300cfd18907a4a3d0ce530bf55ec92108b7d95 +Author: Sergey Alyoshin +Date: Sun Jan 27 18:14:09 2013 +0100 + + l10n: Updated Russian (ru) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7a16566bbca0b2a5abfacb28dbc7fe70f9a7f37d +Author: Kiril Kirilov +Date: Sun Jan 27 11:09:42 2013 +0100 + + l10n: Updated Bulgarian (bg) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6493b97ce03c7bcb4cca0cb45486396b483f40d0 +Author: Transifex +Date: Sun Jan 27 00:21:10 2013 +0100 + + Update translators, week 03. + +commit 3951fc3db21b9b0fce6c8120220966745460683e +Author: Kiril Kirilov +Date: Sat Jan 26 20:57:12 2013 +0100 + + l10n: Updates to Bulgarian translation + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dd0e219479b9849b7df3de90d504c0fb2fad4068 +Author: Soslan Xwybylty +Date: Wed Jan 23 22:01:08 2013 +0100 + + l10n: Updated Ossetian (os) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a36d84fc4d6aa93f3993db3519e8ca4f39cb3bac +Author: Soslan Xwybylty +Date: Wed Jan 23 21:43:24 2013 +0100 + + l10n: Updated Ossetian (os) translation to 93% + + New status: 154 messages complete with 0 fuzzies and 10 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 642c9cacca9f071599e5d86945bd4cfc15514e24 +Author: Seong-ho Cho +Date: Wed Jan 23 20:20:49 2013 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5974529ce6d96a5b1ba994061106257b6384d0ff +Author: Seong-ho Cho +Date: Wed Jan 23 20:19:22 2013 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f50dab0537349b18ed1155c78571b8f2c654f97d +Author: Seong-ho Cho +Date: Wed Jan 23 20:12:49 2013 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a861cdd1b9664148992a52cfaffe1d6aaad0ca17 +Author: Soslan Xwybylty +Date: Tue Jan 22 23:19:37 2013 +0100 + + l10n: initial ossetian po file + + New status: 151 messages complete with 0 fuzzies and 13 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1100d6e87c395bd6e1867baa2d2eab7b1ce94be6 +Author: Transifex +Date: Sun Jan 20 00:21:07 2013 +0100 + + Update translators, week 02. + +commit 1c98b24d3ce6d040997732237bf8211fdf421149 +Author: Ivica Kolić +Date: Fri Jan 18 19:22:55 2013 +0100 + + l10n: Updated Croatian (hr) translation to 82% + + New status: 136 messages complete with 0 fuzzies and 28 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7fbe230c7ac7132024507c0ec648aef3432b3ba8 +Author: Cristian Marchi +Date: Thu Jan 17 21:47:07 2013 +0100 + + l10n: Updated Italian (it) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9ea6befcf641712611a14b4120e9a4961f162884 +Author: prflr88 +Date: Mon Jan 14 23:12:18 2013 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 84% + + New status: 138 messages complete with 24 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c16d6b02d14b2560d442c203714378ce2104d0f3 +Author: Piotr Sokół +Date: Sun Jan 13 18:59:00 2013 +0100 + + l10n: Updated Polish (pl) translation to 96% + + New status: 159 messages complete with 5 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f336fdba7e0c9e0b1ccff0bffce7ae20327d52c6 +Author: Transifex +Date: Sun Jan 13 00:21:13 2013 +0100 + + Update translators, week 01. + +commit 09cdcd1b6a9453bb328822d64e48cbf9a3a1a617 +Author: Cristian Marchi +Date: Thu Jan 10 18:28:48 2013 +0100 + + l10n: Updated Italian (it) translation to 98% + + New status: 162 messages complete with 1 fuzzy and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0431d0781938fbbdf8a8e92b723a9621e779adc8 +Author: Piotr Sokół +Date: Mon Jan 7 20:28:15 2013 +0100 + + l10n: Updated Polish (pl) translation to 92% + + New status: 151 messages complete with 11 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 398726e4bc760800a47190780c6f21ede170079f +Author: Nick Schermer +Date: Sun Jan 6 12:19:11 2013 +0100 + + Autotools updates. + +commit 347a41904e1147b238504ea1c2f2786e00413361 +Author: Transifex +Date: Sun Jan 6 00:21:09 2013 +0100 + + Update translators, week 00. + +commit edad2e856584fc6d66559a629879dcd755e14eea +Author: Baurzhan Muftakhidinov +Date: Thu Jan 3 13:53:58 2013 +0100 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cafa2d55aaed9502c9cf1b4e4f4ce8f60a2ca915 +Author: Roman K +Date: Thu Jan 3 06:42:37 2013 +0100 + + l10n: Updated Russian (ru) translation to 93% + + New status: 154 messages complete with 9 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b84fb1433069395ea3dc49296fb2c916f588f05d +Author: Yarema aka Knedlyk +Date: Wed Jan 2 21:30:07 2013 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 590b1784df37f323356f81e4ef44852bea216114 +Author: Christoph Wickert +Date: Wed Jan 2 13:36:28 2013 +0100 + + l10n: Updated German (de) translation to 95% + + New status: 157 messages complete with 7 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 518477cc052e9e344afd531db437c105b22b0762 +Author: Christoph Wickert +Date: Wed Jan 2 13:35:34 2013 +0100 + + l10n: Updated German (de) translation to 95% + + New status: 156 messages complete with 8 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7a390ee35a590edb6cb530d08e76059a28b30928 +Author: Christoph Wickert +Date: Tue Jan 1 17:05:06 2013 +0100 + + l10n: Updated German (de) translation to 94% + + New status: 155 messages complete with 9 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8b84322870e8cf7282259ff2a0e12ebbcba626d9 +Author: Sergio Marques +Date: Mon Dec 31 15:05:44 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1a96486502327f4dfb735253e993b5636a3126db +Author: Pjotr vertaalt +Date: Mon Dec 31 13:09:01 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit db54802efee3ccf15b61d93bdfd136f6640fb471 +Author: jc jc1 +Date: Mon Dec 31 10:07:54 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a3afc90d34708c6b0f2aadb1dd2b2faea9c0271f +Author: Саша Петровић +Date: Mon Dec 31 07:40:40 2012 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2f7fd87f766b5cdce64564957cb0540a753d054b +Author: Hunt Xu +Date: Mon Dec 31 04:39:15 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c501f5826630e4788bb6aea12d7aaf289c4a0c51 +Author: jc jc1 +Date: Mon Dec 31 01:50:46 2012 +0100 + + l10n: Updated French (fr) translation to 98% + + New status: 162 messages complete with 2 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4dd29426b346341cd1606b392b01576ca8193129 +Author: jc jc1 +Date: Mon Dec 31 01:48:21 2012 +0100 + + l10n: Updated French (fr) translation to 97% + + New status: 160 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 94b77a9b2ae469151d051c1410fe7f2bd4de5d3c +Author: jc jc1 +Date: Mon Dec 31 01:44:18 2012 +0100 + + l10n: Updated French (fr) translation to 95% + + New status: 156 messages complete with 7 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c087e52f4ba5e0a1d38c63a7fb04fa3529c0a8a9 +Author: jc jc1 +Date: Mon Dec 31 01:40:25 2012 +0100 + + l10n: Updated French (fr) translation to 90% + + New status: 149 messages complete with 13 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c2bc6a6b7ef3d9a4877b56f5095aaa2db0036a66 +Author: jc jc1 +Date: Mon Dec 31 01:38:51 2012 +0100 + + l10n: Updated French (fr) translation to 88% + + New status: 145 messages complete with 17 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7b159b511c3321813f9d00a317c9d99f01ef1619 +Author: Rafael Ferreira +Date: Mon Dec 31 01:07:59 2012 +0100 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 164 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e3fcb824731a3fa5717ff75871cf429f30ed8472 +Author: Ivica Kolić +Date: Mon Dec 31 00:53:27 2012 +0100 + + l10n: Updated Croatian (hr) translation to 76% + + New status: 126 messages complete with 0 fuzzies and 38 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3e1ab2ca1994ba384a1d0205a1ceed66b4ec2c67 +Author: Ivica Kolić +Date: Mon Dec 31 00:47:38 2012 +0100 + + l10n: Updated Croatian (hr) translation to 76% + + New status: 126 messages complete with 0 fuzzies and 38 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2dcebd26fe9889323cee7052351a8226ce9e01e4 +Author: Nick Schermer +Date: Mon Dec 31 00:19:38 2012 +0100 + + Update pot file. + +commit 8dbadd18d5d0473c63f55482141246dfb0d40dc2 +Author: Саша Петровић +Date: Sun Dec 30 21:07:19 2012 +0100 + + l10n: Updated Serbian (sr) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit df330119b622b031a5184f9a296850463c002298 +Merge: 9e1223c 80dc447 +Author: Jérôme Guelfucci +Date: Sun Dec 30 15:34:56 2012 +0100 + + Merge branch 'jeromeg/keyboard-shortcuts' + +commit 80dc447a8b9236a3c006b0e38009d35891c18891 +Author: Jérôme Guelfucci +Date: Sun Dec 30 14:34:44 2012 +0100 + + Add functions to handle xfwm4 feature names. + + This is used to provide translated versions of the strings to other + applications. Sharing the translations in the header was not working due + to textdomain issues. + +commit b9f459f6c28796d5140b2a75b4ce05f108214716 +Author: Jérôme Guelfucci +Date: Sun Dec 30 11:01:37 2012 +0100 + + Grab on all root windows when building with GTK+ 3. + +commit 53a93d33534af5b17317487aad531dcce0c4bc60 +Author: Jérôme Guelfucci +Date: Sun Dec 30 11:01:10 2012 +0100 + + Don't get the default display a second time. + +commit 084d79c43fa7bbb5c284808927a99808d85dc925 +Author: Jérôme Guelfucci +Date: Sun Dec 30 10:21:29 2012 +0100 + + Primary and Control now conflict. + + When we grab a shortcut with the Primary modifier, we also look for + conflicts with the Control equivalent as they are the same. That way we + can handle shortcuts from old configurations which were grabbed with an + older version of GTK+. + +commit 9e1223c3b5f85fc43975cf44a2872a65eb6ed09f +Author: Transifex +Date: Sun Dec 30 00:21:10 2012 +0100 + + Update translators, week 52. + +commit a8c6cd3340203a7229746116e294bbf3a0dc713b +Author: Jérôme Guelfucci +Date: Sat Dec 29 14:56:50 2012 +0100 + + Don't initialize the match context values twice. + + They are initialized to the correct values by the later + gtk_accelerator_parse call. + +commit f79efc609adea4155683c5d3cf381823f60ce95c +Merge: dcac544 154454e +Author: Jérôme Guelfucci +Date: Fri Dec 28 15:52:00 2012 +0100 + + Merge branch 'jeromeg/keyboard-shortcuts' of ssh://git.xfce.org/xfce/libxfce4ui into jeromeg/keyboard-shortcuts + +commit dcac544ec6c81e0f1e1b024b32ad56f753ea75c1 +Author: Jérôme Guelfucci +Date: Fri Dec 28 09:41:37 2012 +0100 + + Merge existing xfwm4 translations. + +commit 055ed2c30449991613637efa86b074eb7e2e5a95 +Author: Jérôme Guelfucci +Date: Fri Dec 28 09:30:54 2012 +0100 + + Update po files. + +commit eb0b1df12eccfbcc7ed92656a7094ae45eba68a4 +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:48:17 2012 +0100 + + When refusing a shortcut, show the explanation again. + +commit bae2a6eb8ad188585510cd2f8b0ea84ea381d36f +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:44:34 2012 +0100 + + Show shortcut label instead of Gtk accelerator in conflict dialog. + +commit 7e1349870e58425e92b05fd143c4c2d55775d966 +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:32:33 2012 +0100 + + Use parent when showing warning. + +commit 4f0d394aec8618acea49a030873cc271fd4253b6 +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:22:29 2012 +0100 + + Improve explanation label. + + Make it italic and escape the text because the command may contain + special caracters. + +commit 3e158dc0c8b3cbca57d2af07f13780d3337d1ce5 +Author: Jérôme Guelfucci +Date: Fri Dec 21 15:05:55 2012 +0100 + + Improve the UI of the dialog to grab shortcuts. + + Add an explanation string to make it clear that the user is expected to + press the keys. + +commit f29fa617c47ac595d4c13095eb210fdf0b54aad2 +Author: Jérôme Guelfucci +Date: Thu Dec 20 23:38:22 2012 +0100 + + Show the accelerator label in the shortcut dialog. + +commit 173f728069b313c4091120a81565bd4ef13fad51 +Author: Jérôme Guelfucci +Date: Thu Dec 20 23:21:43 2012 +0100 + + Add some debugging information for conflict. + +commit f30f9742e64ea5ec3b23d977b904f24799d773d6 +Author: Jérôme Guelfucci +Date: Thu Dec 20 11:04:20 2012 +0100 + + Allow passing parent window to conflict dialog. + +commit 6633a2deed6ab60fbb02c157a8c9499c1824fb4e +Author: Jérôme Guelfucci +Date: Thu Dec 20 10:34:23 2012 +0100 + + Fix keyboard shortcuts with keypad (bug #4178). + + To do so, we also grab all shortcuts with the numlock modifier. + +commit 32a1221559da5a8ca47721607825c765ef83ab9f +Author: Jérôme Guelfucci +Date: Thu Dec 20 10:32:39 2012 +0100 + + Get rid of FinallyGetModifiersForKeycode. + + It simply does not work as expected and the logic seems boggus. + +commit 48f729834b39fc56538f7ad5dd8cd21429605d7f +Author: Jérôme Guelfucci +Date: Wed Dec 19 22:28:07 2012 +0100 + + Add xfwm4 shortcut values to POTFILES.in + +commit 4266240b57661eea9620643ab7c091a265d9b507 +Author: Jérôme Guelfucci +Date: Wed Dec 19 22:26:09 2012 +0100 + + Show the window manager action name when conflicting. + + We use the translated string representing the window manager action so + that the conflict is easy to understand. + +commit ad4a603247a5d56dfe25c0b1109c7bec06a9ab7d +Author: Jérôme Guelfucci +Date: Wed Dec 19 17:38:10 2012 +0100 + + Move xfwm4 shortcut names to libxfce4kbd-private. + +commit 9d0ad9da24e30c314d80a82c8204441f4ace948c +Author: Jérôme Guelfucci +Date: Wed Dec 19 14:56:06 2012 +0100 + + Use instead of (bug #8200). + + While works fine now for grabbing / detecting, shortcut + comparison is broken because the strings are different. + + This only deals with the default shortcuts, we need to migrate the + custom shortcuts. + +commit 597d9f694ff4d1f8420544936095b92ef1c9873e +Author: Jérôme Guelfucci +Date: Tue Dec 18 10:00:42 2012 +0100 + + Fix alt + print being detected as SysReq (bug #7897). + + If we were able to grab it, it means that this combination is not used + as SysReq, users should then be able to use that. + + Note that this won't work by default on most distributions because the + SysReq key is enabled and X won't pass the event. You need to disable the + SysReq key, for example by setting "kernel.sysrq = 0" in /etc/sysctl.conf. + +commit 441e8ed5fbe31cab23f76ab8872d423d822b02ae +Author: Jérôme Guelfucci +Date: Tue Dec 18 09:03:38 2012 +0100 + + No need to remove consumed modifiers twice. + +commit 9dfbc906f89601f145557fe6846e9ad44a8e9e22 +Author: Harald Judt +Date: Tue Dec 18 09:00:44 2012 +0100 + + Fix keyboard shortcuts with Shift modifier (bug #8744). + +commit e56596a37ffdb4fe8fda4491466e6f826270accc +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:21:03 2012 +0100 + + Improve key comparison. + + Remove horrible hardcoded hack and use the recommanded way of comparison + described in the GDK documentation instead. + +commit ea42d959502588e8cb5e9e08a4bd799bf9718f6d +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:05:21 2012 +0100 + + Fix indentation. + +commit e9560f02f5bdad4f8f50b2f72d6c92d0173c0ea2 +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:04:16 2012 +0100 + + Pass event group when translating keyboard state. + +commit 77ff43f265e35163c1b251e2d4b0e556e4e0b0cf +Author: Nick Schermer +Date: Thu Dec 27 11:21:48 2012 +0100 + + Remove unmaintained translations. + +commit cff10b9438808637139e3e4ffed637fd9b752a82 +Author: Johannes Lips +Date: Sun Dec 23 09:14:13 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 90 messages complete with 2 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1465d972c2f85e495c8badadec91623e5aa4088c +Author: Transifex +Date: Sun Dec 23 00:21:08 2012 +0100 + + Update translators, week 51. + +commit 154454e31ef4a31293a6200ba74db5448e3c14e4 +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:48:17 2012 +0100 + + When refusing a shortcut, show the explanation again. + +commit 5ca5fe53554e738200705ea532634e10515c3a1f +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:44:34 2012 +0100 + + Show shortcut label instead of Gtk accelerator in conflict dialog. + +commit 60ee8b36952ab4fd8157b27cf413f4e74771b898 +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:32:33 2012 +0100 + + Use parent when showing warning. + +commit 77eded0c2c4dd95e7117db4bce6634f998a825aa +Author: Jérôme Guelfucci +Date: Sat Dec 22 10:22:29 2012 +0100 + + Improve explanation label. + + Make it italic and escape the text because the command may contain + special caracters. + +commit 76c2d966f23155e7faa40427dbd8a8cc0e26a038 +Author: Jérôme Guelfucci +Date: Fri Dec 21 15:05:55 2012 +0100 + + Improve the UI of the dialog to grab shortcuts. + + Add an explanation string to make it clear that the user is expected to + press the keys. + +commit f3ed87bd674c0e7464018082566fbb62a9226628 +Author: Jérôme Guelfucci +Date: Thu Dec 20 23:38:22 2012 +0100 + + Show the accelerator label in the shortcut dialog. + +commit e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05 +Author: Jérôme Guelfucci +Date: Thu Dec 20 23:21:43 2012 +0100 + + Add some debugging information for conflict. + +commit b56143b76d5e25ac661252d177cb7f598abfde87 +Author: Jérôme Guelfucci +Date: Thu Dec 20 11:04:20 2012 +0100 + + Allow passing parent window to conflict dialog. + +commit 4c2a8a1dd003091288f4b86521ae8f3ff7359370 +Author: Jérôme Guelfucci +Date: Thu Dec 20 10:34:23 2012 +0100 + + Fix keyboard shortcuts with keypad (bug #4178). + + To do so, we also grab all shortcuts with the numlock modifier. + +commit f48c83b67cb46f7b64d4d5cd3bb474e7ee4e9b8b +Author: Jérôme Guelfucci +Date: Thu Dec 20 10:32:39 2012 +0100 + + Get rid of FinallyGetModifiersForKeycode. + + It simply does not work as expected and the logic seems boggus. + +commit 8f1bb1455886ee653979fddd3d2aaedf43a0ee2c +Author: Jérôme Guelfucci +Date: Wed Dec 19 22:28:07 2012 +0100 + + Add xfwm4 shortcut values to POTFILES.in + +commit 53be9bc959c524a140c89e0649be7bb86f191550 +Author: Jérôme Guelfucci +Date: Wed Dec 19 22:26:09 2012 +0100 + + Show the window manager action name when conflicting. + + We use the translated string representing the window manager action so + that the conflict is easy to understand. + +commit c08f561880fcf5633b48549aef8b11710b6ded37 +Author: Jérôme Guelfucci +Date: Wed Dec 19 17:38:10 2012 +0100 + + Move xfwm4 shortcut names to libxfce4kbd-private. + +commit 128a25d53a689896f29a0936d0d686478c107aa7 +Author: Jérôme Guelfucci +Date: Wed Dec 19 14:56:06 2012 +0100 + + Use instead of (bug #8200). + + While works fine now for grabbing / detecting, shortcut + comparison is broken because the strings are different. + + This only deals with the default shortcuts, we need to migrate the + custom shortcuts. + +commit 0d2c165aeff3da0268276cbc75f9470bfc349e4b +Author: Jérôme Guelfucci +Date: Tue Dec 18 10:00:42 2012 +0100 + + Fix alt + print being detected as SysReq (bug #7897). + + If we were able to grab it, it means that this combination is not used + as SysReq, users should then be able to use that. + + Note that this won't work by default on most distributions because the + SysReq key is enabled and X won't pass the event. You need to disable the + SysReq key, for example by setting "kernel.sysrq = 0" in /etc/sysctl.conf. + +commit 927438b9ce57253d705a846725892935d02f9f1f +Author: Jérôme Guelfucci +Date: Tue Dec 18 09:03:38 2012 +0100 + + No need to remove consumed modifiers twice. + +commit 0da716be5ecc87bcc74c5ea40b14b8f93c0d7d73 +Author: Harald Judt +Date: Tue Dec 18 09:00:44 2012 +0100 + + Fix keyboard shortcuts with Shift modifier (bug #8744). + +commit 3bb8c7d4de8132741da54a26c98459167c51fd87 +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:21:03 2012 +0100 + + Improve key comparison. + + Remove horrible hardcoded hack and use the recommanded way of comparison + described in the GDK documentation instead. + +commit 160d4fe42952284a4bcc48760ae6706ca28fa7e5 +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:05:21 2012 +0100 + + Fix indentation. + +commit bb03d1007f7f14796bbae1d2b6c00cfb38ac57b2 +Author: Jérôme Guelfucci +Date: Tue Dec 18 08:04:16 2012 +0100 + + Pass event group when translating keyboard state. + +commit b4a07cd9cb552a4a32a26643196c8154616b6a55 +Author: Transifex +Date: Sun Dec 16 00:21:09 2012 +0100 + + Update translators, week 50. + +commit 7a7b32e67f6850c80a793df2daf249bce9ef35a1 +Author: Seong-ho Cho +Date: Wed Dec 12 11:01:55 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1824560b0b290d3a59ce9b8a73578fe2babb5bd3 +Author: Yaron Shahrabani +Date: Tue Dec 11 10:29:48 2012 +0100 + + l10n: Updated Hebrew (he) translation to 21% + + New status: 20 messages complete with 0 fuzzies and 72 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4e7995cb83f0fc5557f5fce2b3f08832bc7a3ebf +Author: Yaron Shahrabani +Date: Tue Dec 11 10:29:16 2012 +0100 + + l10n: Updated Hebrew (he) translation to 20% + + New status: 19 messages complete with 1 fuzzy and 72 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4734729bc79c3078bffd4a6d4c1c7481e165521d +Author: Yaron Shahrabani +Date: Tue Dec 11 10:27:36 2012 +0100 + + l10n: Updated Hebrew (he) translation to 16% + + New status: 15 messages complete with 1 fuzzy and 76 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3f0780964875da8ee33ade5c1858ec9f0895f104 +Author: محمد الحرقان +Date: Sun Dec 9 11:18:47 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 10b654fca35482db6fb2380fba693d087f1b41e0 +Author: Transifex +Date: Sun Dec 9 00:21:15 2012 +0100 + + Update translators, week 49. + +commit 0f1adc8711512f230fef092c07e36459a1147f6f +Author: jc jc1 +Date: Fri Dec 7 13:42:34 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c5c3d037e18b53e850eff2f3de657335cff35910 +Author: Yarema aka Knedlyk +Date: Tue Dec 4 14:33:45 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a974a2774520a4951f70c56d5f24967ba1cf7da2 +Author: Piarres Beobide +Date: Mon Dec 3 23:14:52 2012 +0100 + + l10n: Updated Basque (eu) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a473cd0927e20b7e69a2af0280ef446590287263 +Author: Gheyret Kenji +Date: Mon Dec 3 06:03:37 2012 +0100 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a2a6f4baa4163915419d48122074cfc05e5c55ac +Author: Piotr Sokół +Date: Sun Dec 2 16:25:38 2012 +0100 + + l10n: Updated Polish (pl) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5e14fde544944090e73d3491ae3a6b1b6eea57a7 +Author: Transifex +Date: Sun Dec 2 00:21:08 2012 +0100 + + Update translators, week 48. + +commit 29a7451c1b28352d062a0b5d1f94327553881433 +Author: Yarema aka Knedlyk +Date: Tue Nov 27 20:16:51 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 882f037e2018972a794e8e84ad825fe7fc0bb5df +Author: Sergio Marques +Date: Tue Nov 27 12:14:39 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f7eeda3e549490451f87287810517d10d0b146bf +Author: Imre Benedek +Date: Mon Nov 26 23:31:04 2012 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ac65ed8ec9c836e45f10c199d2546df1291c150b +Author: Pjotr vertaalt +Date: Mon Nov 26 10:39:53 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1cf8679d0c4d5f272dbf20bc4604d2e1c223bee2 +Author: Roman K +Date: Mon Nov 26 09:44:26 2012 +0100 + + l10n: Updated Russian (ru) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dccae61e1b99f52559b575342b3abd7e0b93ba26 +Author: Michal Várady +Date: Sun Nov 25 13:01:33 2012 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit aa9658a28c465b3cba4a3d7e40f8c808cdfa0f54 +Author: Michal Várady +Date: Sun Nov 25 13:00:43 2012 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6fe8ffc53cd38e33b3a1b95bf42a84ec2e015b55 +Author: Per Kongstad +Date: Sun Nov 25 10:01:30 2012 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ddfb0546fe9c8e21ffaa9f0a4a1be636ce088a56 +Author: Walter cheuk +Date: Sun Nov 25 08:46:00 2012 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2f0f5e3ce7078988825dd3cbfc1e46e9fb8c8bf2 +Author: prflr88 +Date: Sun Nov 25 05:08:16 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 412b37d666a661d76af6b06739a1077a95f13dc9 +Author: Transifex +Date: Sun Nov 25 00:21:10 2012 +0100 + + Update translators, week 47. + +commit 3c274f45224f1825d41e12afe6382eca346f9dd3 +Author: Baurzhan Muftakhidinov +Date: Sat Nov 24 15:35:14 2012 +0100 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d9d37c5a7770bad44c7876287d810fbc303982ab +Author: Rafael Ferreira +Date: Sat Nov 24 10:05:00 2012 +0100 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4b91e3b649e24a4a59bc41f395755099a5684ad5 +Author: Cristian Marchi +Date: Sat Nov 24 08:52:47 2012 +0100 + + l10n: Updated Italian (it) translation to 100% + + New status: 92 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 146ee33ec36cda1ff9f3eb12f3a0bb97142bc623 +Merge: 2ef1c97 e49a469 +Author: Jérôme Guelfucci +Date: Sat Nov 24 01:04:17 2012 +0100 + + Merge branch 'master' of ssh://git.xfce.org/xfce/libxfce4ui + +commit 2ef1c9713fdbf6a27a3c90544dc1c5ed52d75fa5 +Author: Jérôme Guelfucci +Date: Sat Nov 24 01:02:13 2012 +0100 + + Don't remove keyboard shortcut when entered twice (bug #8749). + + We know reject the shortcut the second time during the validation step. + +commit e49a469e62be617cac718889b7c210c9f2f8d7c0 +Author: Seong-ho Cho +Date: Sun Nov 18 06:13:44 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 05b5a2baffae28ab40857d93f0a42b15ef801ec6 +Author: Seong-ho Cho +Date: Sun Nov 18 06:02:42 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 412cfe94b8a7d62c237ba98291f40ac27428ae94 +Author: Seong-ho Cho +Date: Sun Nov 18 05:44:22 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 000cd39444e3c0ca26a9734902cabf47b014b7b9 +Author: محمد الحرقان +Date: Sun Nov 18 04:46:16 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0d5fec642f8204b4407e0ca76e99366adb5af8a8 +Author: Transifex +Date: Sun Nov 18 00:21:04 2012 +0100 + + Update translators, week 46. + +commit 2ce5975f1b049b45c187f15c4fefa5cbb35b5a51 +Author: Transifex +Date: Sun Nov 11 00:21:10 2012 +0100 + + Update translators, week 45. + +commit b6bd5660deede85f431362ca9702180b0da90923 +Author: Francisco Javier Serrador +Date: Sat Nov 10 17:01:57 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 647164fbdb48d1e23485c3e9526e6f089f9430ef +Author: Piotr Sokół +Date: Fri Nov 9 14:57:05 2012 +0100 + + l10n: Updated Polish (pl) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5a7bf827e0f6713868190ce75bab2c12b28e8b25 +Author: Transifex +Date: Sun Nov 4 00:21:03 2012 +0100 + + Update translators, week 44. + +commit c540a83f7f8f6d84e137764c3c627421e4384fe9 +Author: Transifex +Date: Sun Oct 28 00:21:08 2012 +0200 + + Update translators, week 43. + +commit a5128e64a6888f243af840eea431a48974ff09fe +Author: Gheyret Kenji +Date: Wed Oct 24 05:08:39 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2d41b89be29f6aefc957526c5b5890c73c1869ac +Author: Transifex +Date: Sun Oct 21 00:21:04 2012 +0200 + + Update translators, week 42. + +commit a28d67c486a05e38730d89da748d42014e9b44d9 +Author: Transifex +Date: Sun Oct 14 00:21:11 2012 +0200 + + Update translators, week 41. + +commit a7e2fd2794c83b58d451849735248eba368f1e72 +Author: Jérôme Guelfucci +Date: Wed Oct 10 14:13:31 2012 +0200 + + Fix build with --enable-gtk-doc. + + The documentation generation might still need to be ported to also + generate documentation for GTK+ 3. + +commit d2b46f86dde38e8608bd9f3e9dac995f0be962ac +Author: Transifex +Date: Sun Oct 7 00:21:03 2012 +0200 + + Update translators, week 40. + +commit 4378f99e579bacbf7a3ad4e6dbcbefbc34f82051 +Author: Transifex +Date: Sun Sep 30 00:21:02 2012 +0200 + + Update translators, week 39. + +commit f22802b87fd8d4a6ffaead71f565547a52a2fa1b +Author: Transifex +Date: Fri Sep 28 17:36:46 2012 +0200 + + Update translators, week 39. + +commit 4f3084cea2901cda3d333f5a8ca2019e866e5c32 +Author: Nick Schermer +Date: Fri Sep 21 18:43:44 2012 +0200 + + Compile GTK3 version of kbd library. + +commit efde953ab16a3fdbb0b21161fa5414cce89bdc26 +Author: Nick Schermer +Date: Thu Sep 20 19:53:15 2012 +0200 + + Compile with gseal enabled. + +commit 585dc915b8a792170ca423405689a3823804f28f +Author: Nick Schermer +Date: Thu Sep 20 19:33:20 2012 +0200 + + Fix background color in gtk2 header code. + + Removed a bit too much code. + +commit 6df44d29a4e8bda569d371ad3050f4a31c964dd0 +Author: Nick Schermer +Date: Wed Sep 19 21:32:39 2012 +0200 + + Depend on GTK 2.24 and Glib 2.28. + +commit c2054ccb6cf01fa7c171174769fcf04c2dc340b7 +Author: Nick Schermer +Date: Wed Sep 19 18:57:55 2012 +0200 + + Compile GTK+-3 version of libxfce4ui when possible. + + Provide a GTK3 version of the library next to the GTK2 + version if GTK3 is found on the system. The same code + is compiled twice. + + Porting of this code is also work of Stephan Arts. + +commit 163435879ff61423da8960df486402a8db06ffdf +Author: Tegegne Tefera +Date: Wed Sep 19 08:05:45 2012 +0200 + + l10n: libxfce4ui Amharic po submission + + New status: 4 messages complete with 0 fuzzies and 86 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 44fedcd555b9b83f2667e10fb294c309a552da00 +Author: Gheyret Kenji +Date: Mon Jul 16 08:14:39 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cd3beea1b9eb219f0056b944af855e52e6d3be9d +Author: Gheyret Kenji +Date: Fri Jul 13 02:28:30 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bc051b13be3364face143deb68b25eda24281892 +Author: Sveinn í Felli +Date: Mon Jul 2 17:20:31 2012 +0200 + + l10n: Updated Icelandic (is) translation to 85% + + New status: 77 messages complete with 0 fuzzies and 13 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0ed866864701f2cf4a5eaa29ff4f16ee9f27a5e0 +Author: Sveinn í Felli +Date: Fri Jun 29 22:27:20 2012 +0200 + + l10n: Updated Icelandic (is) translation to 64% + + New status: 58 messages complete with 0 fuzzies and 32 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4fd49a5d8603868b3a8fa6caaba0c38b72b86780 +Author: Мирослав Николић +Date: Wed Jun 20 11:23:07 2012 +0200 + + l10n: New Serbian translation, author salepetronije + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3b1ed10766764f1f2c02bff41d9f7182d9bf5263 +Author: Gheyret Kenji +Date: Thu May 31 07:38:51 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 75f88966cd05b0c1427bbed43f84abc07386bbfa +Author: Nick Schermer +Date: Tue May 1 22:05:35 2012 +0200 + + Prefer exo-open for opening the manual pages. + + gtk_show_uri() could fail if the mimelist is not properly + configured or gvfs is missing. Instead try exo-open first + because it is likely this is installed. + +commit f456ea9563a5cf9367bc4e348f63a8909e109879 +Author: Transifex +Date: Sun Apr 29 00:21:14 2012 +0200 + + Update translators, week 17. + +commit fa340aab0a5fd998a14c8ded76d1c1e7833394e5 +Author: Nick Schermer +Date: Sat Apr 28 21:45:15 2012 +0200 + + Post release tag bump. + +commit cf85eac7804e09b24f3e8fb4165f60b1c9f8cf49 +Author: Nick Schermer +Date: Sat Apr 28 21:43:30 2012 +0200 + + Updates for release. + +commit aaa2c231e919b915e567b363bcf3397b630eae3e +Author: Sergio García +Date: Sat Apr 28 06:58:57 2012 +0200 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 30a0513a4be435e70299a3308df14bbc068f533e +Author: Mișu Moldovan +Date: Fri Apr 27 23:54:12 2012 +0200 + + l10n: Updated Romanian (ro) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ea1dd2364b953db319a089c070796c56703cd931 +Author: Nick Schermer +Date: Fri Apr 27 19:39:40 2012 +0200 + + More contributor updates. + +commit 1f8aa70d5c24fc3190074d2fe1e289c9dc2c7430 +Author: Nuno Miguel +Date: Thu Apr 26 17:31:18 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4aebeefcaca83183dee9568f44641d2834350f56 +Author: Andres Sanchez +Date: Tue Apr 24 21:18:36 2012 +0200 + + l10n: Updated Spanish (Castilian) (es) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 24013428b905a908dc0ab140bdd79bf34fd0152a +Author: Nick Schermer +Date: Tue Apr 24 18:57:45 2012 +0200 + + Add missing contributor. + +commit b87e18f456b839da458dce790e947df8ac89c69a +Author: Nick Schermer +Date: Tue Apr 24 18:38:52 2012 +0200 + + Update contributor credits. + +commit 51b7420974ed32d5723c0bf43c2dcdf20ebad892 +Author: Masato Hashimoto +Date: Mon Apr 23 14:07:49 2012 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit fd3106750a601d324bf0c64d870b61dcffddd01e +Author: Leandro Regueiro +Date: Mon Apr 23 13:58:12 2012 +0200 + + l10n: Updated Galician (gl) translation to 95% + + New status: 86 messages complete with 0 fuzzies and 4 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 954a9d2a4cf912435143d315a2c6bd8c1c67426f +Author: Leandro Regueiro +Date: Mon Apr 23 13:49:51 2012 +0200 + + l10n: Updated Galician (gl) translation to 90% + + New status: 81 messages complete with 0 fuzzies and 9 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit de9fbf1c575324869e1ac525d53ad98e5ec48d21 +Author: Chipong Luo +Date: Mon Apr 23 09:00:10 2012 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 42568ae3a9d0068ae03b6ee1703e98ef93f19702 +Author: Seong-ho Cho +Date: Sun Apr 22 21:00:10 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d5e74aa27666baf6949bb4505a68b1a02d808f52 +Author: Transifex +Date: Sun Apr 22 00:21:14 2012 +0200 + + Update translators, week 16. + +commit 3adc1a58fbd91aeac87c01626a4051a6b02e1f39 +Author: Nick Schermer +Date: Fri Apr 20 20:23:57 2012 +0200 + + Enable startup notification in xfce4-appfinder shortcuts. + +commit 5e15e5d80c7ea00ece00c1f6375d19dbb0a42800 +Author: Chipong Luo +Date: Fri Apr 20 14:50:17 2012 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0af8c45cca50d04469c6e3b8d4780c32d1bd080e +Author: Bauzhan Muftakhidinov +Date: Fri Apr 20 10:01:51 2012 +0200 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c48b6df5403a8406c6530fcf98a2cf37a6b2e02d +Author: Nick Schermer +Date: Thu Apr 19 21:03:08 2012 +0200 + + Fix abicheck.sh on Linux systems. + +commit db7f2f0b5ed19ea463c55da2ea48f65186a75513 +Author: Jeff Bailes +Date: Thu Apr 19 08:42:17 2012 +0200 + + l10n: Updated English (United Kingdom) (en_GB) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 89db5a5e7fde9a0595214bc59649f06ab508df95 +Author: Landry Breuil +Date: Wed Apr 18 22:11:54 2012 +0200 + + Run nm on libxfce4ui-1.so* (bug #8702). + + Run nm on libxfce4ui-1.so* as with OpenBSD's libtool it's versionned 0.0 at that point + +commit e70f1bafbc116f600e0b3a35fd7df5e4f740c721 +Author: Sergio García +Date: Wed Apr 18 06:18:28 2012 +0200 + + l10n: Updated Spanish (Castilian) (es) translation to 97% + + New status: 88 messages complete with 0 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 12165f0cd0321afec5748fcc1f3a23f808c0c5e8 +Author: Seong-ho Cho +Date: Tue Apr 17 16:01:52 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 43d4d4cc582b6d99b43641d20e9680d1f62ca098 +Author: Pjotr Anon +Date: Tue Apr 17 12:25:06 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6c19ae0e667303ec9ecccb7e17e4697988a60e1f +Author: Nick Schermer +Date: Sun Apr 15 14:02:31 2012 +0200 + + Check abicheck.sh to be more portable (bug #8702). + +commit 2c6528d2c7b5ea15e7673482f21a421b9dcf7e27 +Author: Transifex +Date: Sun Apr 15 00:21:11 2012 +0200 + + Update translators, week 15. + +commit 00d4a6a4955f3108f4aed92a176c62bb48127e9e +Author: Henrique P. Machado +Date: Sat Apr 14 22:16:27 2012 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit df66e784f7be42aed304dbfba8db683f5f70cb4f +Author: Nick Schermer +Date: Fri Apr 13 23:34:29 2012 +0200 + + Post release tag bump. + +commit 8fc1df73f5c15563ca083ad2df9cfeb30958078a +Author: Nick Schermer +Date: Fri Apr 13 23:33:08 2012 +0200 + + Updates for release. + +commit 03cbe61157040df44e6185d9a1f473a098833b55 +Author: Nick Schermer +Date: Fri Apr 13 20:30:43 2012 +0200 + + Remove unused function prototype. + +commit acc2ae98b9ff5c47e42e9bfeb05e35ac0de58c2f +Author: Nuno Miguel +Date: Fri Apr 13 13:20:53 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1603897c298c96cc6f32b17055a6da8f6d534bbe +Author: Jakob Kramer +Date: Fri Apr 13 10:55:03 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f1d9cd5157ff7e711fa1a6407317e431b1c8b246 +Author: Jakob Kramer +Date: Fri Apr 13 10:52:26 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6915b6cccf8aa53179baf9f60c1cd3755e51377f +Author: Jakob Kramer +Date: Thu Apr 12 22:06:28 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 728c29324856a3afc78f1fbee95c257eb0c6649f +Author: Jakob Kramer +Date: Thu Apr 12 21:58:04 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e6f4d803fef7e15741ff851e470f09ac16142d68 +Author: Jakob Kramer +Date: Thu Apr 12 21:43:09 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit fb94d94bf036e28635a3ed3ec96b12a033ae784a +Author: Jakob Kramer +Date: Thu Apr 12 21:42:32 2012 +0200 + + l10n: Updated German (de) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6b62ad9a4790622bc4f505389b264f72346c3fdb +Author: Nuno Miguel +Date: Thu Apr 12 19:26:15 2012 +0200 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 349508583b655d558a6302fae29546884cab9c10 +Author: Piotr Sokół +Date: Thu Apr 12 10:41:34 2012 +0200 + + l10n: Updated Polish (pl) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a69672821130954e4826a6990bf22bd804bc9d2f +Author: Efstathios Iosifidis +Date: Wed Apr 11 20:01:55 2012 +0200 + + l10n: Updated Greek (el) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d019a13804470038b06d7134b36048cf23571ecd +Author: Masato Hashimoto +Date: Wed Apr 11 15:28:37 2012 +0200 + + l10n: Updated Japanese (ja) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a44069510c62a19d175929ef1fc73e9fbe22e7be +Author: Leandro Regueiro +Date: Tue Apr 10 13:06:01 2012 +0200 + + l10n: Updated Galician (gl) translation to 68% + + New status: 62 messages complete with 1 fuzzy and 27 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4f33dc5580ba881789c3aa5cd33961504c3d9127 +Author: Seong-ho Cho +Date: Sun Apr 8 15:19:48 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 376000f8b22aeba08db60963b026a64cf93f766c +Author: Transifex +Date: Sun Apr 8 00:21:17 2012 +0200 + + Update translators, week 14. + +commit bba7324b267f27a871d07a6a53ead7d2716ebb88 +Author: Piotr Sokół +Date: Sat Apr 7 18:34:28 2012 +0200 + + l10n: Updated Polish (pl) translation to 88% + + New status: 80 messages complete with 6 fuzzies and 4 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2d52c92f10ef144c4cdfd5625b7c35f15b776206 +Author: Nick Schermer +Date: Sat Apr 7 18:20:27 2012 +0200 + + Bump 4util dependency. + +commit bf0f0964f9dc0d3e50f8fc00d074972c6719f2a3 +Author: Nick Schermer +Date: Sat Apr 7 17:46:21 2012 +0200 + + Increase gtk and glib versions. + +commit 99af09fca19f7dc41ae38dc61e5b0baa8612d7d3 +Author: Christoph Wickert +Date: Sat Apr 7 09:18:42 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b2199e2edc70beb8bf31ee34198bd2412edcd686 +Author: Christoph Wickert +Date: Fri Apr 6 19:34:28 2012 +0200 + + l10n: Updated German (de) translation to None% + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bab78d5f7eaa8653a8bd2a0ee189d200cc233ac9 +Author: Christoph Wickert +Date: Fri Apr 6 19:31:28 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 98887e12164f50abb345d5b7309b6ecf83a264b9 +Author: Seong-ho Cho +Date: Thu Apr 5 11:52:41 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit fd2a7987a497f3b8d31f7d0441442b4084be4d6a +Author: Seong-ho Cho +Date: Wed Apr 4 23:54:54 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5b458a3b1c5944b3f003d28f6d9576ca05997c7a +Author: Christoph Wickert +Date: Wed Apr 4 12:48:59 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit aae8c7dd624b7f1ee59257c34185910aef21270e +Author: Christoph Wickert +Date: Wed Apr 4 12:43:52 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a3aa0b340629b1747062c5660e80335c64aa8621 +Author: Christoph Wickert +Date: Wed Apr 4 12:34:08 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0c8ca354f3eb32edfa57dadb5fb796be5872cb5e +Author: Christoph Wickert +Date: Wed Apr 4 00:56:01 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 55c34a495326dba867e955363f479a6be2e0f42b +Author: Christoph Wickert +Date: Wed Apr 4 00:52:17 2012 +0200 + + l10n: Updated German (de) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 77a1d794bb9aa3585ff09886f24a33d6a1fe1e0d +Author: Raphael Groner +Date: Tue Apr 3 21:58:42 2012 +0200 + + l10n: Updated German (de) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f1428aef7c5fc3e759d1af61bbd7e09a30bccfab +Author: Jakob Kramer +Date: Tue Apr 3 21:00:33 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7d6733b10fc3f1cc4c962e69ab2fc962db1f48d5 +Author: Jakob Kramer +Date: Tue Apr 3 20:52:05 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a02f223895895048f789e6a2a9e6fb0e796e6462 +Author: Jakob Kramer +Date: Tue Apr 3 20:51:12 2012 +0200 + + l10n: Updated German (de) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8ba6dc2b293c844e82e2ef3fe949c5ee3e3e1fdd +Author: Jakob Kramer +Date: Tue Apr 3 20:47:19 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a987c4080f0b3ec2f0503803958d0295df64a860 +Author: Jakob Kramer +Date: Tue Apr 3 20:45:43 2012 +0200 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 89cff3da50db74465a37e30aab791d3c3b6b7b18 +Author: Alper Tekinalp +Date: Tue Apr 3 11:41:28 2012 +0200 + + l10n: Updated Turkish (tr) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8f47919572be57a0fbe0dcb42aabcd7d11b1b432 +Author: Pjotr Anon +Date: Sun Apr 1 23:29:40 2012 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 49ec9a60441ac99306a568e7a4e03773d444319e +Author: Christoph Wickert +Date: Sun Apr 1 22:07:48 2012 +0200 + + l10n: Updated German (de) translation to 97% + + New status: 88 messages complete with 2 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 92f2fe8935fd526db28aecf6ec83f63a770da819 +Author: Raphael Groner +Date: Sun Apr 1 20:19:09 2012 +0200 + + l10n: Updated German (de) translation to 91% + + New status: 82 messages complete with 8 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d08511556c3119bb2c4a8dc38b3e9af83c1c1109 +Author: Raphael Groner +Date: Sun Apr 1 20:17:02 2012 +0200 + + l10n: Updated German (de) translation to 92% + + New status: 83 messages complete with 7 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit febbe39f103c8f1e45e45b90fca8d20cd1ed6578 +Author: Raphael Groner +Date: Sun Apr 1 20:14:21 2012 +0200 + + l10n: Updated German (de) translation to 91% + + New status: 82 messages complete with 8 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 56f186817968fcad0ba2b427f8fe80d080c90f80 +Author: Raphael Groner +Date: Sun Apr 1 20:11:02 2012 +0200 + + l10n: Updated German (de) translation to 92% + + New status: 83 messages complete with 7 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a402b539893892c2708b240092c8317810e3fff4 +Author: Raphael Groner +Date: Sun Apr 1 20:03:46 2012 +0200 + + l10n: Updated German (de) translation to 91% + + New status: 82 messages complete with 8 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5183bf31f2c64384c782e20d50fc66d4df8db3b7 +Author: Seong-ho Cho +Date: Sun Apr 1 12:13:48 2012 +0200 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 23d4e1dabd04a1d694ed353748ac7580008c9326 +Author: Transifex +Date: Sun Apr 1 00:21:12 2012 +0200 + + Update translators, week 13. + +commit d7faed8ea9fff76783e3b3772da89262b5644e65 +Author: Urmas D +Date: Fri Mar 30 04:23:42 2012 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4ad825fa9af7a7fa88904dda6ea8dad703059ebf +Author: Mario Blättermann +Date: Thu Mar 29 12:16:14 2012 +0200 + + l10n: Updated German (de) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d6d566d6527b2289c93928ccca5c1e5f44a818bd +Author: Nick Schermer +Date: Wed Mar 28 17:10:03 2012 +0200 + + Post release tag bump. + +commit eefa72b11aba39291bfe5c5f1ec467b009aca35d +Author: Nick Schermer +Date: Wed Mar 28 17:08:41 2012 +0200 + + Updates for release. + +commit 2c1ec4161d25c34f547519703dadbefc7b4efe3c +Author: Jari Rahkonen +Date: Wed Mar 28 16:04:56 2012 +0200 + + l10n: Updated Finnish (fi) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ff662dbc22b6b0a07efc68087dbd3960548c2fb3 +Author: Jari Rahkonen +Date: Wed Mar 28 16:00:26 2012 +0200 + + l10n: Updated Finnish (fi) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 907e66d9835feaffc6b47b2daeba6c496b2a8ad9 +Author: Transifex +Date: Sun Mar 25 00:21:14 2012 +0100 + + Update translators, week 12. + +commit 1826056ecfc15d171186610df7b2d6fd8491ddc8 +Author: Transifex +Date: Sun Mar 18 00:21:12 2012 +0100 + + Update translators, week 11. + +commit b08ecab592c91e7d25625bb99d2b2457591dbc30 +Author: Praveen Illa +Date: Sun Mar 11 19:30:21 2012 +0100 + + l10n: Updated Telugu (te) translation to 71% + + New status: 64 messages complete with 0 fuzzies and 26 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d7185bf70e3ae3234a8b31cf37b2b85c5b75aa11 +Author: Transifex +Date: Sun Mar 11 00:21:11 2012 +0100 + + Update translators, week 10. + +commit 4611d611b294dd9133efbeb9965f8d4e3f860cc6 +Author: Seong-ho Cho +Date: Thu Mar 8 21:52:55 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c82fa18912f63b0f4f78ee468ec3114a81f190be +Author: Seong-ho Cho +Date: Thu Mar 8 21:48:38 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit efa531a60f7d71f8cd36228b523f7b37462c7aaf +Author: Chipong Luo +Date: Thu Mar 8 05:02:38 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3b2669119249d8d6449e2f7938661818803df597 +Author: Roman K +Date: Tue Mar 6 17:35:27 2012 +0100 + + l10n: Updated Russian (ru) translation to 94% + + New status: 85 messages complete with 4 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7c67f4124f820423550bd2d35af68ff7493bd31d +Author: Seong-ho Cho +Date: Mon Mar 5 20:46:00 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4f83e9746d67499b2255f19cb8902c2f153c085a +Author: Transifex +Date: Sun Mar 4 00:21:09 2012 +0100 + + Update translators, week 09. + +commit 9e682724129090f04dcec73e5555a65d4df3da21 +Author: Per Kongstad +Date: Thu Mar 1 22:32:50 2012 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2b5ed32f99ccdc3fd4724ed4d0ca388ea4b37ee4 +Author: Per Kongstad +Date: Thu Mar 1 22:24:10 2012 +0100 + + l10n: Updated Danish (da) translation to 94% + + New status: 85 messages complete with 5 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e4fbe70b1f36627ae33042e53eaa7f7729141f3f +Author: Seong-ho Cho +Date: Thu Mar 1 20:28:26 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6a098a55178279fcaa5e0b93ae8f9dfd8fb3ff31 +Author: Seong-ho Cho +Date: Thu Mar 1 20:05:03 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f13e3992e149c2e7b37d59bd3f4d4fba7ead4c40 +Author: Erik Schmidt +Date: Tue Feb 28 18:54:51 2012 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9d1d7c3abc592ac55386bb98bcb8c8c2dc24101f +Author: Erik Schmidt +Date: Tue Feb 28 18:38:45 2012 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 83cbd540b84c67b8a367180e5bc941ce59e9c04a +Author: Seong-ho Cho +Date: Tue Feb 28 18:16:26 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8b8e5ed8e888c72c25816b29fdb8ba76250e95a1 +Author: Seong-ho Cho +Date: Mon Feb 27 18:21:13 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 57ad936c206f8efba6cff9de7056e8d354c206dc +Author: Seong-ho Cho +Date: Sun Feb 26 13:09:24 2012 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit db1fbf87a718660fa26050f76767ab63858d28cc +Author: Transifex +Date: Sun Feb 26 00:21:13 2012 +0100 + + Update translators, week 08. + +commit 2a77f808e543150f6dc6fb06480ab95f7a46535a +Author: Nick Schermer +Date: Sat Feb 25 11:00:56 2012 +0100 + + Restore glade directory information in .pc file. + + This is used by xfce4-session in xinitrc. + +commit 713aae03e5dff0f4dea540264b157d653324ea26 +Author: كريم أولاد الشلحة +Date: Fri Feb 24 22:00:32 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 68219d61eb67473dd3b36ca5667669398d62516e +Author: Transifex +Date: Sun Feb 19 00:21:12 2012 +0100 + + Update translators, week 07. + +commit ce6f035e7c63969038fe1303a2786041dcb1a908 +Author: Chipong Luo +Date: Thu Feb 16 07:15:53 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ec6baa951a32fe09ec1e6d5d2819780a0c32837e +Author: Transifex +Date: Sun Feb 12 00:21:12 2012 +0100 + + Update translators, week 06. + +commit 16aa3d7dcae6895c3eac5bb6baf0d24503962d9a +Author: Roger Pueyo Centelles +Date: Fri Feb 10 11:27:27 2012 +0100 + + l10n: Updated Catalan (Valencian) (ca) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 434a62cb2e61c235dda35b098396e023347582eb +Author: Roger Pueyo Centelles +Date: Thu Feb 9 13:06:16 2012 +0100 + + l10n: Updated Catalan (Valencian) (ca) translation to 96% + + New status: 87 messages complete with 0 fuzzies and 3 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1175b4dda9d8b8ce104bcae4468d411a4a4100fb +Author: Chipong Luo +Date: Wed Feb 8 10:17:43 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8ab4d61dfb4a4a948b6c49816e98b7d7ba4f78df +Author: Chipong Luo +Date: Wed Feb 8 07:32:21 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit af8ce8eeb979aa0325ad7ff07cb6c1de8f455a40 +Author: Chipong Luo +Date: Tue Feb 7 02:37:31 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 97f92b7a560c43da19dc9a84957f88c26b7abc53 +Author: Nick Schermer +Date: Sun Feb 5 21:21:07 2012 +0100 + + Cache header icons and avoid large icons. + + Sometimes larger icons then 48x48 were returned by gtk, + avoid this can scale down the icons if this is the case. + + Also cache icon-name loaded icons, those were reloaded twice + each size req/alloc (oops). + +commit 2ba8e3f69853c20b63d130cb9f367f7d7b05914f +Author: Transifex +Date: Sun Feb 5 00:21:10 2012 +0100 + + Update translators, week 05. + +commit c7582446945f64d0db5e22f382d8c8949fe7c4bc +Author: Cheng-Chia Tseng +Date: Sat Feb 4 07:00:53 2012 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b98fed3e03f074a264e14f18f831854da144a2cd +Author: Benoit THIBAUD +Date: Fri Feb 3 19:28:33 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 83ed80b561101028129b0a7a9191a383d0ac2920 +Author: Andhika Padmawan +Date: Fri Feb 3 14:29:53 2012 +0100 + + l10n: Updated Indonesian (id) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f347334018e7094b688ae18635c589959fbd1e61 +Author: Andhika Padmawan +Date: Fri Feb 3 14:28:18 2012 +0100 + + l10n: Updated Indonesian (id) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5e07c1076d028cfa1984d7dda0abd14f90b470b6 +Author: Alper Tekinalp +Date: Mon Jan 30 22:00:23 2012 +0100 + + l10n: Updated Turkish (tr) translation to 98% + + New status: 89 messages complete with 1 fuzzy and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e09e062a2cc4c89dd720a24aa8bbdb8fda0b2e73 +Author: Transifex +Date: Sun Jan 29 00:21:10 2012 +0100 + + Update translators, week 04. + +commit 682a51dedf38602077923a27148e799ade9b924e +Author: Algimantas Margevičius +Date: Fri Jan 27 08:15:03 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d0598a6d698f98a4a11ee10689340efd5a3b54d3 +Author: Bauzhan Muftakhidinov +Date: Fri Jan 27 06:46:58 2012 +0100 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 68dcb870f549cfa25c7f433d7408d938c319ba16 +Author: Andres Sanchez +Date: Tue Jan 24 20:58:16 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 95% + + New status: 86 messages complete with 0 fuzzies and 4 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c8539242948771be062ff9c860cdb51e6ac95389 +Author: Andres Sanchez +Date: Tue Jan 24 20:50:58 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 88% + + New status: 80 messages complete with 1 fuzzy and 9 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3f0c134956a77357c868d806f0d224b20fd394bb +Author: Andres Sanchez +Date: Tue Jan 24 20:41:07 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 86% + + New status: 78 messages complete with 0 fuzzies and 12 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 17f1fdb98314b7aa30a2bf6df02a8d8d5a537c75 +Author: Transifex +Date: Sun Jan 22 00:21:14 2012 +0100 + + Update translators, week 03. + +commit 5706418729ca1a1554349a558b5eeda13850ddd3 +Author: Andres Sanchez +Date: Sat Jan 21 14:31:48 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 84% + + New status: 76 messages complete with 0 fuzzies and 14 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit aa8d38ba82c5427c50baad72338108f93675be83 +Author: Sergio Marques +Date: Wed Jan 18 15:29:15 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 37ee9ee3e66c9b92f3a18d3a414c710bb000d92e +Author: Piarres Beobide +Date: Mon Jan 16 11:09:50 2012 +0100 + + l10n: Updated Basque (eu) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 861216bf848afbeff080e03461b80e7f3332782b +Author: Gabor Kelemen +Date: Mon Jan 16 03:42:58 2012 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 87143524ab89b269f6f692e3dc075024890d2f40 +Author: Cheng-Chia Tseng +Date: Sun Jan 15 03:30:22 2012 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2e59522de923d58051f5de247baf53a977ce8073 +Author: Transifex +Date: Sun Jan 15 00:00:09 2012 +0100 + + Update translators, week 02. + +commit ba74f7e2d3038ce4f7bfc7729297ebc98d5d8620 +Author: Cristian Marchi +Date: Sat Jan 14 14:03:19 2012 +0100 + + l10n: Updated Italian (it) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1d3041abf9a2a5a8f1b6eb99d5235542007fd143 +Author: Per Kongstad +Date: Wed Jan 11 21:55:52 2012 +0100 + + l10n: Updated Danish (da) translation to 95% + + New status: 86 messages complete with 0 fuzzies and 4 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9f309b68cf68a83de33f007cbc432661eafa2fd2 +Author: Yarema aka Knedlyk +Date: Wed Jan 11 00:53:43 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 088eeeb4d3a7c0bf3536554487566ef7398e70ec +Author: Per Kongstad +Date: Tue Jan 10 22:36:17 2012 +0100 + + l10n: Updated Danish (da) translation to 93% + + New status: 84 messages complete with 0 fuzzies and 6 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 918308bf8d395be50df5fad74af64baf09e9f362 +Author: كريم أولاد الشلحة +Date: Mon Jan 9 21:38:11 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 956d3f0906a9ee309fe79206f3faa3acdc3b5d04 +Author: Algimantas Margevičius +Date: Mon Jan 9 13:57:05 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 341e3b71a507f1739fa0e6948e3c27dcbd16e074 +Author: Algimantas Margevičius +Date: Mon Jan 9 12:19:59 2012 +0100 + + l10n: Added Lithuanian language + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dc2e6ff3905acf5c9a1d0d72c592e4267b6c58fb +Author: Tomáš Vadina +Date: Mon Jan 9 11:09:15 2012 +0100 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 30884f2eb3c2649d8b540bca63d74a587fa2f213 +Author: Chipong Luo +Date: Mon Jan 9 04:23:31 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5ff00546f120adbc0105d533111f5f03a67dd0f1 +Author: Michal Várady +Date: Mon Jan 9 00:39:33 2012 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0686bbea1c26b5277c3a4f1ffb552574f489e168 +Author: كريم أولاد الشلحة +Date: Sun Jan 8 22:46:41 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b23f77081525f76c77ca4a71412aba15486d97d7 +Author: كريم أولاد الشلحة +Date: Sun Jan 8 22:08:55 2012 +0100 + + l10n: Updated Arabic (ar) translation to 83% + + New status: 75 messages complete with 0 fuzzies and 15 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit aa9aa45a9a6c87e7a2d9bd43917c88ecb69dee9b +Author: Per Kongstad +Date: Sun Jan 8 21:23:13 2012 +0100 + + l10n: Updated Danish (da) translation to 91% + + New status: 82 messages complete with 0 fuzzies and 8 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e8d3ffc89032862b7a13a6d13a0992dbaeb83f5c +Author: Henrique P. Machado +Date: Sun Jan 8 21:21:40 2012 +0100 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e3980cee15351b2074915d821fe695fb41b65e3e +Author: Per Kongstad +Date: Sun Jan 8 21:19:23 2012 +0100 + + l10n: Updated Danish (da) translation to 88% + + New status: 80 messages complete with 0 fuzzies and 10 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b6dad3422328a35aff269ade9cdf8383f7e2212a +Author: Sergio Marques +Date: Sun Jan 8 16:49:15 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a5de93842461e94e4988381965575ab57b864170 +Author: Fabian Nowak +Date: Sun Jan 8 00:22:52 2012 +0100 + + l10n: Updated German (de) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7940ba51de5e6cdeb7c16402c8b8eacc40bad205 +Author: Transifex +Date: Sun Jan 8 00:00:09 2012 +0100 + + Update translators, week 01. + +commit b47f44aa7b23694665f9f0f64a97d81f086fedc3 +Author: Nick Schermer +Date: Sat Jan 7 20:23:46 2012 +0100 + + Open docs wiki when Help is clicked. + +commit 9e702bfe34ac6b8f313f4e1c129502811b8ae9e6 +Author: Pjotr Anon +Date: Sat Jan 7 14:43:08 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit aa168cadce1ca43b53284c2dc038044e9973bcb3 +Author: Eivind Ødegård +Date: Sat Jan 7 00:40:15 2012 +0100 + + l10n: Added Norwegian nynorsk translation + + New status: 90 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit cf1e365b33685165c3a0ebb0269812d1aca21ec5 +Author: Nick Schermer +Date: Fri Jan 6 21:51:59 2012 +0100 + + Post release tag bump. + +commit 7e18c808aad2d1d983e1734dbff30ff1e94a5ad6 +Author: Nick Schermer +Date: Fri Jan 6 21:50:18 2012 +0100 + + Updates for release. + +commit 6b7590d9193f796cca1595fd7aa720350e09b208 +Author: Nick Schermer +Date: Sat Dec 31 14:34:34 2011 +0100 + + Add xfce_dialog_show_help function. + + Function that can be used to redirect to the docs.xfce.org + (or other location, see --with-manual-website). + +commit 95461c3698339dae469a060e0cfd91fd78db81da +Author: Andres Sanchez +Date: Tue Jan 3 14:43:27 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 87% + + New status: 73 messages complete with 0 fuzzies and 10 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 90fb36607379a62c14a875a06d76f932baa41ca0 +Author: Michal Várady +Date: Mon Jan 2 00:54:30 2012 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f189f905908590230107b71e6e4bc17108227c69 +Author: Transifex +Date: Sun Jan 1 00:00:08 2012 +0100 + + Update translators, week 00. + +commit 4a14ef81cdc6f3e45b63eb42ca41c6af50c9c0c4 +Author: Nick Schermer +Date: Sat Dec 31 14:24:59 2011 +0100 + + Restore vendor information handling. + + Restore the configure flags and simplify the vendor file + handing. The file is not name specific anymore, but just + stored in $prefix/share/xfce4/vendorinfo. + To hide the message the file is not found, packages + can 'touch' the file, so it has a zero length. + + Note that --with-vendor-info "Your Name" is also supported. + +commit 3e99b35fd140a1e915956c75cd221c981f197b58 +Author: Vinh Nguyen +Date: Sat Dec 31 14:01:28 2011 +0100 + + l10n: Updated Vietnamese (vi) translation to 67% + + New status: 56 messages complete with 0 fuzzies and 27 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b1a092ba1b7d12891650748381acd6bc539f631a +Author: Vinh Nguyen +Date: Sat Dec 31 14:00:18 2011 +0100 + + l10n: Updated Vietnamese (vi) translation to None% + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 311b87df5da82fde9c1a0dd363761f0d83435d4d +Author: Vinh Nguyen +Date: Sat Dec 31 13:54:46 2011 +0100 + + l10n: Updated Vietnamese (vi) translation to 49% + + New status: 41 messages complete with 0 fuzzies and 42 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c3c47bf16faa2618a57525090f00d07b6932a82c +Author: Nick Schermer +Date: Sat Dec 31 13:50:33 2011 +0100 + + Simplify the xfce_gdk_screen_get_active fucntion. + + The XQueryPointer also segfaults in some cases, so use + gdk for all of this. + +commit 04461012e8be40bb916d9cc2bfad6c6cf02c58ff +Author: Vinh Nguyen +Date: Sat Dec 31 13:49:16 2011 +0100 + + l10n: Init translation for libxfce4 ui + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 86722f86c4211cb9c4ad8679040c52f0e0e7d0e7 +Author: Alper Tekinalp +Date: Sat Dec 31 13:33:43 2011 +0100 + + l10n: Updated Turkish (tr) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3520f839f8586695e597e1ba3dcdd3fe941ddf91 +Author: Alper Tekinalp +Date: Sat Dec 31 13:24:49 2011 +0100 + + l10n: Updated Turkish (tr) translation to 63% + + New status: 53 messages complete with 1 fuzzy and 29 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7d6e4369460a5beec51bd63f5c56b39c6155e940 +Author: كريم أولاد الشلحة +Date: Sun Dec 25 21:45:09 2011 +0100 + + l10n: Updated Arabic (ar) translation to 73% + + New status: 61 messages complete with 1 fuzzy and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 29084a35f209d8eb864bb9514d4c6ed6ee01597b +Author: كريم أولاد الشلحة +Date: Sun Dec 25 21:45:07 2011 +0100 + + l10n: Updated Arabic (ar) translation to 72% + + New status: 60 messages complete with 2 fuzzies and 21 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f5c350ea8ac4a1ffadb57e6b5b5544c0a341c557 +Author: Transifex +Date: Sun Dec 25 00:00:10 2011 +0100 + + Update translators, week 51. + +commit 7bdbdb116b822aa69def8456a115b4d5e683eec6 +Author: Carles Muñoz Gorriz +Date: Sun Dec 18 15:21:33 2011 +0100 + + l10n: Updated Catalan (Valencian) (ca) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d08690f01fd932601829f444e801279ca0555203 +Author: Carles Muñoz Gorriz +Date: Sun Dec 18 15:17:09 2011 +0100 + + l10n: Updated Catalan (Valencian) (ca) translation to 100% + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7142b3e8b92ed0f3914d43ebd7a6d7b893ccf796 +Author: Transifex +Date: Sun Dec 18 00:00:12 2011 +0100 + + Update translators, week 50. + +commit c8f54f9d0552016427797ac3010bb48dbd913957 +Author: Bauzhan Muftakhidinov +Date: Sat Dec 17 17:48:25 2011 +0100 + + l10n: Updated Kazakh (kk) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b527c3789397ee41e64b3b687a4e7a9584628966 +Author: Charles Casuga +Date: Sat Dec 17 16:18:11 2011 +0100 + + l10n: Updates to Tagalog translation + + New status: 11 messages complete with 1 fuzzy and 71 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3130c3c5f96e3ddcff1a6e25598d0d2afe823090 +Author: Nick Schermer +Date: Mon Dec 12 20:52:10 2011 +0100 + + Add shortcuts for XF86WWW and XF86Mail. + +commit 24eed5f4b458b6fd16f8e176bf741f6e3f01de9b +Author: Transifex +Date: Sun Dec 11 00:00:09 2011 +0100 + + Update translators, week 49. + +commit deef5626a96c2411f901f5bf9e3e1fb0754794d8 +Author: Chipong Luo +Date: Fri Dec 9 15:14:17 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ae61a13b54c58ac51e5f4d3a1c7a51502b8af3e5 +Author: Sveinn í Felli +Date: Wed Dec 7 08:44:30 2011 +0100 + + l10n: Updated Icelandic (is) translation to 66% + + New status: 55 messages complete with 0 fuzzies and 28 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 05b67f57f2d82f2b0c95ecff91e8dac7b9c31613 +Author: Chipong Luo +Date: Sun Dec 4 16:16:05 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 26d514870875dafcaf8f8035705d7e2c0cf19343 +Author: Transifex +Date: Sun Dec 4 00:00:06 2011 +0100 + + Update translators, week 48. + +commit 153c7e0cd627d062a66841b6d57716001b1f13d1 +Author: Aleksandr Ponomarenko +Date: Sat Dec 3 12:41:21 2011 +0100 + + l10n: Updated Russian (ru) translation to 78% + + New status: 65 messages complete with 0 fuzzies and 18 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9b175b417ab07a41cd1a3404876e88b46ed33ec0 +Author: Chipong Luo +Date: Fri Dec 2 15:52:37 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 07588e25a55bfb60ff1e5bc3c41e8b2f73bf5ffd +Author: Chipong Luo +Date: Tue Nov 29 10:44:08 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0a76775b421b6d5525176a7558d88991f8c6fec5 +Author: Sveinn í Felli +Date: Tue Nov 29 09:27:45 2011 +0100 + + l10n: Updated Icelandic (is) translation to 25% + + New status: 21 messages complete with 0 fuzzies and 62 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8f7d50d809ec122a907c96f8639b756b332beb34 +Author: Transifex +Date: Mon Nov 28 17:24:50 2011 +0100 + + Update translators, week 48. + +commit 6dd38ffb227f1c066c948a122fdd41333126bdf3 +Author: Nick Schermer +Date: Fri Nov 25 18:45:48 2011 +0100 + + Drop module.xml + +commit 1e797e64682e1b3ded07a4b38daf089007b1f4e5 +Author: Piotr Sokół +Date: Tue Nov 22 18:31:41 2011 +0100 + + l10n: Updated Polish (pl) translation to 95% + + New status: 79 messages complete with 3 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c9d554b7c444623aa76d2173b2fb7a12598b1fe9 +Author: Kamil Polczak +Date: Mon Nov 21 16:04:32 2011 +0100 + + l10n: Updated Polish (pl) translation to None% + + New status: 0 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6b24f235ddef36144bfa0b2ee2dc668805b06d00 +Author: Transifex +Date: Sun Nov 20 00:00:14 2011 +0100 + + Update translators, week 46. + +commit 5bd98c42519d074b59f72fe47437ddeb3b1c5a4e +Author: Gabor Kelemen +Date: Fri Nov 18 15:08:07 2011 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3be3ddc0deffb1c4d90e096d5792f64c65bf31c3 +Author: Seong-ho Cho +Date: Tue Nov 15 12:15:02 2011 +0100 + + l10n: Updated Korean (ko) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3c7d0ffff548944773996d7d8dd8a27bd328ebc6 +Author: Nick Schermer +Date: Mon Nov 14 23:29:45 2011 +0100 + + Fix build against 3.9 Glade (bug #7334). + +commit 516e64d34d97f972b5f2961003e0e9b920cd8e55 +Author: Cheng-Chia Tseng +Date: Mon Nov 14 16:26:08 2011 +0100 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bcd3a0a0f134093bea0965deea2e017ccc6f445e +Author: Nick Schermer +Date: Sun Nov 13 18:44:30 2011 +0100 + + Remove spec file and rpm build. + +commit dd83dda06c2a2550608ddbab776d4d76b80c86b4 +Author: Transifex +Date: Sun Nov 13 00:00:10 2011 +0100 + + Update translators, week 45. + +commit a58e1a0b07e97ca9a1e013b4eb789fa2a2158e28 +Author: 玉堂 白鹤 +Date: Fri Nov 11 04:27:15 2011 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 91% + + New status: 76 messages complete with 0 fuzzies and 7 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8c414d5badfb168eeda92972d93d98b106cddd3b +Author: Nick Schermer +Date: Sun Nov 6 15:18:10 2011 +0100 + + Update to new xfce4-appfinder commands. + + Also add Alt+F3 to start in finder mode. + +commit 10c5ef6d9c1f4e291c4480186a71bf5d00838601 +Author: Transifex +Date: Sun Nov 6 00:00:09 2011 +0100 + + Update translators, week 44. + +commit c4517f2c02013d7f64e5a66c6b0f9b308ba6450a +Author: Aleksandr Ponomarenko +Date: Sat Nov 5 15:27:16 2011 +0100 + + l10n: Updated Russian (ru) translation to 65% + + New status: 54 messages complete with 0 fuzzies and 29 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ac6714cc9fb05861de5c2912fe002acf4ca6c889 +Author: Aleksandr Ponomarenko +Date: Sat Nov 5 15:22:57 2011 +0100 + + l10n: Updated Russian (ru) translation to 49% + + New status: 41 messages complete with 0 fuzzies and 42 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 221fd90092c91cd0f1dbed4a20ae3017a8074a04 +Author: Piarres Beobide +Date: Sat Nov 5 15:04:30 2011 +0100 + + l10n: Updated Basque (eu) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1d6309da7b4fd9de44903ac8fbdc8b26c9dded70 +Author: Piarres Beobide +Date: Sat Nov 5 01:21:57 2011 +0100 + + l10n: Updated Basque (eu) translation to 93% + + New status: 78 messages complete with 0 fuzzies and 5 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9146a02bd46957a2e298a0ad59069c3585bf3ed0 +Author: Piarres Beobide +Date: Sat Nov 5 01:19:51 2011 +0100 + + l10n: Updated Basque (eu) translation to 81% + + New status: 68 messages complete with 0 fuzzies and 15 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 94e4196acf32bd01c6f0c44013633b5ecfaabc83 +Author: Piarres Beobide +Date: Sat Nov 5 01:06:47 2011 +0100 + + l10n: Updated Basque (eu) translation to 57% + + New status: 48 messages complete with 0 fuzzies and 35 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5158a3e7f85bf7b10ac95bf0c9168ced54891201 +Author: Nick Schermer +Date: Thu Nov 3 19:43:25 2011 +0100 + + Use new libtool macros and versions (bug #6920). + +commit dbd2bee6494b60acc92c128bed9038ac23634b89 +Author: Olexandr +Date: Wed Nov 2 23:03:43 2011 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 83 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f0dd2943a262b16277a44a41b970835b21f3f69a +Author: Adolfo Jayme Barrientos +Date: Sun Oct 30 17:18:47 2011 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 83% + + New status: 69 messages complete with 0 fuzzies and 14 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9abe546580e1a66986a28f2ee2b07447f2ddd270 +Author: Ivica Kolić +Date: Sun Oct 30 03:25:45 2011 +0100 + + l10n: Updated Croatian (hr) translation to 79% + + New status: 66 messages complete with 0 fuzzies and 17 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8e05097a052ba809f7feb49842a124378f7385b4 +Author: Transifex +Date: Sun Oct 30 00:00:08 2011 +0200 + + Update translators, week 43. + +commit 024ee0d43090a9b0da910b5747f1227d9422b502 +Author: Olivier Fourdan +Date: Fri Oct 28 17:45:52 2011 +0200 + + Fix memory leak (bug #8079). + +commit dbc27591b50ad6208e0f4a5659ef84920cd46e9f +Author: 玉堂 白鹤 +Date: Fri Oct 28 05:44:21 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 91% + + New status: 76 messages complete with 0 fuzzies and 7 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 704e9cf0f3e579a38e3156ae6bf45b795a8189dd +Author: 玉堂 白鹤 +Date: Fri Oct 28 05:43:08 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 91% + + New status: 76 messages complete with 0 fuzzies and 7 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ecdf7aed7ffb199780a90bf4cde34a1f905dc7c2 +Author: 玉堂 白鹤 +Date: Fri Oct 28 05:15:40 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 80% + + New status: 67 messages complete with 2 fuzzies and 14 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9921cac4d5218a2a2a5af10f8273deb644475048 +Author: 玉堂 白鹤 +Date: Fri Oct 28 05:01:41 2011 +0200 + + l10n: Updated Chinese (China) (zh_CN) translation to 55% + + New status: 46 messages complete with 0 fuzzies and 37 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit bad3f535de0515863da1a44b20c3d213fe428e97 +Author: Nick Schermer +Date: Mon Oct 24 18:02:28 2011 +0200 + + Remove xfce-utils from about dialog. + +commit 751a87ee69b391088c34fd2b33d3144e811af9c8 +Author: Transifex +Date: Sun Oct 23 00:00:10 2011 +0200 + + Update translators, week 42. + +commit d2fc6d4904a3e6ab49463d3b07c43111a3a58ddd +Author: Johannes Lips +Date: Wed Oct 19 21:14:49 2011 +0200 + + l10n: Updated German (de) translation to 92% + + New status: 79 messages complete with 6 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 469c3b5adf18c8536100b23f2cdb9d149bf34415 +Author: Johannes Lips +Date: Wed Oct 19 21:11:35 2011 +0200 + + l10n: Updated German (de) translation to 82% + + New status: 70 messages complete with 7 fuzzies and 8 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4feca76025f53136e7c209a6d8f7cc6587a587e7 +Author: Johannes Lips +Date: Wed Oct 19 20:59:52 2011 +0200 + + l10n: Updated German (de) translation to 61% + + New status: 52 messages complete with 5 fuzzies and 28 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5680b420ecd4483549a7c76bf11287769fd6cf8a +Author: Transifex +Date: Sun Oct 16 00:00:11 2011 +0200 + + Update translators, week 41. + +commit e73915e9430e6c3d0316b11b17f1a398ff0eaf34 +Author: Seong-ho Cho +Date: Sat Oct 15 14:17:21 2011 +0200 + + l10n: Updated Korean (ko) translation to 92% + + New status: 79 messages complete with 0 fuzzies and 6 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5d8563209ecc2e53e4961e338fdbc12daf2b17b5 +Author: Seong-ho Cho +Date: Sat Oct 15 14:12:24 2011 +0200 + + l10n: Updated Korean (ko) translation to 85% + + New status: 73 messages complete with 0 fuzzies and 12 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 93361ccf76bdd82c08c0e82a7287498d976ad37f +Author: Seong-ho Cho +Date: Sat Oct 15 14:08:04 2011 +0200 + + l10n: Updated Korean (ko) translation to 70% + + New status: 60 messages complete with 1 fuzzy and 24 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9dd3d70124c94c1f196c0bf0dc68bc98da13b87b +Author: Seong-ho Cho +Date: Sat Oct 15 13:14:06 2011 +0200 + + l10n: Updated Korean (ko) translation to 43% + + New status: 37 messages complete with 1 fuzzy and 47 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1805afc2ca18fc0e26921c4acdc5db4921c9d86d +Author: Per Kongstad +Date: Fri Oct 14 20:33:06 2011 +0200 + + l10n: Updated Danish (da) translation to 90% + + New status: 77 messages complete with 0 fuzzies and 8 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e28f2051d6915fad0ba2eb8a338a9375136602ca +Author: Per Kongstad +Date: Fri Oct 14 20:30:46 2011 +0200 + + l10n: Updated Danish (da) translation to 89% + + New status: 76 messages complete with 0 fuzzies and 9 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 61cbe0d0df8fb02713d72da6787d27f6dd9ec0dc +Author: Yarema aka Knedlyk +Date: Fri Oct 14 19:33:13 2011 +0200 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1c47c37479d95f13a4be460a024f793cca283a68 Author: Nick Schermer -Date: Fri Dec 23 17:12:45 2011 +0100 +Date: Thu Oct 13 20:31:51 2011 +0200 - Updates for release. + Depend on xdt 4.9.0. -commit 8265b556931bdba835e1e141529b24392b99974c -Author: Olivier Fourdan -Date: Fri Oct 28 17:45:52 2011 +0200 +commit 9a028841c6c58e01daaf214c4dc202edfa511a71 +Author: Yarema aka Knedlyk +Date: Thu Oct 13 18:49:56 2011 +0200 - Fix memory leak (bug #8079). + l10n: Updated Ukrainian (uk) translation to 96% + + New status: 82 messages complete with 0 fuzzies and 3 untranslated. - (cherry picked from commit 024ee0d43090a9b0da910b5747f1227d9422b502) + Transmitted-via: Transifex (translations.xfce.org). -commit e8ec9b6ebc7707d831d49fb34c62ea3def66d258 -Author: Charles Casuga -Date: Sat Dec 17 16:20:58 2011 +0100 +commit 2a07fb9978fd23e9ff975c407d59f48af6ab2c64 +Author: Yarema aka Knedlyk +Date: Tue Oct 11 14:13:27 2011 +0200 - l10n: Updates to Tagalog Translation + l10n: Updated Ukrainian (uk) translation to 91% - New status: 11 messages complete with 1 fuzzy and 71 untranslated. + New status: 78 messages complete with 0 fuzzies and 7 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 58d42eebc742d98e0d6f2db78430064a4d5012aa -Author: Sveinn í Felli -Date: Wed Dec 7 23:01:22 2011 +0100 +commit 78b19ea15bbbbb8cd2fbcf7df8006ad34bb84464 +Author: Transifex +Date: Sun Oct 9 00:00:10 2011 +0200 - l10n: Updated Icelandic (is) translation to 100% + Update translators, week 40. + +commit 8350f371c1e7e897b7c17bbce3e0abd213f9094b +Author: Per Kongstad +Date: Sat Oct 8 15:36:16 2011 +0200 + + l10n: Updated Danish (da) translation to 83% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 71 messages complete with 0 fuzzies and 14 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit e725f1adebc1d6871ed633ed3269d813039d5376 -Author: Chipong Luo -Date: Fri Dec 2 16:17:25 2011 +0100 +commit 9fb9dbe83ba093d0b3300e9d9a9969fe2009be53 +Author: Bauzhan Muftakhidinov +Date: Thu Oct 6 11:54:49 2011 +0200 - l10n: Updated Chinese (China) (zh_CN) translation to 100% + l10n: Updated Kazakh (kk) translation to 42% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 36 messages complete with 2 fuzzies and 47 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 57d0e9778827f3f5ba178c44af566244bc41e365 -Author: Kristófer Arnþórsson -Date: Thu Dec 1 22:25:42 2011 +0100 +commit 1d3dc673afa2d1cf3d9244c331d928f49b1649ce +Author: Xavier Devlamynck +Date: Wed Oct 5 17:39:40 2011 +0200 - l10n: Updated Icelandic (is) translation to 70% + l10n: Updated French (fr) translation to 100% - New status: 22 messages complete with 0 fuzzies and 9 untranslated. + New status: 85 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 804cf3b3d6f66012b14c00c0cb832585920a5785 -Author: Kristófer Arnþórsson -Date: Thu Dec 1 11:53:22 2011 +0100 +commit acf01feb9cf6db227bdefd7b181948dac8d061cc +Author: Xavier Devlamynck +Date: Wed Oct 5 17:35:57 2011 +0200 - l10n: Updated Icelandic (is) translation to 67% + l10n: Updated French (fr) translation to 94% - New status: 21 messages complete with 1 fuzzy and 9 untranslated. + New status: 80 messages complete with 5 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 8d4c9db037e7f618627f654a50905c6dd244ef90 -Author: Kristófer Arnþórsson -Date: Thu Dec 1 10:42:40 2011 +0100 +commit 4f6dc0d1b4c83b1c1da220a004776722b4f826fa +Author: Xavier Devlamynck +Date: Wed Oct 5 17:27:27 2011 +0200 - l10n: Updated Icelandic (is) translation to 54% + l10n: Updated French (fr) translation to 70% - New status: 17 messages complete with 1 fuzzy and 13 untranslated. + New status: 60 messages complete with 3 fuzzies and 22 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 951d3efbbbe92dea60a7307ecd1c3af9e3fd19c4 -Author: Chipong Luo -Date: Tue Nov 29 11:01:00 2011 +0100 +commit 0780a424f80a8281453db90e22dc8cb5a957e901 +Author: Xavier Devlamynck +Date: Wed Oct 5 17:25:39 2011 +0200 - l10n: Updated Chinese (China) (zh_CN) translation to 100% + l10n: Updated French (fr) translation to 61% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 52 messages complete with 3 fuzzies and 30 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit e67c221c4843415db98f7ed308f9f4b54e9f70c0 -Author: Chipong Luo -Date: Mon Oct 17 16:34:52 2011 +0200 +commit 2f96d05ea4bcd9dd1aa5822b9f86dbebbaa5fc22 +Author: Tomáš Vadina +Date: Wed Oct 5 09:11:17 2011 +0200 - l10n: Updated Chinese (China) (zh_CN) translation to 100% + l10n: Updated Slovak (sk) translation to 100% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 85 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 346cbef6e0741e2adde102241a59c012616063e9 -Author: Chipong Luo -Date: Mon Oct 17 14:13:31 2011 +0200 +commit 9051b405fb8779062a7e967da83787db67c58cd6 +Author: Nick Schermer +Date: Mon Oct 3 22:40:52 2011 +0200 - l10n: Updated Chinese (China) (zh_CN) translation to 100% + Use xdt-csource instead of exo-csource. - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + This to avoid circular dependency. + +commit 278d5608bfd4eb4fbcc96f4e6b2ccf7fc1d546f2 +Author: Yarema aka Knedlyk +Date: Mon Oct 3 22:08:29 2011 +0200 + + l10n: Updated Ukrainian (uk) translation to 85% + + New status: 73 messages complete with 0 fuzzies and 12 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 08ebc37d9a8a8d48a3abd93de637e81dd7eeef8c -Author: Seong-ho Cho -Date: Mon Sep 12 21:56:27 2011 +0200 +commit c1f52438d093656ad5ae5da49f4e44c58984aef4 +Author: Transifex +Date: Sun Oct 2 00:00:09 2011 +0200 - l10n: Updated Korean (ko) translation to 100% + Update translators, week 39. + +commit f3d7ec9ea3226c6ddb9895a54244d3f2d6d6edbc +Author: Yarema aka Knedlyk +Date: Thu Sep 29 23:05:10 2011 +0200 + + l10n: Updated Ukrainian (uk) translation to 84% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 72 messages complete with 0 fuzzies and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 0bc1413f50b12d8ad62e0aaab388c066815685e4 -Author: Seong-ho Cho -Date: Mon Sep 12 21:52:11 2011 +0200 +commit 1bab51ba4f0c88fcd7b297484a8a90f195b28c8d +Author: Per Kongstad +Date: Thu Sep 29 20:36:16 2011 +0200 - l10n: Submission of Korean translation for libxfce4ui.xfce-4.8 + l10n: Updated Danish (da) translation to 81% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 69 messages complete with 1 fuzzy and 15 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 470c6d241f5c6ea70c812d2e5e017e2bea55b3a6 -Author: Mohd. Nadzrin Sapari -Date: Fri Aug 26 21:39:54 2011 +0200 +commit 83006e96f380f7fbf62c4113793f4825e9072005 +Author: Per Kongstad +Date: Thu Sep 29 20:32:03 2011 +0200 - l10n: Updated Malay (ms) translation to 100% + l10n: Updated Danish (da) translation to 61% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 52 messages complete with 1 fuzzy and 32 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 6fc015473fd605ce715a08cb1da9edae1a3ad14e -Author: Mohd. Nadzrin Sapari -Date: Fri Aug 26 21:37:15 2011 +0200 +commit 8a8c60eedad6a84b321fbff3de148bb5a6a500c4 +Author: Per Kongstad +Date: Thu Sep 29 20:25:34 2011 +0200 - l10n: New translation for Malay + l10n: Updated Danish (da) translation to 48% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 41 messages complete with 1 fuzzy and 43 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit b20a195308a8f3005bc5f29084868b0e71704232 -Author: Alexandr Boltris -Date: Fri Aug 26 17:14:34 2011 +0200 +commit ad985f8fd70dcfdbecf2ebb532da633b728909cb +Author: Yarema aka Knedlyk +Date: Wed Sep 28 13:39:44 2011 +0200 - l10n: Updated Russian (ru) translation to 100% + l10n: Updated Ukrainian (uk) translation to 74% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 63 messages complete with 0 fuzzies and 22 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 303634566d5f0abff1685aa6aa3bffc282c628a7 -Author: Artem Zolochevskiy -Date: Tue Aug 23 15:35:26 2011 +0200 +commit 78d173c9fea43cbf7200a0f0b78ae4c6cd81dded +Author: Yarema aka Knedlyk +Date: Tue Sep 27 23:31:51 2011 +0200 - l10n: Updated Russian (ru) translation to 100% + l10n: Updated Ukrainian (uk) translation to 64% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 55 messages complete with 0 fuzzies and 30 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 227cf404972c5714b3aa27148b84b18756dbc874 -Author: Artem Zolochevskiy -Date: Tue Aug 23 13:38:46 2011 +0200 +commit 8860872f9ec3be3bde3f7979799ae988013a1d56 +Author: Henrique P. Machado +Date: Tue Sep 27 20:05:54 2011 +0200 - l10n: Updated Russian (ru) translation to 100% + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 85 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit e86d39637397fbec1f59b0fdc05c0d82dd6a3526 -Author: Praveen Illa -Date: Mon Aug 22 22:08:49 2011 +0200 +commit c4094e7445a9ef7ae735bd891b880822f66db7ea +Author: Henrique P. Machado +Date: Tue Sep 27 20:02:29 2011 +0200 - l10n: Updates to Telugu translation + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 97% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 83 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit fa3ef5e103b67ee63a10ba606717c56b9013c9ab -Author: محمد الحرقان -Date: Mon Aug 8 05:13:34 2011 +0200 +commit 7e574ab349e0f33207fe1b9c1d901fc1f74a46c1 +Author: Henrique P. Machado +Date: Tue Sep 27 19:12:26 2011 +0200 - l10n: Updated Arabic (ar) translation to 100% + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 81% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 69 messages complete with 0 fuzzies and 16 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit f08c29adff22238db8393928f41bd7e43ecc4402 -Author: Chipong Luo -Date: Tue Jul 5 16:17:30 2011 +0200 +commit c17d3cb3c06b7545cbc95677c3714f8d2e33828d +Author: Henrique P. Machado +Date: Tue Sep 27 19:11:15 2011 +0200 - l10n: Updated Chinese (China) (zh_CN) translation to 100% + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 72% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 62 messages complete with 0 fuzzies and 23 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 504c8f9667d4fe68e2458fb7b51018b2b59e1fca +Author: Henrique P. Machado +Date: Tue Sep 27 19:10:30 2011 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 72% + + New status: 62 messages complete with 0 fuzzies and 23 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3475d3e1fbb7a912d0e22195648c7a1ad4139f0c +Author: Henrique P. Machado +Date: Tue Sep 27 19:08:16 2011 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 62% + + New status: 53 messages complete with 0 fuzzies and 32 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit dd6ba593f3a25371370c81a6f9ee12a8d46f5a14 +Author: Henrique P. Machado +Date: Tue Sep 27 19:05:40 2011 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 51% + + New status: 44 messages complete with 0 fuzzies and 41 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 254186c0d04bdbd3ee811a3f3af4ed9ee179c9e5 +Author: Henrique P. Machado +Date: Tue Sep 27 19:04:50 2011 +0200 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 51% + + New status: 44 messages complete with 0 fuzzies and 41 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7ab1d426383e79d9a83a3584643d389d94f07feb +Author: Transifex +Date: Sun Sep 25 00:00:16 2011 +0200 + + Update translators, week 38. + +commit 723ed9388e573c157024377308c68efcb005c859 +Author: Paul Seyfert +Date: Sat Sep 24 12:01:50 2011 +0200 + + l10n: Updated German (de) translation to 49% + + New status: 42 messages complete with 2 fuzzies and 41 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3110b0089224188aa9603210cf255dd90714543e +Author: Cheng-Chia Tseng +Date: Sat Sep 24 08:49:49 2011 +0200 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9dc98155bb4523f016547c694460e69bf8fc44fb +Author: Cheng-Chia Tseng +Date: Sat Sep 24 08:47:19 2011 +0200 + + l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5c81ad73456472e7ca852aa96be25589a49bd718 +Author: Ivica Kolić +Date: Sat Sep 24 04:30:03 2011 +0200 + + l10n: Updated Croatian (hr) translation to 69% + + New status: 59 messages complete with 0 fuzzies and 26 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9c2f428aea1533581a0b7b34d8f6aca36d3d7b89 +Author: Cristian Marchi +Date: Fri Sep 23 14:36:37 2011 +0200 + + l10n: Updated Italian (it) translation to 100% + + New status: 85 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit dbca82065ba07962295e7b176d6d579fffb6c2c6 +commit 65142297972057554af6068a2aac6a239b085b70 Author: Pjotr Anon -Date: Fri Jun 17 12:45:31 2011 +0200 +Date: Fri Sep 23 00:07:17 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 85 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 22221e0e97fafb0701aff89fc977da33249c3549 +commit bb529676f31b291e1a7ca9e74456c554b879c578 Author: Pjotr Anon -Date: Fri May 27 12:09:43 2011 +0200 +Date: Fri Sep 23 00:06:25 2011 +0200 - l10n: Updated Dutch (Flemish) (nl) translation to 100% + l10n: Updated Dutch (Flemish) (nl) translation to 95% - New status: 31 messages complete with 0 fuzzies and 0 untranslated. + New status: 81 messages complete with 0 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 8abaa912481c488a5b47fafca8c564b6fe133ec9 +commit d026b076beeb92f58cd6ed19888020521937ef6c Author: Pjotr Anon -Date: Fri May 27 00:16:01 2011 +0200 +Date: Thu Sep 22 23:56:25 2011 +0200 - l10n: Updated Dutch (Flemish) (nl) translation to 100% + l10n: Updated Dutch (Flemish) (nl) translation to 65% + + New status: 56 messages complete with 0 fuzzies and 29 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ac0e9bca5e18a089945286e27b0101cb63b59502 +Author: Ivica Kolić +Date: Thu Sep 22 22:35:01 2011 +0200 + + l10n: Updated Croatian (hr) translation to 40% + + New status: 34 messages complete with 0 fuzzies and 51 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a46d5c24da5971d2049b8386f599a0c6e126cf70 +Author: Nick Schermer +Date: Sat Jul 9 16:39:07 2011 +0200 + + Add new files to POTFILES.in. + +commit 28868acca8df5765b031c701de123640a6d9290f +Author: Nick Schermer +Date: Sat Jul 9 16:32:29 2011 +0200 + + Add xfce4-about from xfce-utils package. + +commit 9919c91f18356ed0e5f6bd3141dd1f191d374f2d +Author: Seong-ho Cho +Date: Mon Sep 12 23:52:44 2011 +0200 + + l10n: Submission of Korean translation for libxfce4ui.master New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit c370f9b40bf9fe8c88319af8e7923ebae32ff3df -Author: Pjotr Anon -Date: Fri May 13 15:06:22 2011 +0200 +commit 064c60ab54107eb95b7b6720af056599bf4e3d8a +Author: Alexandr Boltris +Date: Fri Aug 26 17:14:13 2011 +0200 - l10n: Updated Dutch (Flemish) (nl) translation to 100% + l10n: Updated Russian (ru) translation to 100% + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 9d19961db3350c62b023d90dff4f00bebbaccc67 +Author: كريم أولاد الشلحة +Date: Wed Aug 24 04:20:57 2011 +0200 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8d64ffca959b80dee19e06079ec8d895a7fb8335 +Author: Artem Zolochevskiy +Date: Tue Aug 23 13:33:22 2011 +0200 + + l10n: Updated Russian (ru) translation to 100% + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b0bb9f8fbda1a2e40a302209242f32c3eb9445d1 +Author: Praveen Illa +Date: Mon Aug 22 21:54:10 2011 +0200 + + l10n: Updates to Telugu translation + + New status: 31 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c7718216af735f92097723071ca79b56818b437f +Author: Tomáš Vadina +Date: Fri Jul 15 09:31:13 2011 +0200 + + l10n: Updated Slovak (sk) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). -commit 402ac55c714d595dd56fbb6ef17de9a8b91fe4fd +commit a13b80648aa3f5a36ca7f86c6066caf2d34276fe Author: Pjotr Anon -Date: Mon May 9 18:10:09 2011 +0200 +Date: Fri Jun 17 12:13:19 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% @@ -252,9 +5921,90 @@ Transmitted-via: Transifex (translations.xfce.org). -commit 225b9b5a6524d3882331fc0319aafa21e1eb75a9 +commit 71d7195ab203b3efbb9fae127ce15e41ea6c9c65 +Author: Nick Schermer +Date: Mon Jun 13 20:41:43 2011 +0200 + + Drop G_CONST_RETURN macro. + +commit 1b78f177b7b604b8fb846fab600bff712d7f5578 +Merge: f04158b 6bd3a41 +Author: Jérôme Guelfucci +Date: Thu Jun 2 23:44:01 2011 +0200 + + Merge branch 'jeromeg/keyboard-shortcuts-rework' + +commit 6bd3a4156da0f4a334a3887451f984ff507e78bf +Author: Jérôme Guelfucci +Date: Thu Jun 2 15:00:04 2011 +0200 + + Improve indentation. + +commit a3d141ec2665de548da5073366fcbc873468d0f1 +Author: Jérôme Guelfucci +Date: Thu Jun 2 14:56:34 2011 +0200 + + Also grab with MOD5 modifier. + +commit 56f8e3858e6d84850f51c1772f8f4617bae4dd9b +Author: Jérôme Guelfucci +Date: Thu Jun 2 14:54:07 2011 +0200 + + Add more debbuging information. + +commit 5e50a7d5f6f868c12b1d439ff54600b984b2d5bd +Author: Jérôme Guelfucci +Date: Sun May 29 18:09:45 2011 +0200 + + Use the current group when translating the keyboard state + +commit 83770eec38278dd1e05577b48908d4b0b0d68dfc +Author: Jérôme Guelfucci +Date: Sun May 29 18:09:19 2011 +0200 + + Improve code comments and error handling. + +commit f04158b0edbaece61b0397ebfa7b28db85377600 +Author: Nick Schermer +Date: Sun May 29 18:02:55 2011 +0200 + + Fix mistake in previous commit. + + Connect in realize is not a good idea, however the inital + update can be avoided in init. + +commit 6e48a2717dea7dacedd3ce13185ebef22a95714b +Author: Nick Schermer +Date: Sun May 29 17:44:11 2011 +0200 + + Cleanup the heading code. + + With the assumption this widget will not be made public + anymore, we can strip a bunch of code. Also attach + the window signals later in the titled-dialog so they are + not triggered before we're actually going to show the window. + +commit 13251f7a7ab201dd20186d81ca11e21922d35628 +Author: Jérôme Guelfucci +Date: Sun May 29 17:41:53 2011 +0200 + + Rework grabbing/ungrabbing code. + + The code has been reworked to grab all keycodes generating the keyval + needed for the shortcut which should fix a number of issues where the + shortcut was not grabbed. + + Error handling needs to be improved. + +commit 310a4d7d9d3834e7ee074359973f52cc1e186502 +Author: Jérôme Guelfucci +Date: Sun May 29 16:40:39 2011 +0200 + + Remove gobject boilerplate. + +commit 70a055c7f942f50d35b2c8652944cb33c46683ad Author: Pjotr Anon -Date: Mon May 9 12:00:28 2011 +0200 +Date: Fri May 27 14:57:42 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% @@ -262,16 +6012,76 @@ Transmitted-via: Transifex (translations.xfce.org). -commit 5b98ebc9bf9f684e2e29b91a84192fa65adfde4a -Author: Robert Hartl -Date: Mon Jan 31 14:51:19 2011 +0100 +commit a0fb8ffefa37d61e7f4724b5b422276902f4445b +Author: Jérôme Guelfucci +Date: Sun May 22 16:18:32 2011 +0200 - l10n: Updated Slovak (sk) translation to 100% + Fix shortcut comparing. + + Because GDK functions do very useful stuff like echoing + when Windows key is pressed or is pressed we need to ignore + some modifiers in those cases... + + This needs testing to ensure that it works in all cases. + +commit 4868a7bac5234af48748bce09e2a848dfb37a628 +Author: Jérôme Guelfucci +Date: Sun May 22 16:17:53 2011 +0200 + + Rework shortcut parsing using gdk functions. + +commit 5a4cbdd01c7712934c26a068af8b027b7ac3e1cc +Author: Jérôme Guelfucci +Date: Fri Apr 22 17:09:46 2011 +0200 + + Simplify code monitoring key press events. + +commit 899aaa97827f263c877faab3f8d0686fd9784b66 +Author: Jérôme Guelfucci +Date: Fri Apr 22 09:16:51 2011 +0200 + + Simplify computing of shortcut name in the dialog. + + Instead of handling the key-pressed event with XKB code, we now use + gdk/gtk functions directly which simplifies things a lot. + + This needs testing to ensure that there is no regression and that + shortcuts with Numlock work. + +commit 50d432cc506c231f033e2e466403e0f57695219e +Author: Pjotr Anon +Date: Wed May 11 17:20:43 2011 +0200 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). +commit f9cd2ddf53b9eedb64865466d08fb98680dc9162 +Author: Nick Schermer +Date: Sun Mar 27 14:20:22 2011 +0200 + + Fix licenses. + +commit b232a4043b42926e27eb13833e858dfed2bbebe7 +Author: Nick Schermer +Date: Sun Mar 27 14:00:51 2011 +0200 + + Use new portable abicheck.sh from xfconf. + +commit 27cb62f2c22a44a9ff96e63518a5e754a58f9037 +Author: Jérôme Guelfucci +Date: Thu Feb 17 00:13:22 2011 +0100 + + Add Alt + F1 as a shortcut for applications menu. + +commit df3d6cf9b3524ccb90d26bc96afd467dcb00de43 +Author: Jannis Pohlmann +Date: Sun Jan 16 16:09:26 2011 +0100 + + Post-release version bump. + commit 9a99a6a01ea29c5f2d6f0bef70054d0b78c14abc Author: Jannis Pohlmann Date: Sun Jan 16 16:05:58 2011 +0100 diff -Nru libxfce4ui-4.8.1/compile libxfce4ui-4.12.1/compile --- libxfce4ui-4.8.1/compile 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/compile 2015-03-15 18:14:47.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru libxfce4ui-4.8.1/config.guess libxfce4ui-4.12.1/config.guess --- libxfce4ui-4.8.1/config.guess 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/config.guess 2015-03-15 18:14:47.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2015-03-04' # This file 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 +# 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 @@ -17,26 +15,22 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -139,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -154,20 +168,27 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -180,7 +201,14 @@ fi ;; *) - os=netbsd + os=netbsd + ;; + esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` ;; esac # The OS release @@ -199,7 +227,11 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` @@ -223,7 +255,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +301,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +330,12 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +429,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +515,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +529,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,15 +586,16 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -594,52 +630,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +766,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +805,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +824,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +889,22 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +914,59 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +985,74 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + eval $set_cc_for_build + X86_64_ABI= + # If there is a compiler, see if it is configured for 32-bit objects. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + X86_64_ABI=x32 + fi + fi + echo x86_64-unknown-linux-gnu${X86_64_ABI} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1061,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1097,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1125,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1166,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1210,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1239,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1256,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1285,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1323,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1371,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,158 +1395,10 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi +esac cat >&2 <= 3.5.0 present */ #undef HAVE_GLADEUI +/* Define if gtk+-3.0 >= 3.2.0 present */ +#undef HAVE_GTK3 + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -97,12 +100,11 @@ /* Define to 1 if you have the `_NSGetEnviron' function. */ #undef HAVE__NSGETENVIRON -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O +/* Documentation website */ +#undef MANUAL_WEBSITE /* Name of package */ #undef PACKAGE @@ -150,6 +152,9 @@ #endif +/* Additional vendor name and/or info */ +#undef VENDOR_INFO + /* Version number of package */ #undef VERSION diff -Nru libxfce4ui-4.8.1/config.sub libxfce4ui-4.12.1/config.sub --- libxfce4ui-4.8.1/config.sub 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/config.sub 2015-03-15 18:14:47.000000000 +0000 @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file 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 +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-03-04' + +# This file 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. +# 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -123,13 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,28 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx | dvp \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -272,38 +283,55 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | riscv32 | riscv64 \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +341,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +370,31 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -359,33 +408,42 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +468,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +538,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +583,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +741,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -713,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -732,11 +801,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -750,6 +823,24 @@ basic_machine=m68k-atari os=-mint ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -764,6 +855,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -771,10 +866,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +942,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +1030,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -948,7 +1058,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1131,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1190,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1261,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1361,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,28 +1389,29 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1341,7 +1450,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1499,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1535,14 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1565,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1580,23 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1616,11 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1527,7 +1647,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru libxfce4ui-4.8.1/configure libxfce4ui-4.12.1/configure --- libxfce4ui-4.8.1/configure 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/configure 2015-03-15 18:14:47.000000000 +0000 @@ -1,16 +1,14 @@ #! /bin/sh -# From configure.ac 93732d0. +# From configure.ac 1964cb1. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libxfce4ui 4.8.1. +# Generated by GNU Autoconf 2.69 for libxfce4ui 4.12.1. # # Report bugs to . # -# Copyright (c) 2007-2011 The Xfce development team +# Copyright (c) 2007-2015 The Xfce development team # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -139,6 +137,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # 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 +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+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -172,7 +195,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -225,21 +249,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # 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 - 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+"$@"} + export CONFIG_SHELL + # 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 +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+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -342,6 +370,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -463,6 +499,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -497,16 +537,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -518,28 +558,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -573,8 +593,8 @@ # Identity of this package. PACKAGE_NAME='libxfce4ui' PACKAGE_TARNAME='libxfce4ui' -PACKAGE_VERSION='4.8.1' -PACKAGE_STRING='libxfce4ui 4.8.1' +PACKAGE_VERSION='4.12.1' +PACKAGE_STRING='libxfce4ui 4.12.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -634,11 +654,14 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK GLADEUI_PIXMAPDIR GLADEUI_MODULEDIR @@ -661,14 +684,22 @@ LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_VERSION +ENABLE_GTK3_LIBRARY_FALSE +ENABLE_GTK3_LIBRARY_TRUE +HAVE_GTK3_FALSE +HAVE_GTK3_TRUE +GTK3_REQUIRED_VERSION +GTK3_LIBS +GTK3_CFLAGS +GTK3_VERSION LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_VERSION -GTK_REQUIRED_VERSION -GTK_LIBS -GTK_CFLAGS -GTK_VERSION +GTK2_REQUIRED_VERSION +GTK2_LIBS +GTK2_CFLAGS +GTK2_VERSION GOBJECT_REQUIRED_VERSION GOBJECT_LIBS GOBJECT_CFLAGS @@ -696,6 +727,7 @@ INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS @@ -707,6 +739,7 @@ LIBXFCE4UI_VERSION_MAJOR LIBXFCE4UI_VERSION_API LIBXFCE4UI_VERINFO +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -724,7 +757,6 @@ DUMPBIN LIBTOOL PERL -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -750,6 +782,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -768,6 +806,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -781,11 +820,13 @@ LDFLAGS CFLAGS CC -AM_BACKSLASH -AM_DEFAULT_VERBOSITY MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -862,8 +903,8 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_dependency_tracking with_gnu_ld enable_nls @@ -871,12 +912,16 @@ enable_shared with_pic enable_fast_install +with_aix_soname with_sysroot enable_libtool_lock with_locales_dir with_x +enable_gtk3 enable_startup_notification enable_keyboard_library +with_vendor_info +with_manual_website enable_gladeui with_gladeui_catalogdir with_gladeui_moduledir @@ -898,6 +943,7 @@ LIBS CPPFLAGS CPP +LT_SYS_LIBRARY_PATH XMKMF PKG_CONFIG PKG_CONFIG_PATH @@ -1359,8 +1405,6 @@ 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 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1446,7 +1490,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libxfce4ui 4.8.1 to adapt to many kinds of systems. +\`configure' configures libxfce4ui 4.12.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1521,7 +1565,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libxfce4ui 4.8.1:";; + short | recursive ) echo "Configuration of libxfce4ui 4.12.1:";; esac cat <<\_ACEOF @@ -1529,18 +1573,24 @@ --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-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --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 + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-gtk3 Enable checking for GTK+ 3 support + (default=[]) + --disable-gtk3 Disable checking for GTK+ 3 support --enable-startup-notification Enable checking for startup notification library (default=[]) @@ -1568,12 +1618,20 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-locales-dir=DIR Install locales into DIR --with-x use the X Window System + --with-vendor-info=NAME Specify an additional vendor name, optionally with a + file in $prefix/share/xfce4/venderinfo + --with-manual-website=URI + Specify an optional manual website, defaults to + http://docs.xfce.org. --with-gladeui-catalogdir=PATH Specify where to install glade designer catalog files (default=autodetect) @@ -1594,6 +1652,8 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. XMKMF Path to xmkmf, Makefile generator for X Window System PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1671,14 +1731,14 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libxfce4ui configure 4.8.1 -generated by GNU Autoconf 2.68 +libxfce4ui configure 4.12.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 2007-2011 The Xfce development team +Copyright (c) 2007-2015 The Xfce development team _ACEOF exit fi @@ -1953,7 +2013,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2088,8 +2148,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libxfce4ui $as_me 4.8.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by libxfce4ui $as_me 4.12.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2438,6 +2498,7 @@ + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2578,7 +2639,7 @@ NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2617,7 +2678,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2675,9 +2736,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2688,32 +2746,40 @@ 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 +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # 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 -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # 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 + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2725,6 +2791,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2747,12 +2823,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2764,10 +2840,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2786,7 +2862,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2826,7 +2902,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2877,7 +2953,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2906,12 +2982,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2930,7 +3000,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2994,6 +3064,45 @@ fi rmdir .tst 2>/dev/null +# 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=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3016,7 +3125,7 @@ # Define the identity of the package. PACKAGE='libxfce4ui' - VERSION='4.8.1' + VERSION='4.12.1' cat >>confdefs.h <<_ACEOF @@ -3044,99 +3153,186 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + -AMTAR=${AMTAR-"${am_missing_run}tar"} +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 $as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_config_headers="$ac_config_headers config.h" @@ -3167,11 +3363,38 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' @@ -3194,7 +3417,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3227,6 +3450,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3259,7 +3483,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3299,7 +3523,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3352,7 +3576,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3393,7 +3617,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3451,7 +3675,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3495,7 +3719,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3941,8 +4165,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4027,6 +4250,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4038,8 +4320,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4073,16 +4356,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4091,16 +4374,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4309,7 +4592,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4375,7 +4658,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4582,8 +4865,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -4725,7 +5008,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4765,7 +5048,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4818,7 +5101,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4859,7 +5142,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4917,7 +5200,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4961,7 +5244,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5157,8 +5440,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5243,6 +5525,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5254,8 +5595,9 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5289,16 +5631,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5307,16 +5649,16 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5392,7 +5734,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5471,7 +5813,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5567,7 +5909,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -5593,19 +5935,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -5619,7 +5961,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -5630,7 +5972,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -5641,32 +5983,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -5702,145 +6044,20 @@ -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval else - eval ac_cv_prog_cc_${ac_cc}_c_o=no + USE_NLS=yes fi -rm -f core conftest* -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } - # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : - enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } @@ -5853,18 +6070,16 @@ ;; esac -if test -n ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 -$as_echo_n "checking for intltool >= ... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "0.35.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $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 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -5885,7 +6100,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5925,7 +6140,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5965,7 +6180,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5991,25 +6206,48 @@ 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 $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.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 $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.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 $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.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 $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.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 $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -6126,7 +6364,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6166,7 +6404,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6206,7 +6444,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6246,7 +6484,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6297,7 +6535,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6328,7 +6566,7 @@ if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi @@ -6346,44 +6584,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - 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" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -6405,7 +6605,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PERL="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6430,36 +6630,6 @@ done -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no -fi - - - - - - - - case `pwd` in *\ * | *\ *) @@ -6469,8 +6639,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -6484,7 +6654,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Backslashify metacharacters that are still active within # double-quoted strings. @@ -6510,33 +6680,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -6547,15 +6722,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -6580,7 +6755,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6624,7 +6799,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6661,9 +6836,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -6671,8 +6846,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -6723,7 +6898,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -6763,7 +6938,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -6813,22 +6988,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -6846,7 +7022,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -6864,30 +7040,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -7010,13 +7162,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -7048,7 +7200,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7088,7 +7240,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7144,13 +7296,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -7177,8 +7329,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -7214,10 +7365,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -7256,7 +7403,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -7278,8 +7425,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -7332,6 +7479,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -7394,7 +7544,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7434,7 +7584,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7489,8 +7639,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -7502,7 +7652,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -7537,7 +7687,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7581,7 +7731,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7656,7 +7806,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -7664,7 +7814,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -7677,7 +7827,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -7706,7 +7856,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7746,7 +7896,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7805,7 +7955,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7845,7 +7995,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7894,7 +8044,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -7984,7 +8134,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -8017,14 +8167,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -8042,21 +8222,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -8104,11 +8287,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* 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 +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -8134,7 +8317,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -8154,13 +8337,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -8181,7 +8364,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -8234,6 +8417,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -8246,9 +8439,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -8258,8 +8451,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -8271,18 +8464,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8291,24 +8565,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -8337,9 +8612,50 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8353,9 +8669,19 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8374,7 +8700,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8392,7 +8721,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -8432,13 +8761,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -8450,7 +8780,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -8459,7 +8789,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -8475,7 +8805,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -8494,7 +8824,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8534,7 +8864,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8586,7 +8916,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -8614,7 +8944,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8654,7 +8984,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8706,7 +9036,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8746,7 +9076,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8798,7 +9128,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8838,7 +9168,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8890,7 +9220,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8930,7 +9260,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8982,7 +9312,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9022,7 +9352,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9089,7 +9419,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -9107,7 +9437,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9146,7 +9476,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -9175,7 +9505,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9188,32 +9518,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -9221,6 +9551,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + for ac_header in dlfcn.h do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default @@ -9239,6 +9604,35 @@ # Set options +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_static=no +fi + + + + + + + @@ -9257,14 +9651,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9289,14 +9683,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9304,8 +9698,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -9321,14 +9713,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -9342,11 +9734,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -9395,7 +9839,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -9434,7 +9878,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -9445,14 +9889,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -9461,15 +9905,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -9484,22 +9921,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9522,13 +9959,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9550,22 +9987,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -9588,13 +10025,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -9615,7 +10052,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9673,7 +10110,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -9689,7 +10126,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -9719,7 +10156,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -9737,17 +10174,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -9758,8 +10196,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -9775,6 +10213,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -9845,7 +10288,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -9853,10 +10296,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -9872,7 +10334,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -9881,9 +10343,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -9908,6 +10370,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -10005,7 +10473,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -10034,7 +10502,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -10066,7 +10534,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -10096,7 +10564,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -10128,7 +10596,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -10147,13 +10615,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -10273,8 +10741,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -10286,9 +10754,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -10331,9 +10799,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -10348,7 +10816,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -10356,7 +10824,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -10366,7 +10834,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -10388,24 +10856,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -10418,7 +10886,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -10437,7 +10905,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10453,7 +10921,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -10463,7 +10931,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -10471,61 +10939,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -10536,42 +11032,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -10585,8 +11086,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -10604,8 +11105,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10617,7 +11118,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -10632,9 +11133,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -10651,15 +11152,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -10675,7 +11176,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -10683,34 +11184,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -10729,13 +11253,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -10754,35 +11286,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10817,7 +11356,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10825,17 +11364,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -10870,7 +11409,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -10878,21 +11417,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -10901,7 +11452,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -10931,16 +11482,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -10949,18 +11501,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -10969,7 +11521,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -10988,24 +11540,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -11047,33 +11599,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -11081,25 +11633,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -11111,7 +11663,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -11130,14 +11682,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -11145,8 +11697,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -11157,7 +11709,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -11168,8 +11720,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -11179,8 +11731,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -11192,24 +11744,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -11224,7 +11786,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -11232,27 +11794,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -11263,33 +11817,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -11300,24 +11874,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -11327,11 +11901,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -11341,10 +11915,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -11393,43 +11967,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -11444,10 +12018,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -11455,7 +12029,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -11481,7 +12055,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -11696,14 +12270,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -11719,28 +12293,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -11754,7 +12335,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -11763,7 +12344,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -11780,14 +12361,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -11795,41 +12378,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -11839,18 +12472,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -11858,8 +12491,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -11871,7 +12504,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -11880,8 +12513,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -11897,17 +12530,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -11916,8 +12549,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -11944,7 +12577,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -11957,8 +12590,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -11971,7 +12604,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -11984,8 +12617,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -11998,8 +12631,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -12014,17 +12647,31 @@ *) objformat=elf ;; esac fi - version_type=freebsd-$objformat + # Handle Gentoo/FreeBSD as it was Linux + case $host_vendor in + gentoo) + version_type=linux ;; + *) + version_type=freebsd-$objformat ;; + esac + case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; + linux) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_lib_prefix=no + need_version=no + ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -12047,26 +12694,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -12084,14 +12720,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -12099,8 +12736,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -12109,8 +12746,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -12123,8 +12760,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12135,7 +12772,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -12143,8 +12780,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -12163,8 +12800,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -12173,13 +12810,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -12223,7 +12880,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -12243,12 +12905,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -12258,7 +12920,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -12267,58 +12929,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -12329,8 +13001,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -12340,11 +13012,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -12352,8 +13024,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -12374,24 +13046,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -12409,7 +13081,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -12417,8 +13089,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -12428,20 +13100,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -12538,15 +13225,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -12561,12 +13248,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -12576,7 +13263,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -12586,23 +13273,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -12640,10 +13327,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -12651,10 +13338,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -12693,11 +13388,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -12736,7 +13431,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -12775,7 +13470,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -12814,7 +13509,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -12835,21 +13530,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -12857,7 +13552,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -12904,9 +13599,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -12936,7 +13631,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12956,14 +13651,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -13010,9 +13705,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -13042,7 +13737,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -13063,9 +13758,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -13109,7 +13804,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -13137,7 +13832,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -13145,13 +13840,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -13159,8 +13854,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -13170,7 +13869,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -13184,7 +13883,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -13212,7 +13911,7 @@ LIBXFCE4UI_VERINFO=0:0:0 LIBXFCE4UI_VERSION_API=1 LIBXFCE4UI_VERSION_MAJOR=4 -LIBXFCE4UI_VERSION_MINOR=8 +LIBXFCE4UI_VERSION_MINOR=12 LIBXFCE4UI_VERSION_MICRO=1 LIBXFCE4KBD_PRIVATE_VERINFO=0:0:0 LIBXFCE4KBD_PRIVATE_VERSION_API=2 @@ -13382,7 +14081,7 @@ - ALL_LINGUAS="ar ast bn ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko ku lv ms nb nl pa pl pt_BR pt ro ru si sk sv te tl_PH tl tr ug uk ur_PK ur zh_CN zh_TW " + ALL_LINGUAS="am ar ast bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW " for ac_header in locale.h do : @@ -13881,7 +14580,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14979,7 +15678,202 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=$xdt_cv_PKG_CONFIG_MIN_VERSION + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test x"$PKG_CONFIG" = x""; then + echo + echo "*** Your version of pkg-config is too old. You need atleast" + echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config" + echo "*** from the freedesktop.org software repository at" + echo "***" + echo "*** http://www.freedesktop.org/software/pkgconfig" + echo "***" + exit 1; + fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0 >= 2.30.0" >&5 +$as_echo_n "checking for gobject-2.0 >= 2.30.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.30.0" "gobject-2.0" >/dev/null 2>&1; then + GOBJECT_VERSION=`$PKG_CONFIG --modversion "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_VERSION" >&5 +$as_echo "$GOBJECT_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5 +$as_echo_n "checking GOBJECT_CFLAGS... " >&6; } + GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5 +$as_echo "$GOBJECT_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5 +$as_echo_n "checking GOBJECT_LIBS... " >&6; } + GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5 +$as_echo "$GOBJECT_LIBS" >&6; } + + GOBJECT_REQUIRED_VERSION=2.30.0 + + + + + + + + elif $PKG_CONFIG --exists "gobject-2.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "gobject-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 +$as_echo "found, but $xdt_cv_version" >&6; } + + + echo "*** The required package gobject-2.0 was found on your system," + echo "*** but the installed version ($xdt_cv_version) is too old." + echo "*** Please upgrade gobject-2.0 to atleast version 2.30.0, or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you installed" + echo "*** the new version of the package in a nonstandard prefix so" + echo "*** pkg-config is able to find it." + exit 1 + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + + + echo "*** The required package gobject-2.0 was not found on your system." + echo "*** Please install gobject-2.0 (atleast version 2.30.0) or adjust" + echo "*** the PKG_CONFIG_PATH environment variable if you" + echo "*** installed the package in a nonstandard prefix so that" + echo "*** pkg-config is able to find it." + exit 1 + + fi + + + + # minimum supported version of pkg-config + xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15022,7 +15916,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15086,26 +15980,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0 >= 2.16.0" >&5 -$as_echo_n "checking for gobject-2.0 >= 2.16.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.16.0" "gobject-2.0" >/dev/null 2>&1; then - GOBJECT_VERSION=`$PKG_CONFIG --modversion "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_VERSION" >&5 -$as_echo "$GOBJECT_VERSION" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5 -$as_echo_n "checking GOBJECT_CFLAGS... " >&6; } - GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5 -$as_echo "$GOBJECT_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5 -$as_echo_n "checking GOBJECT_LIBS... " >&6; } - GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5 -$as_echo "$GOBJECT_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24.0" >&5 +$as_echo_n "checking for gtk+-2.0 >= 2.24.0... " >&6; } + if $PKG_CONFIG "--atleast-version=2.24.0" "gtk+-2.0" >/dev/null 2>&1; then + GTK2_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK2_VERSION" >&5 +$as_echo "$GTK2_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK2_CFLAGS" >&5 +$as_echo_n "checking GTK2_CFLAGS... " >&6; } + GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK2_CFLAGS" >&5 +$as_echo "$GTK2_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK2_LIBS" >&5 +$as_echo_n "checking GTK2_LIBS... " >&6; } + GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK2_LIBS" >&5 +$as_echo "$GTK2_LIBS" >&6; } - GOBJECT_REQUIRED_VERSION=2.16.0 + GTK2_REQUIRED_VERSION=2.24.0 @@ -15113,15 +16007,15 @@ - elif $PKG_CONFIG --exists "gobject-2.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "gobject-2.0"` + elif $PKG_CONFIG --exists "gtk+-2.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-2.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package gobject-2.0 was found on your system," + echo "*** The required package gtk+-2.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gobject-2.0 to atleast version 2.16.0, or adjust" + echo "*** Please upgrade gtk+-2.0 to atleast version 2.24.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15132,8 +16026,8 @@ $as_echo "not found" >&6; } - echo "*** The required package gobject-2.0 was not found on your system." - echo "*** Please install gobject-2.0 (atleast version 2.16.0) or adjust" + echo "*** The required package gtk+-2.0 was not found on your system." + echo "*** Please install gtk+-2.0 (atleast version 2.24.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15174,7 +16068,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15217,7 +16111,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15281,26 +16175,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.14.0" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.14.0... " >&6; } - if $PKG_CONFIG "--atleast-version=2.14.0" "gtk+-2.0" >/dev/null 2>&1; then - GTK_VERSION=`$PKG_CONFIG --modversion "gtk+-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_VERSION" >&5 -$as_echo "$GTK_VERSION" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 -$as_echo_n "checking GTK_CFLAGS... " >&6; } - GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 -$as_echo "$GTK_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 -$as_echo_n "checking GTK_LIBS... " >&6; } - GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 -$as_echo "$GTK_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.12.0" >&5 +$as_echo_n "checking for libxfce4util-1.0 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfce4util-1.0" >/dev/null 2>&1; then + LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 +$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 +$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } + LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 +$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 +$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } + LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 +$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } - GTK_REQUIRED_VERSION=2.14.0 + LIBXFCE4UTIL_REQUIRED_VERSION=4.12.0 @@ -15308,15 +16202,15 @@ - elif $PKG_CONFIG --exists "gtk+-2.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-2.0"` + elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package gtk+-2.0 was found on your system," + echo "*** The required package libxfce4util-1.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gtk+-2.0 to atleast version 2.14.0, or adjust" + echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15327,8 +16221,8 @@ $as_echo "not found" >&6; } - echo "*** The required package gtk+-2.0 was not found on your system." - echo "*** Please install gtk+-2.0 (atleast version 2.14.0) or adjust" + echo "*** The required package libxfce4util-1.0 was not found on your system." + echo "*** Please install libxfce4util-1.0 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15338,6 +16232,20 @@ + + + # Check whether --enable-gtk3 was given. +if test "${enable_gtk3+set}" = set; then : + enableval=$enable_gtk3; xdt_cv_GTK3_check=$enableval +else + xdt_cv_GTK3_check=yes +fi + + + if test x"$xdt_cv_GTK3_check" = x"yes"; then + if $PKG_CONFIG --exists "gtk+-3.0 >= 3.2.0" >/dev/null 2>&1; then + + # minimum supported version of pkg-config xdt_cv_PKG_CONFIG_MIN_VERSION=0.9.0 @@ -15369,7 +16277,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15412,7 +16320,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15476,26 +16384,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfce4util-1.0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfce4util-1.0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfce4util-1.0" >/dev/null 2>&1; then - LIBXFCE4UTIL_VERSION=`$PKG_CONFIG --modversion "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_VERSION" >&5 -$as_echo "$LIBXFCE4UTIL_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.2.0" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.2.0... " >&6; } + if $PKG_CONFIG "--atleast-version=3.2.0" "gtk+-3.0" >/dev/null 2>&1; then + GTK3_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_VERSION" >&5 +$as_echo "$GTK3_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_CFLAGS... " >&6; } - LIBXFCE4UTIL_CFLAGS=`$PKG_CONFIG --cflags "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_CFLAGS" >&5 -$as_echo "$LIBXFCE4UTIL_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK3_CFLAGS" >&5 +$as_echo_n "checking GTK3_CFLAGS... " >&6; } + GTK3_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_CFLAGS" >&5 +$as_echo "$GTK3_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXFCE4UTIL_LIBS" >&5 -$as_echo_n "checking LIBXFCE4UTIL_LIBS... " >&6; } - LIBXFCE4UTIL_LIBS=`$PKG_CONFIG --libs "libxfce4util-1.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXFCE4UTIL_LIBS" >&5 -$as_echo "$LIBXFCE4UTIL_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK3_LIBS" >&5 +$as_echo_n "checking GTK3_LIBS... " >&6; } + GTK3_LIBS=`$PKG_CONFIG --libs "gtk+-3.0"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_LIBS" >&5 +$as_echo "$GTK3_LIBS" >&6; } - LIBXFCE4UTIL_REQUIRED_VERSION=4.8.0 + GTK3_REQUIRED_VERSION=3.2.0 @@ -15503,15 +16411,20 @@ - elif $PKG_CONFIG --exists "libxfce4util-1.0" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "libxfce4util-1.0"` + +$as_echo "#define HAVE_GTK3 1" >>confdefs.h + + GTK3_FOUND="yes" + + elif $PKG_CONFIG --exists "gtk+-3.0" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package libxfce4util-1.0 was found on your system," + echo "*** The required package gtk+-3.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfce4util-1.0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade gtk+-3.0 to atleast version 3.2.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15522,8 +16435,8 @@ $as_echo "not found" >&6; } - echo "*** The required package libxfce4util-1.0 was not found on your system." - echo "*** Please install libxfce4util-1.0 (atleast version 4.8.0) or adjust" + echo "*** The required package gtk+-3.0 was not found on your system." + echo "*** Please install gtk+-3.0 (atleast version 3.2.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15531,6 +16444,36 @@ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gtk+-3.0 >= 3.2.0" >&5 +$as_echo_n "checking for optional package gtk+-3.0 >= 3.2.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gtk+-3.0" >&5 +$as_echo_n "checking for optional package gtk+-3.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 +$as_echo "disabled" >&6; } + fi + + if test x"$GTK3_FOUND" = x"yes"; then + HAVE_GTK3_TRUE= + HAVE_GTK3_FALSE='#' +else + HAVE_GTK3_TRUE='#' + HAVE_GTK3_FALSE= +fi + + + if test "x$GTK3_FOUND" = "xyes"; then + ENABLE_GTK3_LIBRARY_TRUE= + ENABLE_GTK3_LIBRARY_FALSE='#' +else + ENABLE_GTK3_LIBRARY_TRUE='#' + ENABLE_GTK3_LIBRARY_FALSE= +fi + @@ -15578,7 +16521,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15621,7 +16564,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15809,7 +16752,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15852,7 +16795,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15916,9 +16859,9 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.8.0" >&5 -$as_echo_n "checking for libxfconf-0 >= 4.8.0... " >&6; } - if $PKG_CONFIG "--atleast-version=4.8.0" "libxfconf-0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxfconf-0 >= 4.12.0" >&5 +$as_echo_n "checking for libxfconf-0 >= 4.12.0... " >&6; } + if $PKG_CONFIG "--atleast-version=4.12.0" "libxfconf-0" >/dev/null 2>&1; then XFCONF_VERSION=`$PKG_CONFIG --modversion "libxfconf-0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_VERSION" >&5 $as_echo "$XFCONF_VERSION" >&6; } @@ -15935,7 +16878,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFCONF_LIBS" >&5 $as_echo "$XFCONF_LIBS" >&6; } - XFCONF_REQUIRED_VERSION=4.8.0 + XFCONF_REQUIRED_VERSION=4.12.0 @@ -15951,7 +16894,7 @@ echo "*** The required package libxfconf-0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade libxfconf-0 to atleast version 4.8.0, or adjust" + echo "*** Please upgrade libxfconf-0 to atleast version 4.12.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -15963,7 +16906,7 @@ echo "*** The required package libxfconf-0 was not found on your system." - echo "*** Please install libxfconf-0 (atleast version 4.8.0) or adjust" + echo "*** Please install libxfconf-0 (atleast version 4.12.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -15981,6 +16924,47 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional vendor name and/or info" >&5 +$as_echo_n "checking for additional vendor name and/or info... " >&6; } + +# Check whether --with-vendor-info was given. +if test "${with_vendor_info+set}" = set; then : + withval=$with_vendor_info; with_vendor_info="$withval" +else + with_vendor_info="" +fi + +if test x"$with_vendor_info" != x""; then + +cat >>confdefs.h <<_ACEOF +#define VENDOR_INFO "$with_vendor_info" +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vendorinfo" >&5 +$as_echo "$vendorinfo" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +$as_echo "not set" >&6; } +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom manual website location" >&5 +$as_echo_n "checking for a custom manual website location... " >&6; } + +# Check whether --with-manual-website was given. +if test "${with_manual_website+set}" = set; then : + withval=$with_manual_website; with_manual_website="$withval" +else + with_manual_website="http://docs.xfce.org/help.php" +fi + + +cat >>confdefs.h <<_ACEOF +#define MANUAL_WEBSITE "$with_manual_website" +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_manual_website" >&5 +$as_echo "$with_manual_website" >&6; } + @@ -16027,7 +17011,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16070,7 +17054,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16258,16 +17242,78 @@ - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + gtk_doc_requires="gtk-doc >= 1.0" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -16276,8 +17322,8 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16288,10 +17334,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16318,7 +17364,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16362,7 +17408,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16404,18 +17450,19 @@ fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -16475,31 +17522,11 @@ # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -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 -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -16507,14 +17534,8 @@ $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -16534,6 +17555,18 @@ enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + + + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -16600,10 +17633,10 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -16663,7 +17696,7 @@ CPPFLAGS="$CPPFLAGS -DNDEBUG" if test x"$enable_debug" = x"no"; then - CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS" + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -16836,7 +17869,7 @@ $as_echo "$PLATFORM_LDFLAGS" >&6; } -ac_config_files="$ac_config_files Makefile docs/Makefile docs/version.xml glade/Makefile glade/icons/Makefile glade/icons/16x16/Makefile glade/icons/22x22/Makefile libxfce4kbd-private/libxfce4kbd-private-2.pc libxfce4kbd-private/Makefile libxfce4ui.spec libxfce4ui/libxfce4ui-1.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile docs/Makefile docs/version.xml glade/Makefile glade/icons/Makefile glade/icons/16x16/Makefile glade/icons/22x22/Makefile icons/Makefile icons/48x48/Makefile libxfce4kbd-private/libxfce4kbd-private-2.pc libxfce4kbd-private/libxfce4kbd-private-3.pc libxfce4kbd-private/Makefile libxfce4ui/libxfce4ui-1.pc libxfce4ui/libxfce4ui-2.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile xfce4-about/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16947,6 +17980,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16983,6 +18024,14 @@ ac_config_commands="$ac_config_commands po/stamp-it" +if test -z "${HAVE_GTK3_TRUE}" && test -z "${HAVE_GTK3_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK3\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ENABLE_GTK3_LIBRARY_TRUE}" && test -z "${ENABLE_GTK3_LIBRARY_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GTK3_LIBRARY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_LIBSTARTUP_NOTIFICATION_TRUE}" && test -z "${HAVE_LIBSTARTUP_NOTIFICATION_FALSE}"; then as_fn_error $? "conditional \"HAVE_LIBSTARTUP_NOTIFICATION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16995,6 +18044,10 @@ as_fn_error $? "conditional \"HAVE_GLADEUI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17317,16 +18370,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -17386,28 +18439,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -17428,8 +18469,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libxfce4ui $as_me 4.8.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by libxfce4ui $as_me 4.12.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -17494,11 +18535,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libxfce4ui config.status 4.8.1 -configured by $0, generated by GNU Autoconf 2.68, +libxfce4ui config.status 4.12.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -17589,7 +18630,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -17631,12 +18672,13 @@ SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' @@ -17678,10 +18720,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -17746,7 +18791,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17797,9 +18843,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17834,7 +18883,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17861,10 +18910,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17873,19 +18923,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -17912,12 +18959,16 @@ "glade/icons/Makefile") CONFIG_FILES="$CONFIG_FILES glade/icons/Makefile" ;; "glade/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES glade/icons/16x16/Makefile" ;; "glade/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES glade/icons/22x22/Makefile" ;; + "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;; + "icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES icons/48x48/Makefile" ;; "libxfce4kbd-private/libxfce4kbd-private-2.pc") CONFIG_FILES="$CONFIG_FILES libxfce4kbd-private/libxfce4kbd-private-2.pc" ;; + "libxfce4kbd-private/libxfce4kbd-private-3.pc") CONFIG_FILES="$CONFIG_FILES libxfce4kbd-private/libxfce4kbd-private-3.pc" ;; "libxfce4kbd-private/Makefile") CONFIG_FILES="$CONFIG_FILES libxfce4kbd-private/Makefile" ;; - "libxfce4ui.spec") CONFIG_FILES="$CONFIG_FILES libxfce4ui.spec" ;; "libxfce4ui/libxfce4ui-1.pc") CONFIG_FILES="$CONFIG_FILES libxfce4ui/libxfce4ui-1.pc" ;; + "libxfce4ui/libxfce4ui-2.pc") CONFIG_FILES="$CONFIG_FILES libxfce4ui/libxfce4ui-2.pc" ;; "libxfce4ui/libxfce4ui-config.h") CONFIG_FILES="$CONFIG_FILES libxfce4ui/libxfce4ui-config.h" ;; "libxfce4ui/Makefile") CONFIG_FILES="$CONFIG_FILES libxfce4ui/Makefile" ;; + "xfce4-about/Makefile") CONFIG_FILES="$CONFIG_FILES xfce4-about/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -18516,7 +19567,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -18529,7 +19580,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -18563,21 +19614,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -18612,55 +19661,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 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. + +# GNU Libtool 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 of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool 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. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18685,13 +19732,13 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO -# Whether or not to build static libraries. -build_old_libs=$enable_static - # Which release of libtool.m4 was used? macro_version=$macro_version macro_revision=$macro_revision +# Whether or not to build static libraries. +build_old_libs=$enable_static + # Whether or not to build shared libraries. build_libtool_libs=$enable_shared @@ -18701,6 +19748,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # The PATH separator for the build system. PATH_SEPARATOR=$lt_PATH_SEPARATOR @@ -18797,18 +19847,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18899,8 +19958,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18993,13 +20055,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -19051,13 +20113,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -19066,7 +20187,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -19076,165 +20197,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -19330,4 +20292,13 @@ fi echo "* Debug support: $enable_debug" echo "* GNU Visibility: $have_gnuc_visibility" +if test -n "$with_vendor_info"; then +echo "* Vendor: $with_vendor_info" +echo +echo "Note you can put additional info about the vendor" +echo "in this text file: \"${datarootdir}/xfce4/vendorinfo\"" +else +echo "* Vendor: none" +fi +echo "* Manual website: $with_manual_website" echo diff -Nru libxfce4ui-4.8.1/configure.ac libxfce4ui-4.12.1/configure.ac --- libxfce4ui-4.8.1/configure.ac 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/configure.ac 2015-03-15 18:14:44.000000000 +0000 @@ -3,9 +3,8 @@ dnl Edit that file instead! dnl -dnl $Id$ dnl -dnl Copyright (c) 2007-2011 The Xfce development team +dnl Copyright (c) 2007-2015 The Xfce development team dnl dnl *************************** @@ -14,10 +13,10 @@ m4_define([libxfce4ui_verinfo], [0:0:0]) m4_define([libxfce4ui_version_api], [1]) m4_define([libxfce4ui_version_major], [4]) -m4_define([libxfce4ui_version_minor], [8]) +m4_define([libxfce4ui_version_minor], [12]) m4_define([libxfce4ui_version_micro], [1]) m4_define([libxfce4ui_version_nano], []) dnl leave this empty to have no nano version -m4_define([libxfce4ui_version_build], [93732d0]) +m4_define([libxfce4ui_version_build], [1964cb1]) m4_define([libxfce4ui_version_tag], []) m4_define([libxfce4ui_version], [libxfce4ui_version_major().libxfce4ui_version_minor().libxfce4ui_version_micro()ifelse(libxfce4ui_version_nano(), [], [], [.libxfce4ui_version_nano()])ifelse(libxfce4ui_version_tag(), [git], [libxfce4ui_version_tag()-libxfce4ui_version_build()], [libxfce4ui_version_tag()])]) @@ -29,24 +28,25 @@ dnl ******************************************** -dnl *** Full debug support for SVN snapshots *** +dnl *** Full debug support for GIT snapshots *** dnl ******************************************** m4_define([libxfce4ui_debug_default], [ifelse(libxfce4ui_version_tag(), [git], [full], [minimum])]) dnl *************************** dnl *** Initialize autoconf *** dnl *************************** -AC_COPYRIGHT([Copyright (c) 2007-2011 The Xfce development team]) +AC_COPYRIGHT([Copyright (c) 2007-2015 The Xfce development team]) AC_INIT([libxfce4ui], [libxfce4ui_version], [http://bugzilla.xfce.org/], [libxfce4ui]) -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) +AC_CONFIG_MACRO_DIR([m4]) AC_REVISION([libxfce4ui_version_build]) AC_CANONICAL_TARGET() dnl *************************** dnl *** Initialize automake *** dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -AM_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar no-dist-gzip]) +AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE() m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -80,14 +80,14 @@ AC_PROG_LD() AM_PROG_CC_C_O() AC_PROG_INSTALL() -AC_PROG_INTLTOOL() +IT_PROG_INTLTOOL([0.35.0]) AC_CHECK_PROGS([PERL], [perl5 perl]) dnl ************************** dnl *** Initialize libtool *** dnl ************************** -AC_DISABLE_STATIC() -AC_PROG_LIBTOOL() +LT_PREREQ([2.4]) +LT_INIT([disable-static]) dnl ************************************** dnl *** Substitute version information *** @@ -119,7 +119,7 @@ dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** -XDT_I18N([ar ast bn ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko ku lv ms nb nl pa pl pt_BR pt ro ru si sk sv te tl_PH tl tr ug uk ur_PK ur zh_CN zh_TW ]) +XDT_I18N([am ar ast bg bn ca cs da de el en_AU en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW ]) dnl ******************************************* dnl *** Check for X Window System installed *** @@ -130,9 +130,17 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** -XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.16.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.30.0]) +XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) + +dnl *********************************************************** +dnl *** Optional support for a GTK+3 version of the library *** +dnl *********************************************************** +XDT_CHECK_OPTIONAL_PACKAGE([GTK3], + [gtk+-3.0], [3.2.0], [gtk3], + [GTK+ 3 support]) +AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"]) dnl ************************************************* dnl *** Optional support for startup notification *** @@ -150,10 +158,35 @@ [Do not compile the keyboard library needed by xfwm4 and xfce4-settings (default=enabled)])], [enable_keyboard_library=$enableval], [enable_keyboard_library=yes]) if test "x$enable_keyboard_library" = "xyes"; then - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) fi AM_CONDITIONAL([ENABLE_KEYBOARD_LIBRARY], [test "x$enable_keyboard_library" = "xyes"]) +dnl ********************************************* +dnl *** Check for vendor specific information *** +dnl ********************************************* +AC_MSG_CHECKING([for additional vendor name and/or info]) +AC_ARG_WITH([vendor-info], +AC_HELP_STRING([--with-vendor-info=NAME], [Specify an additional vendor name, optionally with a file in $prefix/share/xfce4/venderinfo]), + [with_vendor_info="$withval"], [with_vendor_info=""]) +if test x"$with_vendor_info" != x""; then + AC_DEFINE_UNQUOTED([VENDOR_INFO], ["$with_vendor_info"], [Additional vendor name and/or info]) + AC_MSG_RESULT([$vendorinfo]) +else + AC_MSG_RESULT([not set]) +fi + +dnl ********************************************* +dnl *** Check for vendor specific information *** +dnl ********************************************* +AC_MSG_CHECKING([for a custom manual website location]) +AC_ARG_WITH([manual-website], +AC_HELP_STRING([--with-manual-website=URI], [Specify an optional manual website, defaults to http://docs.xfce.org.]), + [with_manual_website="$withval"], + [with_manual_website="http://docs.xfce.org/help.php"]) +AC_DEFINE_UNQUOTED([MANUAL_WEBSITE], ["$with_manual_website"], [Documentation website]) +AC_MSG_RESULT([$with_manual_website]) + dnl ********************************************************* dnl *** Optional support for the Glade Interface Designer *** dnl ********************************************************* @@ -220,7 +253,7 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE(AC_LANG_SOURCE( + AC_COMPILE_IFELSE([AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -231,7 +264,7 @@ test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) @@ -276,12 +309,16 @@ glade/icons/Makefile glade/icons/16x16/Makefile glade/icons/22x22/Makefile +icons/Makefile +icons/48x48/Makefile libxfce4kbd-private/libxfce4kbd-private-2.pc +libxfce4kbd-private/libxfce4kbd-private-3.pc libxfce4kbd-private/Makefile -libxfce4ui.spec libxfce4ui/libxfce4ui-1.pc +libxfce4ui/libxfce4ui-2.pc libxfce4ui/libxfce4ui-config.h libxfce4ui/Makefile +xfce4-about/Makefile po/Makefile.in ]) @@ -316,4 +353,13 @@ fi echo "* Debug support: $enable_debug" echo "* GNU Visibility: $have_gnuc_visibility" +if test -n "$with_vendor_info"; then +echo "* Vendor: $with_vendor_info" +echo +echo "Note you can put additional info about the vendor" +echo "in this text file: \"${datarootdir}/xfce4/vendorinfo\"" +else +echo "* Vendor: none" +fi +echo "* Manual website: $with_manual_website" echo diff -Nru libxfce4ui-4.8.1/debian/changelog libxfce4ui-4.12.1/debian/changelog --- libxfce4ui-4.8.1/debian/changelog 2011-12-28 20:20:38.000000000 +0000 +++ libxfce4ui-4.12.1/debian/changelog 2015-06-12 18:10:40.000000000 +0000 @@ -1,3 +1,197 @@ +libxfce4ui (4.12.1-2~ubuntu12.04.1) precise; urgency=low + + * No-change backport to precise + + -- Pavel Sofishchenko Fri, 12 Jun 2015 23:10:40 +0500 + +libxfce4ui (4.12.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Yves-Alexis Perez Wed, 06 May 2015 15:36:17 +0200 + +libxfce4ui (4.12.1-1) experimental; urgency=medium + + [ Jackson Doak ] + * New upstream release + + -- Yves-Alexis Perez Sun, 15 Mar 2015 21:52:50 +0100 + +libxfce4ui (4.12.0-1) experimental; urgency=medium + + [ Mateusz Łukasik ] + * New upstream release. + * debian/control: + - Bump standards-version to 3.9.6. + - Bump minimal xfce devel depends to 4.12. + + -- Yves-Alexis Perez Sun, 08 Mar 2015 15:19:16 +0100 + +libxfce4ui (4.11.1-2) experimental; urgency=medium + + [ Lionel Le Folgoc ] + * debian/*.symbols: added. + * debian/rules: override dh_makeshlibs to ignore libxfce4kbd-private. + * debian/{vendorinfo,control}: update my email address. + * debian/control: relax libxfce4ui-utils dependency on libxfce4ui-1-0. + + [ Yves-Alexis Perez ] + * debian/libxfce4ui-{2,3}-0.lintian-overrides added, add lintian overrides + for not having libxfce4kbd-private in symbols files. + + -- Yves-Alexis Perez Sun, 16 Mar 2014 16:20:55 +0100 + +libxfce4ui (4.11.1-1) experimental; urgency=medium + + [ Jackson Doak ] + * New upstream release + + -- Yves-Alexis Perez Sun, 23 Feb 2014 21:01:51 +0100 + +libxfce4ui (4.11.0-1) experimental; urgency=low + + [ Yves-Alexis Perez ] + * debian/rules: + - force disable gladeui. closes: #724037 + * debian/control: + - update standards version to 3.9.5. + + [ Lionel Le Folgoc ] + * New upstream development release. + * Enable gtk3 support: + - Introduce libxfce4ui-2-* binary packages for the Gtk+3 variant. + - Introduce libxfce4ui-common for arch-indep files since they are used by + both variants, and change xfce-keyboard-shortcuts into a transitional + package depending on it. + * debian/rules: pass --with-gtk3 to configure. + * debian/control: add b-dep on libgtk-3-dev. + * debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch: dropped, + included upstream. + * debian/libxfce4ui-1-0.shlibs: bumped to >= 4.11.0 for the new symbols. + + -- Yves-Alexis Perez Sat, 28 Dec 2013 23:59:54 +0100 + +libxfce4ui (4.10.0-6) unstable; urgency=medium + + * debian/rules: + - replace autotools-dev addon by a call to xdt-autogen. Fix FTBFS on + ppc64el. closes: #760626 + * debian/control: + - drop build-dep on autotools-dev + - add build-dep on xfce4-dev-tools + - update standards version to 3.9.5. + * debian/source/lintian-overrides: + - add overrides for the outdated config.{guess,sub} since xdt-autogen will + update them. + + -- Yves-Alexis Perez Sat, 06 Sep 2014 13:01:36 +0200 + +libxfce4ui (4.10.0-5) unstable; urgency=low + + * debian/rules: + - force disable gladeui. closes: #724037 + * debian/patches: + - 02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744 added, fix + keyboard shortcut not working when using shift modifier. closes: #721669 + + -- Yves-Alexis Perez Wed, 09 Oct 2013 21:01:03 +0200 + +libxfce4ui (4.10.0-4) unstable; urgency=low + + [ Lionel Le Folgoc ] + * debian/xfhelp4: added, reintroduced until all plugins are migrated to the + new help system. + * debian/libxfce4ui-utils.install: install xfhelp4 to usr/bin. + * Only install the vendorinfo file on Debian, not Ubuntu. + * debian/rules: fix dh_strip override so that libxfce4ui-utils dbg symbols + end up in libxfce4ui-utils-dbg and not in libxfce4ui-1-dbg. + * debian/control: let libxfce4ui-utils-dbg breaks/replaces previous + libxfce4ui-1-dbg for the moved symbol. + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org + + [ Jackson Doak ] + * debian/copyright: Convert to debian format 1.0 + * debian/control: + - Make VCS URLs point to trunk instead of experimental + * debian/rules: disable silent building + + -- Yves-Alexis Perez Sat, 21 Sep 2013 17:48:36 +0200 + +libxfce4ui (4.10.0-3) unstable; urgency=low + + * debian/control: + - drop glade-xfce package, since it's now useless with the move to GTK3. + closes: #709243 + - update standards version to 3.9.4. + * debian/rules: + - drop glade file removal. + - use autotools-dev addons to refresh config.{sub,guess}. + + -- Yves-Alexis Perez Sun, 16 Jun 2013 16:05:12 +0200 + +libxfce4ui (4.10.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/rules: + - enable all hardening flags. + + -- Yves-Alexis Perez Tue, 21 May 2013 21:32:57 +0200 + +libxfce4ui (4.10.0-1) experimental; urgency=low + + * New upstream stable release. + * debian/patches: + - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly. + * debian/control: revert to unversioned libxfce4util-dev, bump required + versions for Xfce 4.10. + + -- Lionel Le Folgoc Fri, 04 May 2012 22:48:03 +0200 + +libxfce4ui (4.9.2-1) experimental; urgency=low + + * New upstream development release. + * debian/xfce4-about.1, debian/libxfce4ui-utils.manpages: ship a manpage + for xfce4-about. + + -- Lionel Le Folgoc Sun, 15 Apr 2012 15:29:29 +0200 + +libxfce4ui (4.9.1-1) experimental; urgency=low + + [ Lionel Le Folgoc ] + * New upstream development release. + * debian/control: + - add a new binary package libxfce4ui-utils to contain xfce4-about files + - libxfce4ui-utils breaks/replaces pre 4.10 xfce4-utils package, as it + previously shipped xfce4-about. + - use Breaks instead of Conflicts when possible. + * debian/patches: + - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly + and add DEP-3 headers. + * debian/libxfce4ui-1-0.shlibs: added. + * debian/rules: take vendor handling code from xfce4-utils for xfce4-about. + * debian/vendorinfo: added, taken from xfce4-utils, and renamed from + debian/Debian. + + [ Yves-Alexis Perez ] + * debian/control: + - update standards version to 3.9.3. + - update debhelper build-dep to 9. + - add build-dep on dpkg-dev 1.16.1. + - drop hardening-includes build-dep. + - add pre-depends on ${misc:Pre-Depends}. + - build-dep on libxfce4util6-dev to start using the new API and make the + -dev package depends on it. + * debian/rules: + - use hardening support in debhelper 9 and dpkg-dev 1.16.1 + - multi-archify the paths. + - build with --parallel. + * debian/*.install: + - multi-archify the paths. + + -- Lionel Le Folgoc Sun, 08 Apr 2012 16:03:09 +0200 + libxfce4ui (4.8.1-1) unstable; urgency=low * New upstream bugfix release, including: diff -Nru libxfce4ui-4.8.1/debian/compat libxfce4ui-4.12.1/debian/compat --- libxfce4ui-4.8.1/debian/compat 2009-10-25 14:39:22.000000000 +0000 +++ libxfce4ui-4.12.1/debian/compat 2013-05-21 19:28:13.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru libxfce4ui-4.8.1/debian/control libxfce4ui-4.12.1/debian/control --- libxfce4ui-4.8.1/debian/control 2011-10-06 11:23:58.000000000 +0000 +++ libxfce4ui-4.12.1/debian/control 2015-03-03 21:07:22.000000000 +0000 @@ -3,32 +3,37 @@ Section: xfce Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , - Lionel Le Folgoc -Build-Depends: debhelper (>= 7.0.50~), intltool (>= 0.31), pkg-config, - libgtk2.0-dev, libstartup-notification0-dev, libglade2-dev, libgladeui-1-dev, - libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>= 4.8.0), hardening-includes -Standards-Version: 3.9.2 + Lionel Le Folgoc +Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config, + libgtk2.0-dev, libgtk-3-dev, libstartup-notification0-dev, libglade2-dev, + autotools-dev, libxfce4util-dev (>= 4.12), libxfconf-0-dev (>= 4.12), + dpkg-dev (>= 1.16.1) +Standards-Version: 3.9.6 Homepage: http://www.xfce.org/ -Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/branches/experimental/libxfce4ui -Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/libxfce4ui +Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/libxfce4ui +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/libxfce4ui Package: libxfce4ui-1-0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts -Description: widget library for Xfce +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4ui-common (>= 4.11) +Description: widget library for Xfce - Gtk+2 variant libxfce4ui is used to share commonly used Xfce widgets among the Xfce applications. + . + This package provides the Gtk+2 variant of libxfce4ui. Package: libxfce4ui-1-dev Section: libdevel Architecture: any Depends: libxfce4ui-1-0 (= ${binary:Version}), ${misc:Depends}, libgtk2.0-dev, - libxfce4util-dev, libxfconf-0-dev -Suggests: devhelp -Description: Development files for libxfce4ui + libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0) +Description: Development files for libxfce4ui - Gtk+2 variant This package contains the headers and the static library for libxfce4ui. + . + This package provides development files for the Gtk+2 variant of libxfce4ui. Package: libxfce4ui-1-dbg Section: debug @@ -36,23 +41,86 @@ Architecture: any Depends: ${shlibs:Depends}, libxfce4ui-1-0 (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for libxfce4ui +Description: debugging symbols for libxfce4ui - Gtk+2 variant This package contains debugging symbols and information for libxfce4ui. + . + This package provides debugging symbols for the Gtk+2 variant of libxfce4ui. -Package: xfce-keyboard-shortcuts +Package: libxfce4ui-2-0 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4ui-common (>= 4.11) +Description: widget library for Xfce - Gtk+3 variant + libxfce4ui is used to share commonly used Xfce widgets among the Xfce + applications. + . + This package provides the Gtk+3 variant of libxfce4ui. + +Package: libxfce4ui-2-dev +Section: libdevel +Architecture: any +Depends: libxfce4ui-2-0 (= ${binary:Version}), ${misc:Depends}, libgtk-3-dev, + libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0) +Description: Development files for libxfce4ui - Gtk+3 variant + This package contains the headers and the static library + for libxfce4ui. + . + This package provides development files for the Gtk+3 variant of libxfce4ui. + +Package: libxfce4ui-2-dbg +Section: debug +Priority: extra +Architecture: any +Depends: ${shlibs:Depends}, libxfce4ui-2-0 (= ${binary:Version}), + ${misc:Depends} +Description: debugging symbols for libxfce4ui - Gtk+3 variant + This package contains debugging symbols and information for libxfce4ui. + . + This package provides debugging symbols for the Gtk+3 variant of libxfce4ui. + +Package: libxfce4ui-common Section: xfce Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libxfce4ui-1-0 -Conflicts: libxfcegui4-4 (<< 4.6.1-2) -Description: xfce keyboard shortcuts configuration - This package only contains the default shortcut configuration for Xfce. +Suggests: libxfce4ui-2-0 | libxfce4ui-1-0, devhelp +Provides: xfce-keyboard-shortcuts +Breaks: xfce-keyboard-shortcuts (<< 4.11), libxfce4ui-1-0 (<< 4.11), + libxfce4ui-1-dev (<< 4.11) +Replaces: xfce-keyboard-shortcuts (<< 4.11), libxfce4ui-1-0 (<< 4.11), + libxfce4ui-1-dev (<< 4.11) +Description: common files for libxfce4ui + This package contains the common files for both variants of libxfce4ui. -Package: glade-xfce +Package: libxfce4ui-utils Section: xfce Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: glade, libxfce4ui-1-dev -Description: glade modules for xfce - This package contains the modules that allow Glade to provide Xfce widgets in - its palette. +Breaks: xfce4-utils +Replaces: xfce4-utils +Description: Utility files for libxfce4ui + This package contains the Xfce settings plugin and the utility files for + libxfce4ui-1-0 which are: + - xfce4-about + +Package: libxfce4ui-utils-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libxfce4ui-utils (= ${binary:Version}), ${shlibs:Depends}, + ${misc:Depends} +Breaks: libxfce4ui-1-dbg (<< 4.10.0-4) +Replaces: libxfce4ui-1-dbg (<< 4.10.0-4) +Description: debugging symbols for libxfce4ui-utils + This package contains debugging symbols and information for libxfce4ui-utils. + +Package: xfce-keyboard-shortcuts +Section: oldlibs +Priority: extra +Architecture: all +Depends: ${misc:Depends}, libxfce4ui-common +Description: xfce keyboard shortcuts configuration (transitional package) + This package only contains the default shortcut configuration for Xfce. + . + This package ensures a smooth upgrades from previous versions of Debian. + It can safely be removed if no other packages depend on it. diff -Nru libxfce4ui-4.8.1/debian/copyright libxfce4ui-4.12.1/debian/copyright --- libxfce4ui-4.8.1/debian/copyright 2011-12-23 18:43:15.000000000 +0000 +++ libxfce4ui-4.12.1/debian/copyright 2013-09-19 09:50:30.000000000 +0000 @@ -1,13 +1,6 @@ -This package was debianized by Yves-Alexis Perez on -Sat, 24 Oct 2009 23:32:14 +0200 - -It was downloaded from http://www.xfce.org - -Upstream authors are: - Jannis Pohlmann - Benedikt Meurer - Olivier Fourdan - Brian Tarricone +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libxfce4ui +Source: http://www.xfce.org Files: glade/libxfce4ui-glade.c libxfce4ui/libxfce4ui-config.c @@ -18,8 +11,7 @@ libxfce4ui/xfce-gtk-extensions.c libxfce4ui/xfce-gtk-extensions.h libxfce4ui/xfce-spawn.h -Copyright: 2007, The Xfce Development Team - 2008, The Xfce Development Team +Copyright: 2007-2008, The Xfce Development Team License: LGPL-2+ Files: libxfce4kbd-private/xfce-shortcut-dialog.c @@ -65,25 +57,32 @@ 2007, The Xfce Development Team License: LGPL-2+ -The Debian packaging is - © 2009-2011 Yves-Alexis Perez -and is licensed under the GPL, version 2. - -The documentation (files in docs/*) is released under the GNU Free Documentation -License, version 1.1 or later, with no invariant sections, using the following -statement: - - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 or - any later version published by the Free Software Foundation; with no - Invariant Sections, with no Front-Cover Texts, and with no Back-Cover - Texts. +Files: debian/* +Copyright: 2009-2013, Yves-Alexis Perez +License: GPL-2+ + +Files: docs/* +Copyright: 2007-2013, The Xfce Development Team +License: GFDL-1.1+ + +License: GFDL-1.1+ + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front-Cover Texts, and with no Back-Cover + Texts. + . + On Debian systems, the complete text of the GNU Free Documentation + License can be found in “/usr/share/common-licenses/GFDL-1.1”. -On Debian systems, the complete text of the GNU Lesser General Public -License can be found in `/usr/share/common-licenses/LGPL'. +License: LGPL-2+ + On Debian systems, the complete text of the GNU Lesser General Public + License (version 2) can be found in `/usr/share/common-licenses/LGPL-2'. -The complete text of the GNU Free Documentation License can be found on the -file “/usr/share/common-licenses/GFDL”. +License: LGPL-2.1+ + On Debian systems, the complete text of the GNU Lesser General Public + License (version 2.1) can be found in `/usr/share/common-licenses/LGPL-2.1'.\ -The complete text of the GNU General Public License (version 2) can be -found in `/usr/share/common-licenses/GPL-2'. +License: GPL-2+ + On Debian systems, the complete text of the GNU General Public License + (version 2) can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru libxfce4ui-4.8.1/debian/glade-xfce.install libxfce4ui-4.12.1/debian/glade-xfce.install --- libxfce4ui-4.8.1/debian/glade-xfce.install 2009-10-25 14:39:22.000000000 +0000 +++ libxfce4ui-4.12.1/debian/glade-xfce.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/glade3 -usr/lib/glade3 diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-1-0.install libxfce4ui-4.12.1/debian/libxfce4ui-1-0.install --- libxfce4ui-4.8.1/debian/libxfce4ui-1-0.install 2009-10-25 14:39:22.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-1-0.install 2015-03-03 21:07:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/lib*.so.* -usr/share/locale/ +usr/lib/*/libxfce4ui-1.so.* +usr/lib/*/libxfce4kbd-private-2.so.* diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-1-0.lintian-overrides libxfce4ui-4.12.1/debian/libxfce4ui-1-0.lintian-overrides --- libxfce4ui-4.8.1/debian/libxfce4ui-1-0.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-1-0.lintian-overrides 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,2 @@ +# libxfce4kbd-private-2 is private to Xfce core +libxfce4ui-1-0: shlib-missing-in-symbols-control-file libxfce4kbd-private-2 0 for usr/lib/x86_64-linux-gnu/libxfce4kbd-private-2.so.0.0.0 diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-1-0.shlibs libxfce4ui-4.12.1/debian/libxfce4ui-1-0.shlibs --- libxfce4ui-4.8.1/debian/libxfce4ui-1-0.shlibs 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-1-0.shlibs 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,2 @@ +libxfce4ui-1 0 libxfce4ui-1-0 +libxfce4kbd-private-2 0 libxfce4ui-1-0 (>= 4.11.0) diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-1-0.symbols libxfce4ui-4.12.1/debian/libxfce4ui-1-0.symbols --- libxfce4ui-4.8.1/debian/libxfce4ui-1-0.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-1-0.symbols 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,52 @@ +libxfce4ui-1.so.0 libxfce4ui-1-0 #MINVER# + libxfce4ui_check_version@Base 4.8.0 + libxfce4ui_major_version@Base 4.8.0 + libxfce4ui_micro_version@Base 4.8.0 + libxfce4ui_minor_version@Base 4.8.0 + xfce_dialog_confirm@Base 4.8.0 + xfce_dialog_show_error@Base 4.8.0 + xfce_dialog_show_help@Base 4.9.1 + xfce_dialog_show_help_with_version@Base 4.11.1 + xfce_dialog_show_info@Base 4.8.0 + xfce_dialog_show_warning@Base 4.8.0 + xfce_gdk_screen_get_active@Base 4.8.0 + xfce_gtk_button_new_mixed@Base 4.8.0 + xfce_gtk_frame_box_new@Base 4.8.0 + xfce_gtk_frame_box_new_with_content@Base 4.8.0 + xfce_gtk_window_center_on_active_screen@Base 4.8.0 + xfce_message_dialog@Base 4.8.0 + xfce_message_dialog_new@Base 4.8.0 + xfce_message_dialog_new_valist@Base 4.8.0 + xfce_sm_client_connect@Base 4.8.0 + xfce_sm_client_disconnect@Base 4.8.0 + xfce_sm_client_error_enum_get_type@Base 4.11.0 + xfce_sm_client_error_quark@Base 4.11.0 + xfce_sm_client_get@Base 4.8.0 + xfce_sm_client_get_client_id@Base 4.8.0 + xfce_sm_client_get_current_directory@Base 4.8.0 + xfce_sm_client_get_full@Base 4.8.0 + xfce_sm_client_get_option_group@Base 4.8.0 + xfce_sm_client_get_priority@Base 4.8.0 + xfce_sm_client_get_restart_command@Base 4.8.0 + xfce_sm_client_get_restart_style@Base 4.8.0 + xfce_sm_client_get_state_file@Base 4.8.0 + xfce_sm_client_get_type@Base 4.8.0 + xfce_sm_client_get_with_argv@Base 4.8.0 + xfce_sm_client_is_connected@Base 4.8.0 + xfce_sm_client_is_resumed@Base 4.8.0 + xfce_sm_client_request_shutdown@Base 4.8.0 + xfce_sm_client_restart_style_get_type@Base 4.8.0 + xfce_sm_client_set_current_directory@Base 4.8.0 + xfce_sm_client_set_desktop_file@Base 4.8.0 + xfce_sm_client_set_priority@Base 4.8.0 + xfce_sm_client_set_restart_command@Base 4.8.0 + xfce_sm_client_set_restart_style@Base 4.8.0 + xfce_sm_client_shutdown_hint_get_type@Base 4.8.0 + xfce_spawn_command_line_on_screen@Base 4.8.0 + xfce_spawn_on_screen@Base 4.8.0 + xfce_spawn_on_screen_with_child_watch@Base 4.8.0 + xfce_titled_dialog_get_subtitle@Base 4.8.0 + xfce_titled_dialog_get_type@Base 4.8.0 + xfce_titled_dialog_new@Base 4.8.0 + xfce_titled_dialog_new_with_buttons@Base 4.8.0 + xfce_titled_dialog_set_subtitle@Base 4.8.0 diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-1-dev.install libxfce4ui-4.12.1/debian/libxfce4ui-1-dev.install --- libxfce4ui-4.8.1/debian/libxfce4ui-1-dev.install 2010-01-09 16:21:06.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-1-dev.install 2015-03-03 21:07:22.000000000 +0000 @@ -1,4 +1,6 @@ -usr/include/* -usr/lib/lib*.so -usr/lib/pkgconfig/* -usr/share/gtk-doc/* +usr/include/xfce4/libxfce4ui-1 +usr/include/xfce4/libxfce4kbd-private-2 +usr/lib/*/libxfce4ui-1.so +usr/lib/*/libxfce4kbd-private-2.so +usr/lib/*/pkgconfig/libxfce4ui-1.pc +usr/lib/*/pkgconfig/libxfce4kbd-private-2.pc diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-2-0.install libxfce4ui-4.12.1/debian/libxfce4ui-2-0.install --- libxfce4ui-4.8.1/debian/libxfce4ui-2-0.install 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-2-0.install 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libxfce4ui-2.so.* +usr/lib/*/libxfce4kbd-private-3.so.* diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-2-0.lintian-overrides libxfce4ui-4.12.1/debian/libxfce4ui-2-0.lintian-overrides --- libxfce4ui-4.8.1/debian/libxfce4ui-2-0.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-2-0.lintian-overrides 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,2 @@ +# libxfce4kbd-private-3 is a “private” to Xfce core +shlib-missing-in-symbols-control-file libxfce4kbd-private-3 0 for usr/lib/x86_64-linux-gnu/libxfce4kbd-private-3.so.0.0.0 diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-2-0.shlibs libxfce4ui-4.12.1/debian/libxfce4ui-2-0.shlibs --- libxfce4ui-4.8.1/debian/libxfce4ui-2-0.shlibs 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-2-0.shlibs 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,2 @@ +libxfce4ui-2 0 libxfce4ui-2-0 +libxfce4kbd-private-3 0 libxfce4ui-2-0 (>= 4.11.0) diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-2-0.symbols libxfce4ui-4.12.1/debian/libxfce4ui-2-0.symbols --- libxfce4ui-4.8.1/debian/libxfce4ui-2-0.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-2-0.symbols 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,52 @@ +libxfce4ui-2.so.0 libxfce4ui-2-0 #MINVER# + libxfce4ui_check_version@Base 4.11.0 + libxfce4ui_major_version@Base 4.11.0 + libxfce4ui_micro_version@Base 4.11.0 + libxfce4ui_minor_version@Base 4.11.0 + xfce_dialog_confirm@Base 4.11.0 + xfce_dialog_show_error@Base 4.11.0 + xfce_dialog_show_help@Base 4.11.0 + xfce_dialog_show_help_with_version@Base 4.11.1 + xfce_dialog_show_info@Base 4.11.0 + xfce_dialog_show_warning@Base 4.11.0 + xfce_gdk_screen_get_active@Base 4.11.0 + xfce_gtk_button_new_mixed@Base 4.11.0 + xfce_gtk_frame_box_new@Base 4.11.0 + xfce_gtk_frame_box_new_with_content@Base 4.11.0 + xfce_gtk_window_center_on_active_screen@Base 4.11.0 + xfce_message_dialog@Base 4.11.0 + xfce_message_dialog_new@Base 4.11.0 + xfce_message_dialog_new_valist@Base 4.11.0 + xfce_sm_client_connect@Base 4.11.0 + xfce_sm_client_disconnect@Base 4.11.0 + xfce_sm_client_error_enum_get_type@Base 4.11.0 + xfce_sm_client_error_quark@Base 4.11.0 + xfce_sm_client_get@Base 4.11.0 + xfce_sm_client_get_client_id@Base 4.11.0 + xfce_sm_client_get_current_directory@Base 4.11.0 + xfce_sm_client_get_full@Base 4.11.0 + xfce_sm_client_get_option_group@Base 4.11.0 + xfce_sm_client_get_priority@Base 4.11.0 + xfce_sm_client_get_restart_command@Base 4.11.0 + xfce_sm_client_get_restart_style@Base 4.11.0 + xfce_sm_client_get_state_file@Base 4.11.0 + xfce_sm_client_get_type@Base 4.11.0 + xfce_sm_client_get_with_argv@Base 4.11.0 + xfce_sm_client_is_connected@Base 4.11.0 + xfce_sm_client_is_resumed@Base 4.11.0 + xfce_sm_client_request_shutdown@Base 4.11.0 + xfce_sm_client_restart_style_get_type@Base 4.11.0 + xfce_sm_client_set_current_directory@Base 4.11.0 + xfce_sm_client_set_desktop_file@Base 4.11.0 + xfce_sm_client_set_priority@Base 4.11.0 + xfce_sm_client_set_restart_command@Base 4.11.0 + xfce_sm_client_set_restart_style@Base 4.11.0 + xfce_sm_client_shutdown_hint_get_type@Base 4.11.0 + xfce_spawn_command_line_on_screen@Base 4.11.0 + xfce_spawn_on_screen@Base 4.11.0 + xfce_spawn_on_screen_with_child_watch@Base 4.11.0 + xfce_titled_dialog_get_subtitle@Base 4.11.0 + xfce_titled_dialog_get_type@Base 4.11.0 + xfce_titled_dialog_new@Base 4.11.0 + xfce_titled_dialog_new_with_buttons@Base 4.11.0 + xfce_titled_dialog_set_subtitle@Base 4.11.0 diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-2-dev.install libxfce4ui-4.12.1/debian/libxfce4ui-2-dev.install --- libxfce4ui-4.8.1/debian/libxfce4ui-2-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-2-dev.install 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,6 @@ +usr/include/xfce4/libxfce4ui-2 +usr/include/xfce4/libxfce4kbd-private-3 +usr/lib/*/libxfce4ui-2.so +usr/lib/*/libxfce4kbd-private-3.so +usr/lib/*/pkgconfig/libxfce4ui-2.pc +usr/lib/*/pkgconfig/libxfce4kbd-private-3.pc diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-common.install libxfce4ui-4.12.1/debian/libxfce4ui-common.install --- libxfce4ui-4.8.1/debian/libxfce4ui-common.install 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-common.install 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,3 @@ +etc +usr/share/gtk-doc/* +usr/share/locale diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-utils.install libxfce4ui-4.12.1/debian/libxfce4ui-utils.install --- libxfce4ui-4.8.1/debian/libxfce4ui-utils.install 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-utils.install 2013-07-07 22:22:50.000000000 +0000 @@ -0,0 +1,4 @@ +usr/share/applications +usr/share/icons +usr/bin/xfce4-about +debian/xfhelp4 usr/bin diff -Nru libxfce4ui-4.8.1/debian/libxfce4ui-utils.manpages libxfce4ui-4.12.1/debian/libxfce4ui-utils.manpages --- libxfce4ui-4.8.1/debian/libxfce4ui-utils.manpages 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/libxfce4ui-utils.manpages 2013-05-21 19:28:13.000000000 +0000 @@ -0,0 +1 @@ +debian/xfce4-about.1 diff -Nru libxfce4ui-4.8.1/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch libxfce4ui-4.12.1/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch --- libxfce4ui-4.8.1/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 2011-11-28 15:05:36.000000000 +0000 +++ libxfce4ui-4.12.1/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Index: libxfce4ui-4.8.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -=================================================================== ---- libxfce4ui-4.8.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-01-16 16:01:09.000000000 +0100 -+++ libxfce4ui-4.8.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-11-28 16:04:43.777907660 +0100 -@@ -4,10 +4,10 @@ - - - -- -+ - - -- -+ - - - diff -Nru libxfce4ui-4.8.1/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch libxfce4ui-4.12.1/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch --- libxfce4ui-4.8.1/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/patches/02_Fix-keyboard-shortcuts-with-Shift-modifier-bug-8744.patch 2013-10-09 19:10:32.000000000 +0000 @@ -0,0 +1,68 @@ +From 9dfbc906f89601f145557fe6846e9ad44a8e9e22 Mon Sep 17 00:00:00 2001 +From: Harald Judt +Date: Tue, 18 Dec 2012 09:00:44 +0100 +Subject: [PATCH] Fix keyboard shortcuts with Shift modifier (bug #8744). + +--- + libxfce4kbd-private/xfce-shortcut-dialog.c | 8 ++++++++ + libxfce4kbd-private/xfce-shortcuts-grabber.c | 12 +++++++++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c +index 0519982..2ee1931 100644 +--- a/libxfce4kbd-private/xfce-shortcut-dialog.c ++++ b/libxfce4kbd-private/xfce-shortcut-dialog.c +@@ -371,6 +371,14 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog, + &keyval, NULL, NULL, &consumed); + + /* Get the modifiers */ ++ ++ /* If Shift was used when translating the keyboard state, we remove it ++ * from the consumed bit because gtk_accelerator_{name,parse} fail to ++ * handle this correctly. This allows us to have shortcuts with Shift ++ * as a modifier key (see bug #8744). */ ++ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) ++ consumed &= ~GDK_SHIFT_MASK; ++ + modifiers &= ~consumed; + modifiers &= mod_mask; + +diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c +index b8d2898..dd13f7e 100644 +--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c ++++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c +@@ -313,7 +313,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, + TRACE ("Ungrabbing %s", shortcut_name); + + TRACE ("Keyval: %d", key->keyval); +- TRACE ("Modifiers: 0x%x", key->modifiers); ++ TRACE ("Modifiers: 0x%x", modifiers); + + g_free (shortcut_name); + +@@ -512,6 +512,14 @@ xfce_shortcuts_grabber_event_filter (Gdk + &keyval, NULL, NULL, &consumed); + + /* Get the modifiers */ ++ ++ /* If Shift was used when translating the keyboard state, we remove it ++ * from the consumed bit because gtk_accelerator_{name,parse} fail to ++ * handle this correctly. This allows us to have shortcuts with Shift ++ * as a modifier key (see bug #8744). */ ++ if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) ++ consumed &= ~GDK_SHIFT_MASK; ++ + modifiers &= ~consumed; + gdk_keymap_add_virtual_modifiers (keymap, &modifiers); + modifiers &= mod_mask; +@@ -506,6 +515,7 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, + context.modifiers = modifiers; + + raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); ++ gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers); + TRACE ("Looking for %s", raw_shortcut_name); + g_free (raw_shortcut_name); + +-- +1.8.4.rc3 + diff -Nru libxfce4ui-4.8.1/debian/patches/series libxfce4ui-4.12.1/debian/patches/series --- libxfce4ui-4.8.1/debian/patches/series 2011-11-28 15:05:36.000000000 +0000 +++ libxfce4ui-4.12.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_replace-ctrl-primary-gtk-shortcuts.patch diff -Nru libxfce4ui-4.8.1/debian/rules libxfce4ui-4.12.1/debian/rules --- libxfce4ui-4.8.1/debian/rules 2011-07-09 13:33:46.000000000 +0000 +++ libxfce4ui-4.12.1/debian/rules 2015-03-03 21:07:22.000000000 +0000 @@ -1,22 +1,32 @@ #!/usr/bin/make -f -include /usr/share/hardening-includes/hardening.make +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1 -CFLAGS+=$(HARDENING_CFLAGS) - -export CFLAGS LDFLAGS +XFVENDOR=Debian +ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes) + XFVENDOR=Xubuntu +endif %: - dh $@ + dh $@ --parallel + +override_dh_auto_configure: + NOCONFIGURE=xdt-autogen + dh_auto_configure -- --with-vendor-info=$(XFVENDOR) --disable-silent-rules \ + --disable-gladeui --with-gtk3 override_dh_install: - rm $(CURDIR)/debian/tmp/usr/lib/*.la - rm $(CURDIR)/debian/tmp/usr/lib/glade3/modules/*.la - rm $(CURDIR)/debian/tmp/usr/share/glade3/catalogs/libxfce4ui.xml.in - dh_install --fail-missing +ifneq ($(XFVENDOR),Xubuntu) + dh_install --sourcedir=$(CURDIR) -plibxfce4ui-utils debian/vendorinfo usr/share/xfce4 +endif + dh_install --fail-missing -X .la override_dh_strip: - dh_strip --dbg-package=libxfce4ui-1-dbg + dh_strip -plibxfce4ui-1-0 --dbg-package=libxfce4ui-1-dbg + dh_strip -plibxfce4ui-2-0 --dbg-package=libxfce4ui-2-dbg + dh_strip -plibxfce4ui-utils --dbg-package=libxfce4ui-utils-dbg + +override_dh_makeshlibs: + dh_makeshlibs -plibxfce4ui-1-0 -Xlibxfce4kbd-private + dh_makeshlibs -plibxfce4ui-2-0 -Xlibxfce4kbd-private diff -Nru libxfce4ui-4.8.1/debian/source/lintian-overrides libxfce4ui-4.12.1/debian/source/lintian-overrides --- libxfce4ui-4.8.1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/source/lintian-overrides 2014-09-06 11:01:34.000000000 +0000 @@ -0,0 +1,3 @@ +# calling xdt-autogen is enough to refresh them +source: outdated-autotools-helper-file config.guess 2012-02-10 +source: outdated-autotools-helper-file config.sub 2012-02-10 diff -Nru libxfce4ui-4.8.1/debian/vendorinfo libxfce4ui-4.12.1/debian/vendorinfo --- libxfce4ui-4.8.1/debian/vendorinfo 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/vendorinfo 2015-03-03 21:07:22.000000000 +0000 @@ -0,0 +1,9 @@ +Debian Xfce Team is + +Co maintainers are: + +Yves-Alexis Perez +Lionel Le Folgoc + +Bugs should be reported to Debian BTS at: http://bugs.debian.org or using +reportbug. diff -Nru libxfce4ui-4.8.1/debian/xfce4-about.1 libxfce4ui-4.12.1/debian/xfce4-about.1 --- libxfce4ui-4.8.1/debian/xfce4-about.1 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/xfce4-about.1 2013-05-21 19:28:13.000000000 +0000 @@ -0,0 +1,31 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.8. +.TH XFCE4-ABOUT "1" "April 2012" "xfce4-about 4.9.2 (Xfce 4.10)" "User Commands" +.SH NAME +xfce4-about \- About and Credits dialog for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-about [OPTION...] +.SS "Help Options:" +.TP +\fB\-h\fR, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2008\-2011 +.IP +The Xfce development team. All rights reserved. +.PP +Please report bugs to . diff -Nru libxfce4ui-4.8.1/debian/xfce-keyboard-shortcuts.install libxfce4ui-4.12.1/debian/xfce-keyboard-shortcuts.install --- libxfce4ui-4.8.1/debian/xfce-keyboard-shortcuts.install 2009-10-25 14:39:22.000000000 +0000 +++ libxfce4ui-4.12.1/debian/xfce-keyboard-shortcuts.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -etc diff -Nru libxfce4ui-4.8.1/debian/xfhelp4 libxfce4ui-4.12.1/debian/xfhelp4 --- libxfce4ui-4.8.1/debian/xfhelp4 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/debian/xfhelp4 2013-06-23 12:04:30.000000000 +0000 @@ -0,0 +1,72 @@ +#!/bin/bash +# +# xfce +# +# Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) +# Copyright (C) 2003 Jasper Huijsmans (jasper@xfce.org) +# +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +URL="http://docs.xfce.org/" +HELP_DIR="/usr/share/doc" + +if [ -n "$1" ]; then + HELP_FILE= + MODULE="${1%.html}" + case $1 in + *.html) + HELP_FILE="$1" + ;; + esac +else + exit 1 +fi + +# Check for translated documentation +if [ -n "$LC_ALL" ] ; then + LC=$LC_ALL +elif [ -n "$LANG" ] ; then + LC=$LANG +else + LC="C" +fi + +LC_CLEAN="${LC%_*}" + +if [ -r "$HELP_DIR/$MODULE/html/$LC/index.html" ] +then + URL="$HELP_DIR/$MODULE/html/$LC/index.html" +elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html" ] +then + URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/index.html" +elif [ -r "$HELP_DIR/$MODULE/html/C/index.html" ] +then + URL="$HELP_DIR/$MODULE/html/C/index.html" +elif [ -n "$HELP_FILE" ] +then + if [ -r "$HELP_DIR/$MODULE/html/$LC/$HELP_FILE" ] + then + URL="$HELP_DIR/$MODULE/html/$LC/$HELP_FILE" + elif [ -r "$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE" ] + then + URL="$HELP_DIR/$MODULE/html/$LC_CLEAN/$HELP_FILE" + elif [ -r "$HELP_DIR/$MODULE/html/C/$HELP_FILE" ] + then + URL="$HELP_DIR/$MODULE/html/C/$HELP_FILE" + fi +fi + +exo-open "${URL}" diff -Nru libxfce4ui-4.8.1/depcomp libxfce4ui-4.12.1/depcomp --- libxfce4ui-4.8.1/depcomp 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/depcomp 2015-03-15 18:14:47.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/home.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/home.png differ diff -Nru libxfce4ui-4.8.1/docs/html/index.html libxfce4ui-4.12.1/docs/html/index.html --- libxfce4ui-4.8.1/docs/html/index.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/index.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,11 +2,11 @@ -Libxfce4ui Reference Manual - +Libxfce4ui Reference Manual: Libxfce4ui Reference Manual + - + @@ -23,7 +23,7 @@ Software developer
 -

Version 4.8.1 +

Version 4.12.1

Copyright © 2009 The Xfce Development Team

@@ -39,7 +39,7 @@
-
+
I. Introduction
II. Xfce Fundamentals
@@ -56,7 +56,7 @@ Xfce Gdk(-pixbuf) extensions — Common used functions that are not provided by the Gdk or Gdk-pixbuf library.
-Xfce Gtk+ extensions — Common used functions for GtkWidget's that are not provided by +Xfce Gtk+ extensionsCommon used functions for GtkWidget's that are not provided by the Gtk+ library.
@@ -66,7 +66,7 @@ Xfce Dialogs — Common used dialogs to interact with the user.
-Xfce Titled Dialog — A GtkDialog with heading. +Xfce Titled DialogA GtkDialog with heading.
V. Xfce Session Management Support
@@ -78,6 +78,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/index.sgml libxfce4ui-4.12.1/docs/html/index.sgml --- libxfce4ui-4.8.1/docs/html/index.sgml 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/index.sgml 2015-03-15 18:15:03.000000000 +0000 @@ -1,90 +1,91 @@ - + + + - + - - - + + + + - + + - + + - + + - + + - + + - + + - + + + - + + + + - + + + - + - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - + @@ -105,6 +106,13 @@ + + + + + + + diff -Nru libxfce4ui-4.8.1/docs/html/ix01.html libxfce4ui-4.12.1/docs/html/ix01.html --- libxfce4ui-4.8.1/docs/html/ix01.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/ix01.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,45 +2,45 @@ -Index - +Libxfce4ui Reference Manual: Index + - + - - - - - - + + + + + +
-

-Index

+

+Index

L

-
libxfce4ui_check_version, libxfce4ui_check_version () +
libxfce4ui_check_version, libxfce4ui_check_version ()
LIBXFCE4UI_CHECK_VERSION, LIBXFCE4UI_CHECK_VERSION()
-
libxfce4ui_major_version, libxfce4ui_major_version -
LIBXFCE4UI_MAJOR_VERSION, LIBXFCE4UI_MAJOR_VERSION
-
libxfce4ui_micro_version, libxfce4ui_micro_version +
libxfce4ui_major_version, libxfce4ui_major_version
LIBXFCE4UI_MICRO_VERSION, LIBXFCE4UI_MICRO_VERSION
-
libxfce4ui_minor_version, libxfce4ui_minor_version +
libxfce4ui_micro_version, libxfce4ui_micro_version
LIBXFCE4UI_MINOR_VERSION, LIBXFCE4UI_MINOR_VERSION
+
libxfce4ui_minor_version, libxfce4ui_minor_version +
@@ -48,125 +48,133 @@
XfceSMClient, XfceSMClient
-
XfceSMClient::quit, The "quit" signal +
XfceSMClient::quit, The “quit” signal +
+
XfceSMClient::quit-cancelled, The “quit-cancelled” signal
-
XfceSMClient::quit-cancelled, The "quit-cancelled" signal +
XfceSMClient::quit-requested, The “quit-requested” signal
-
XfceSMClient::quit-requested, The "quit-requested" signal +
XfceSMClient::save-state, The “save-state” signal
-
XfceSMClient::save-state, The "save-state" signal +
XfceSMClient::save-state-extended, The “save-state-extended” signal
-
XfceSMClient::save-state-extended, The "save-state-extended" signal +
XfceSMClient:argc, The “argc” property
-
XfceSMClient:argc, The "argc" property +
XfceSMClient:argv, The “argv” property
-
XfceSMClient:argv, The "argv" property +
XfceSMClient:client-id, The “client-id” property
-
XfceSMClient:client-id, The "client-id" property +
XfceSMClient:current-directory, The “current-directory” property
-
XfceSMClient:current-directory, The "current-directory" property +
XfceSMClient:desktop-file, The “desktop-file” property
-
XfceSMClient:desktop-file, The "desktop-file" property +
XfceSMClient:priority, The “priority” property
-
XfceSMClient:priority, The "priority" property +
XfceSMClient:restart-command, The “restart-command” property
-
XfceSMClient:restart-command, The "restart-command" property +
XfceSMClient:restart-style, The “restart-style” property
-
XfceSMClient:restart-style, The "restart-style" property +
XfceSMClient:resumed, The “resumed” property
-
XfceSMClient:resumed, The "resumed" property +
XfceSmCLientErrorEnum, enum XfceSmCLientErrorEnum
XfceSMClientPriority, enum XfceSMClientPriority
-
XfceSMClientRestartStyle, enum XfceSMClientRestartStyle +
XfceSMClientRestartStyle, enum XfceSMClientRestartStyle
-
XfceSMClientShutdownHint, enum XfceSMClientShutdownHint +
XfceSMClientShutdownHint, enum XfceSMClientShutdownHint
-
XfceTitledDialog, XfceTitledDialog +
XfceTitledDialog, struct XfceTitledDialog
-
XfceTitledDialog:subtitle, The "subtitle" property +
XfceTitledDialog:subtitle, The “subtitle” property
XFCE_BUTTON_TYPE_MIXED, XFCE_BUTTON_TYPE_MIXED
XFCE_BUTTON_TYPE_PIXBUF, XFCE_BUTTON_TYPE_PIXBUF
-
xfce_dialog_confirm, xfce_dialog_confirm () +
xfce_dialog_confirm, xfce_dialog_confirm () +
+
xfce_dialog_show_error, xfce_dialog_show_error () +
+
xfce_dialog_show_help, xfce_dialog_show_help () +
+
xfce_dialog_show_help_with_version, xfce_dialog_show_help_with_version ()
-
xfce_dialog_show_error, xfce_dialog_show_error () +
xfce_dialog_show_info, xfce_dialog_show_info ()
-
xfce_dialog_show_info, xfce_dialog_show_info () +
xfce_dialog_show_warning, xfce_dialog_show_warning ()
-
xfce_dialog_show_warning, xfce_dialog_show_warning () +
xfce_gdk_screen_get_active, xfce_gdk_screen_get_active ()
-
xfce_gdk_screen_get_active, xfce_gdk_screen_get_active () +
xfce_gtk_button_new_mixed, xfce_gtk_button_new_mixed ()
-
xfce_gtk_button_new_mixed, xfce_gtk_button_new_mixed () +
xfce_gtk_frame_box_new, xfce_gtk_frame_box_new ()
-
xfce_gtk_frame_box_new, xfce_gtk_frame_box_new () +
xfce_gtk_frame_box_new_with_content, xfce_gtk_frame_box_new_with_content ()
-
xfce_gtk_frame_box_new_with_content, xfce_gtk_frame_box_new_with_content () +
xfce_gtk_window_center_on_active_screen, xfce_gtk_window_center_on_active_screen ()
-
xfce_gtk_window_center_on_active_screen, xfce_gtk_window_center_on_active_screen () +
xfce_message_dialog, xfce_message_dialog ()
-
xfce_message_dialog, xfce_message_dialog () +
xfce_message_dialog_new, xfce_message_dialog_new ()
-
xfce_message_dialog_new, xfce_message_dialog_new () +
xfce_message_dialog_new_valist, xfce_message_dialog_new_valist ()
-
xfce_message_dialog_new_valist, xfce_message_dialog_new_valist () +
xfce_sm_client_connect, xfce_sm_client_connect ()
-
xfce_sm_client_connect, xfce_sm_client_connect () +
xfce_sm_client_disconnect, xfce_sm_client_disconnect ()
-
xfce_sm_client_disconnect, xfce_sm_client_disconnect () +
XFCE_SM_CLIENT_ERROR, XFCE_SM_CLIENT_ERROR
-
xfce_sm_client_get, xfce_sm_client_get () +
xfce_sm_client_get, xfce_sm_client_get ()
-
xfce_sm_client_get_client_id, xfce_sm_client_get_client_id () +
xfce_sm_client_get_client_id, xfce_sm_client_get_client_id ()
-
xfce_sm_client_get_current_directory, xfce_sm_client_get_current_directory () +
xfce_sm_client_get_current_directory, xfce_sm_client_get_current_directory ()
-
xfce_sm_client_get_full, xfce_sm_client_get_full () +
xfce_sm_client_get_full, xfce_sm_client_get_full ()
-
xfce_sm_client_get_option_group, xfce_sm_client_get_option_group () +
xfce_sm_client_get_option_group, xfce_sm_client_get_option_group ()
-
xfce_sm_client_get_priority, xfce_sm_client_get_priority () +
xfce_sm_client_get_priority, xfce_sm_client_get_priority ()
-
xfce_sm_client_get_restart_command, xfce_sm_client_get_restart_command () +
xfce_sm_client_get_restart_command, xfce_sm_client_get_restart_command ()
-
xfce_sm_client_get_restart_style, xfce_sm_client_get_restart_style () +
xfce_sm_client_get_restart_style, xfce_sm_client_get_restart_style ()
-
xfce_sm_client_get_state_file, xfce_sm_client_get_state_file () +
xfce_sm_client_get_state_file, xfce_sm_client_get_state_file ()
-
xfce_sm_client_get_with_argv, xfce_sm_client_get_with_argv () +
xfce_sm_client_get_with_argv, xfce_sm_client_get_with_argv ()
-
xfce_sm_client_is_connected, xfce_sm_client_is_connected () +
xfce_sm_client_is_connected, xfce_sm_client_is_connected ()
-
xfce_sm_client_is_resumed, xfce_sm_client_is_resumed () +
xfce_sm_client_is_resumed, xfce_sm_client_is_resumed ()
-
xfce_sm_client_request_shutdown, xfce_sm_client_request_shutdown () +
xfce_sm_client_request_shutdown, xfce_sm_client_request_shutdown ()
-
xfce_sm_client_set_current_directory, xfce_sm_client_set_current_directory () +
xfce_sm_client_set_current_directory, xfce_sm_client_set_current_directory ()
-
xfce_sm_client_set_desktop_file, xfce_sm_client_set_desktop_file () +
xfce_sm_client_set_desktop_file, xfce_sm_client_set_desktop_file ()
-
xfce_sm_client_set_priority, xfce_sm_client_set_priority () +
xfce_sm_client_set_priority, xfce_sm_client_set_priority ()
-
xfce_sm_client_set_restart_command, xfce_sm_client_set_restart_command () +
xfce_sm_client_set_restart_command, xfce_sm_client_set_restart_command ()
-
xfce_sm_client_set_restart_style, xfce_sm_client_set_restart_style () +
xfce_sm_client_set_restart_style, xfce_sm_client_set_restart_style ()
-
xfce_spawn_command_line_on_screen, xfce_spawn_command_line_on_screen () +
xfce_spawn_command_line_on_screen, xfce_spawn_command_line_on_screen ()
-
xfce_spawn_on_screen, xfce_spawn_on_screen () +
xfce_spawn_on_screen, xfce_spawn_on_screen ()
-
xfce_spawn_on_screen_with_child_watch, xfce_spawn_on_screen_with_child_watch () +
xfce_spawn_on_screen_with_child_watch, xfce_spawn_on_screen_with_child_watch ()
-
xfce_titled_dialog_get_subtitle, xfce_titled_dialog_get_subtitle () +
xfce_titled_dialog_get_subtitle, xfce_titled_dialog_get_subtitle ()
-
xfce_titled_dialog_new, xfce_titled_dialog_new () +
xfce_titled_dialog_new, xfce_titled_dialog_new ()
-
xfce_titled_dialog_new_with_buttons, xfce_titled_dialog_new_with_buttons () +
xfce_titled_dialog_new_with_buttons, xfce_titled_dialog_new_with_buttons ()
-
xfce_titled_dialog_set_subtitle, xfce_titled_dialog_set_subtitle () +
xfce_titled_dialog_set_subtitle, xfce_titled_dialog_set_subtitle ()
@@ -174,6 +182,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/left-insensitive.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/left-insensitive.png differ Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/left.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/left.png differ diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui.devhelp2 libxfce4ui-4.12.1/docs/html/libxfce4ui.devhelp2 --- libxfce4ui-4.8.1/docs/html/libxfce4ui.devhelp2 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui.devhelp2 2015-03-15 18:15:03.000000000 +0000 @@ -21,86 +21,78 @@ - - - - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-extensions.html libxfce4ui-4.12.1/docs/html/libxfce4ui-extensions.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-extensions.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-extensions.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,34 +2,34 @@ -Part III. Xfce UI Extensions - +Libxfce4ui Reference Manual: Part III. Xfce UI Extensions + - + - - - - - - + + + + + +

Part III. Xfce UI Extensions

Table of Contents

-
+
Xfce Gdk(-pixbuf) extensions — Common used functions that are not provided by the Gdk or Gdk-pixbuf library.
-Xfce Gtk+ extensions — Common used functions for GtkWidget's that are not provided by +Xfce Gtk+ extensionsCommon used functions for GtkWidget's that are not provided by the Gtk+ library.
@@ -37,6 +37,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-fundamentals.html libxfce4ui-4.12.1/docs/html/libxfce4ui-fundamentals.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-fundamentals.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-fundamentals.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,29 +2,29 @@ -Part II. Xfce Fundamentals - +Libxfce4ui Reference Manual: Part II. Xfce Fundamentals + - + - - - - - - + + + + + +

Part II. Xfce Fundamentals

Table of Contents

-
+
Version Information — Variables and functions to check the Libxfce4ui version.
@@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-introduction.html libxfce4ui-4.12.1/docs/html/libxfce4ui-introduction.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-introduction.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-introduction.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,22 +2,22 @@ -Part I. Introduction - +Libxfce4ui Reference Manual: Part I. Introduction + - + - - - - - - + + + + + +

@@ -28,6 +28,6 @@

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-libxfce4ui-config.html libxfce4ui-4.12.1/docs/html/libxfce4ui-libxfce4ui-config.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-libxfce4ui-config.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-libxfce4ui-config.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,30 +2,26 @@ -Version Information - +Libxfce4ui Reference Manual: Version Information + - + - - - - - - - - - - + + + + + + +
@@ -33,26 +29,70 @@

Version Information

Version Information — Variables and functions to check the Libxfce4ui version.

- +
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-const gchar *       libxfce4ui_check_version            (guint required_major,
-                                                         guint required_minor,
-                                                         guint required_micro);
-extern const guint  libxfce4ui_major_version;
-extern const guint  libxfce4ui_minor_version;
-extern const guint  libxfce4ui_micro_version;
-
-#define             LIBXFCE4UI_MAJOR_VERSION
-#define             LIBXFCE4UI_MINOR_VERSION
-#define             LIBXFCE4UI_MICRO_VERSION
-#define             LIBXFCE4UI_CHECK_VERSION            (major,
-                                                         minor,
-                                                         micro)
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




const gchar *
+
+libxfce4ui_check_version ()
+
#defineLIBXFCE4UI_MAJOR_VERSION
#defineLIBXFCE4UI_MINOR_VERSION
#defineLIBXFCE4UI_MICRO_VERSION
#define
+LIBXFCE4UI_CHECK_VERSION()
+

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




extern const guint libxfce4ui_major_version
extern const guint libxfce4ui_minor_version
extern const guint libxfce4ui_micro_version

+

+

+
Includes

+
#include <libxfce4ui/libxfce4ui.h>
 

 

 

@@ -64,25 +104,22 @@
 

 

 

-
Details

+
Functions

 

-
libxfce4ui_check_version ()

-
const gchar *       libxfce4ui_check_version            (guint required_major,
-                                                         guint required_minor,
-                                                         guint required_micro);

-

-Checks that the libxfce4ui library
+
libxfce4ui_check_version ()

+
const gchar *
+libxfce4ui_check_version (guint required_major,
+                          guint required_minor,
+                          guint required_micro);

+
Checks that the libxfce4ui library
 in use is compatible with the given version. Generally you would pass in
 the constants LIBXFCE4UI_MAJOR_VERSION, LIBXFCE4UI_MINOR_VERSION and
 LIBXFCE4UI_MICRO_VERSION as the three arguments to this function; that produces
-a check that the library in use is compatible with the version of
+a check that the library in use is compatible with the version of

 libxfce4ui the extension was
-compiled against.
-

-

-

+
compiled against.

 

-
Example 1. Checking the runtime version of the Libxfce4ui library

+
Example 1. Checking the runtime version of the Libxfce4ui library

 
 const gchar *mismatch;
 mismatch = libxfce4ui_check_version (LIBXFCE4UI_MAJOR_VERSION,
@@ -92,81 +129,41 @@
   g_error ("Version mismatch: %s", mismatch);
 

 

-


-

-

-+

+
Parameters

+



+++++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+





 
 
required_major :
the required major version.
required_minor :
the required minor version.
required_major
the required major version.
 
 

 
required_micro :
the required micro version.
required_minor
the required minor version.
 
 

 
Returns :

-NULL if the library is compatible with the given version,
-or a string describing the version mismatch. The returned
-string is owned by the library and must not be freed or
-modified by the caller.
required_micro
the required micro version.
 
 

 
 

 

-

-

-
libxfce4ui_major_version

-
extern const guint libxfce4ui_major_version;
-

-

-The major version number of the Libxfce4ui library (e.g. in version
-1.2.3 this is 1).
-

-

-This variable is in the library, so represents the Libxfce4ui library
-you have linked against. Contrast with the LIBXFCE4UI_MAJOR_VERSION
-macro, which represents the major version of the Libxfce4ui headers
-you have included.
-

-

-

-

-
libxfce4ui_minor_version

-
extern const guint libxfce4ui_minor_version;
-

-

-The minor version number of the Libxfce4ui library (e.g. in version
-1.2.3 this is 2).
-

-

-This variable is in the library, so represents the Libxfce4ui library
-you have linked against. Contrast with the LIBXFCE4UI_MINOR_VERSION
-macro, which represents the minor version of the Libxfce4ui headers
-you have included.
-

+

+
Returns

+
 NULL if the library is compatible with the given version,
+or a string describing the version mismatch. The returned
+string is owned by the library and must not be freed or
+modified by the caller.

+

 

-

-

-
libxfce4ui_micro_version

-
extern const guint libxfce4ui_micro_version;
-

-

-The micro version number of the Libxfce4ui library (e.g. in version
-1.2.3 this is 3).
-

-

-This variable is in the library, so represents the Libxfce4ui library
-you have linked against. Contrast with the LIBXFCE4UI_MICRO_VERSION
-macro, which represents the micro version of the Libxfce4ui headers
-you have included.
-

 

 

 

@@ -182,7 +179,7 @@
 

 

 
LIBXFCE4UI_MINOR_VERSION

-
#define LIBXFCE4UI_MINOR_VERSION (8)
+
#define LIBXFCE4UI_MINOR_VERSION (12)
 

 

 Like libxfce4ui_minor_version, but from the headers used at
@@ -206,31 +203,91 @@
 
LIBXFCE4UI_CHECK_VERSION()

 
#define             LIBXFCE4UI_CHECK_VERSION(major,minor,micro)

 

-Returns TRUE if the version of the Libxfce4ui header files is the same
+Returns TRUE if the version of the Libxfce4ui header files is the same
 as or newer than the passed-in version.
 

-

-+

+
Parameters

+



+++++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+





 
 
major :
major version (e.g. 1 for version 1.2.3)
major
major version (e.g. 1 for version 1.2.3)
 
 

 
minor :
minor version (e.g. 2 for version 1.2.3)
minor
minor version (e.g. 2 for version 1.2.3)
 
 

 
micro :
micro version (e.g. 3 for version 1.2.3)
micro
micro version (e.g. 3 for version 1.2.3)
 
 

 
 

 

 

 

+

+
Types and Values

+

+
libxfce4ui_major_version

+
extern const guint libxfce4ui_major_version;
+

+

+The major version number of the Libxfce4ui library (e.g. in version
+1.2.3 this is 1).
+

+

+This variable is in the library, so represents the Libxfce4ui library
+you have linked against. Contrast with the LIBXFCE4UI_MAJOR_VERSION
+macro, which represents the major version of the Libxfce4ui headers
+you have included.
+

+

+

+

+
libxfce4ui_minor_version

+
extern const guint libxfce4ui_minor_version;
+

+

+The minor version number of the Libxfce4ui library (e.g. in version
+1.2.3 this is 2).
+

+

+This variable is in the library, so represents the Libxfce4ui library
+you have linked against. Contrast with the LIBXFCE4UI_MINOR_VERSION
+macro, which represents the minor version of the Libxfce4ui headers
+you have included.
+

+

+

+

+
libxfce4ui_micro_version

+
extern const guint libxfce4ui_micro_version;
+

+

+The micro version number of the Libxfce4ui library (e.g. in version
+1.2.3 this is 3).
+

+

+This variable is in the library, so represents the Libxfce4ui library
+you have linked against. Contrast with the LIBXFCE4UI_MICRO_VERSION
+macro, which represents the micro version of the Libxfce4ui headers
+you have included.
+

+

+

+

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-sm.html libxfce4ui-4.12.1/docs/html/libxfce4ui-sm.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-sm.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-sm.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,35 +2,35 @@ -Part V. Xfce Session Management Support - +Libxfce4ui Reference Manual: Part V. Xfce Session Management Support + - + - - - - - - + + + + + +

Part V. Xfce Session Management Support

Table of Contents

-
+
XfceSMClient — Session management client
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-widgets.html libxfce4ui-4.12.1/docs/html/libxfce4ui-widgets.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-widgets.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-widgets.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,40 +2,40 @@ -Part IV. Xfce UI Widget - +Libxfce4ui Reference Manual: Part IV. Xfce UI Widget + - + - - - - - - + + + + + +

Part IV. Xfce UI Widget

Table of Contents

-
+
Xfce Dialogs — Common used dialogs to interact with the user.
-Xfce Titled Dialog — A GtkDialog with heading. +Xfce Titled DialogA GtkDialog with heading.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-dialogs.html libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-dialogs.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-dialogs.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-dialogs.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,30 +2,26 @@ -Xfce Dialogs - +Libxfce4ui Reference Manual: Xfce Dialogs + - + - - - - - - - - - - + + + + + + +
@@ -33,101 +29,162 @@

Xfce Dialogs

Xfce Dialogs — Common used dialogs to interact with the user.

- +
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-GtkWidget *         xfce_message_dialog_new             (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         ...);
-GtkWidget *         xfce_message_dialog_new_valist      (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *icon_stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         va_list args);
-gint                xfce_message_dialog                 (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         ...);
-void                xfce_dialog_show_info               (GtkWindow *parent,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-void                xfce_dialog_show_warning            (GtkWindow *parent,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-void                xfce_dialog_show_error              (GtkWindow *parent,
-                                                         const GError *error,
-                                                         const gchar *primary_format,
-                                                         ...);
-gboolean            xfce_dialog_confirm                 (GtkWindow *parent,
-                                                         const gchar *stock_id,
-                                                         const gchar *confirm_label,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-
-#define             XFCE_BUTTON_TYPE_MIXED
-#define             XFCE_BUTTON_TYPE_PIXBUF
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GtkWidget *
+
+xfce_message_dialog_new ()
+

+GtkWidget *
+
+xfce_message_dialog_new_valist ()
+

+gint
+
+xfce_message_dialog ()
+

+void
+
+xfce_dialog_show_help ()
+

+void
+
+xfce_dialog_show_help_with_version ()
+

+void
+
+xfce_dialog_show_info ()
+

+void
+
+xfce_dialog_show_warning ()
+

+void
+
+xfce_dialog_show_error ()
+

+gboolean
+
+xfce_dialog_confirm ()
+

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+




#defineXFCE_BUTTON_TYPE_MIXED
#defineXFCE_BUTTON_TYPE_PIXBUF

+

+

+
Includes

+
#include <libxfce4ui/libxfce4ui.h>
 

 

 

 
Description

 

 Useful convientent function to interact with the user using a
-GtkMessageDialog.
+GtkMessageDialog.
 

 

 

-
Details

+
Functions

 

-
xfce_message_dialog_new ()

-
GtkWidget *         xfce_message_dialog_new             (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         ...);

-

-xfce_message_dialog_new() allows you to easily create Gtk+ message dialogs.
+
xfce_message_dialog_new ()

+
GtkWidget *
+xfce_message_dialog_new (GtkWindow *parent,
+                         const gchar *title,
+                         const gchar *stock_id,
+                         const gchar *primary_text,
+                         const gchar *secondary_text,
+                         const gchar *first_button_text,
+                         ...);

+
xfce_message_dialog_new() allows you to easily create Gtk+ message dialogs.
 It accepts GTK+ stock buttons, mixed buttons (using XFCE_BUTTON_TYPE_MIXED)
-or buttons with a GdkPixbuf (using XFCE_BUTTON_TYPE_PIXBUF).
-

-

-The buttons are defined by first_button_text and the next arguments in the
-following format type, param1[, param2, param3].
-

-

-

-

+or buttons with a GdkPixbuf (using XFCE_BUTTON_TYPE_PIXBUF).

+
The buttons are defined by first_button_text
+ and the next arguments in the
+following format type
+, param1
+[, param2
+, param3
+].

+

+++
@@ -142,16 +199,10 @@
 

 


 
 

 
XFCE_BUTTON_TYPE_MIXED

 

         This allows you to easily create mixed buttons in a dialog.
         param1 is used for the stock_id, param2 for the label and
-        param3 for the response_id. See also xfce_gtk_button_new_mixed().
+        param3 for the response_id. See also xfce_gtk_button_new_mixed().
       

 

 

 
XFCE_BUTTON_TYPE_PIXBUF

 

-        Creates a button with the GdkPixbuf as button icon.
+        Creates a button with the GdkPixbuf as button icon.
         param1 is the GdkPixuf, param2 for the label and
         param3 for the response_id.
       

 
 

-

-

-

-To clarify this behaviour see the example below. We create a dialog with
-two stock buttons, a GdkPixbuf button and a mixed button.
-

-

-

+
To clarify this behaviour see the example below. We create a dialog with
+two stock buttons, a GdkPixbuf button and a mixed button.

 

-
Example 2. Creating a Xfce Message Dialog

+
Example 2. Creating a Xfce Message Dialog

 
 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 24, 24);
 
@@ -168,309 +219,388 @@
 g_object_unref (G_OBJECT (pixbuf));
 

 

-


-

-

-+

+
Parameters

+



+++++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+





 
 
parent :
transient parent of the dialog, or NULL.
title :
title of the dialog, or NULL.
parent
transient parent of the dialog, or NULL.
 
 

 
stock_id :
gtk stock icon name to show in the dialog.
title
title of the dialog, or NULL.
 
 

 
primary_text :
primary text shown in large bold font.
stock_id
gtk stock icon name to show in the dialog.
 
 

 
secondary_text :
secondary text shown in normal font.
primary_text
primary text shown in large bold font.
 
 

 
first_button_text :
text for the first button.
secondary_text
secondary text shown in normal font.
 
 

 
... :

-NULL terminated list of parameters.
Returns :
A new GtkMessageDialog.
first_button_text
text for the first button.
 
 

 
 

 

+

+
Returns

+
 A new GtkMessageDialog.

+

+

+

 

 

-
xfce_message_dialog_new_valist ()

-
GtkWidget *         xfce_message_dialog_new_valist      (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *icon_stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         va_list args);

-

-See xfce_message_dialog_new(), this version takes a va_list for
-language bindings to use.
-

-

-+
xfce_message_dialog_new_valist ()

+
GtkWidget *
+xfce_message_dialog_new_valist (GtkWindow *parent,
+                                const gchar *title,
+                                const gchar *icon_stock_id,
+                                const gchar *primary_text,
+                                const gchar *secondary_text,
+                                const gchar *first_button_text,
+                                va_list args);

+
See xfce_message_dialog_new(), this version takes a va_list for
+language bindings to use.

+

+
Parameters

+



+++++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+





 
 
parent :
transient parent of the dialog, or NULL.
title :
title of the dialog, or NULL.
parent
transient parent of the dialog, or NULL.
 
 

 
icon_stock_id :
gtk stock icon name to show in the dialog.
title
title of the dialog, or NULL.
 
 

 
primary_text :
primary text shown in large bold font.
icon_stock_id
gtk stock icon name to show in the dialog.
 
 

 
secondary_text :
secondary text shown in normal font.
primary_text
primary text shown in large bold font.
 
 

 
first_button_text :
text for the first button.
secondary_text
secondary text shown in normal font.
 
 

 
args :
argument list.
first_button_text
text for the first button.
 
 

 
Returns :
A new GtkMessageDialog.
args
argument list.
 
 

 
 

 

+

+
Returns

+
 A new GtkMessageDialog.

+

+

+
-

xfce_message_dialog ()

-
gint                xfce_message_dialog                 (GtkWindow *parent,
-                                                         const gchar *title,
-                                                         const gchar *stock_id,
-                                                         const gchar *primary_text,
-                                                         const gchar *secondary_text,
-                                                         const gchar *first_button_text,
-                                                         ...);
-

-Create a new dialog as in xfce_message_dialog_new(), then runs the -dialog using gtk_dialog_run and return the response id selected by the user. -

-

-See xfce_message_dialog_new() for more information. -

-
-+

xfce_message_dialog ()

+
gint
+xfce_message_dialog (GtkWindow *parent,
+                     const gchar *title,
+                     const gchar *stock_id,
+                     const gchar *primary_text,
+                     const gchar *secondary_text,
+                     const gchar *first_button_text,
+                     ...);
+

Create a new dialog as in xfce_message_dialog_new(), then runs the +dialog using gtk_dialog_run and return the response id selected by the user.

+

See xfce_message_dialog_new() for more information.

+
+

Parameters

+
+++++ - - - - - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

parent :

transient parent of the dialog, or NULL.

title :

title of the dialog, or NULL.

stock_id :

gtk stock icon name to show in the dialog.

parent

transient parent of the dialog, or NULL.

 

primary_text :

primary text shown in large bold font.

title

title of the dialog, or NULL.

 

secondary_text :

secondary text shown in normal font.

stock_id

gtk stock icon name to show in the dialog.

 

first_button_text :

text for the first button.

primary_text

primary text shown in large bold font.

 

... :

 -NULL ended list of parameters.

secondary_text

secondary text shown in normal font.

 

Returns :

the selected response id.

first_button_text

text for the first button.

 
+
+

Returns

+

the selected response id.

+

+
+
-

xfce_dialog_show_info ()

-
void                xfce_dialog_show_info               (GtkWindow *parent,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-

-Displays an information dialog on parent using the primary_format as message. -

-
-+

xfce_dialog_show_help ()

+
void
+xfce_dialog_show_help (GtkWindow *parent,
+                       const gchar *application,
+                       const gchar *page,
+                       const gchar *offset);
+ +
+
+

xfce_dialog_show_help_with_version ()

+
void
+xfce_dialog_show_help_with_version (GtkWindow *parent,
+                                    const gchar *application,
+                                    const gchar *page,
+                                    const gchar *offset,
+                                    const gchar *version);
+
+
+
+

xfce_dialog_show_info ()

+
void
+xfce_dialog_show_info (GtkWindow *parent,
+                       const gchar *secondary_text,
+                       const gchar *primary_format,
+                       ...);
+

Displays an information dialog on parent + using the primary_format + as message.

+
+

Parameters

+
+++++ - - - - - - + + + - - + + + - - + + +

parent :

transient parent of the dialog, or NULL.

secondary_text :

secondary text of the dialog or NULL.

parent

transient parent of the dialog, or NULL.

 

primary_format :

the printf()-style format for the primary problem description.

secondary_text

secondary text of the dialog or NULL.

 

... :

argument list for the format.

primary_format

the printf()-style format for the primary problem description.

 
+
-

xfce_dialog_show_warning ()

-
void                xfce_dialog_show_warning            (GtkWindow *parent,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-

-Displays a warning dialog on parent using the primary_format as message. -

-
-+

xfce_dialog_show_warning ()

+
void
+xfce_dialog_show_warning (GtkWindow *parent,
+                          const gchar *secondary_text,
+                          const gchar *primary_format,
+                          ...);
+

Displays a warning dialog on parent + using the primary_format + as message.

+
+

Parameters

+
+++++ - - - - - - + + + - - + + + - - + + +

parent :

transient parent of the dialog, or NULL.

secondary_text :

secondary text of the dialog or NULL.

parent

transient parent of the dialog, or NULL.

 

primary_format :

the printf()-style format for the primary problem description.

secondary_text

secondary text of the dialog or NULL.

 

... :

argument list for the format.

primary_format

the printf()-style format for the primary problem description.

 
+
-

xfce_dialog_show_error ()

-
void                xfce_dialog_show_error              (GtkWindow *parent,
-                                                         const GError *error,
-                                                         const gchar *primary_format,
-                                                         ...);
-

-Displays an error dialog on parent using the primary_format as primary message and optionally -displaying error as secondary error text. -

-
-+

xfce_dialog_show_error ()

+
void
+xfce_dialog_show_error (GtkWindow *parent,
+                        const GError *error,
+                        const gchar *primary_format,
+                        ...);
+

Displays an error dialog on parent + using the primary_format + as primary message and optionally +displaying error + as secondary error text.

+
+

Parameters

+
+++++ - - - - - - + + + - - + + + - - + + +

parent :

transient parent of the dialog, or NULL.

error :

a GError, which gives a more precise description of the problem or NULL.

parent

transient parent of the dialog, or NULL.

 

primary_format :

the printf()-style format for the primary problem description.

error

a GError, which gives a more precise description of the problem or NULL.

 

... :

argument list for the primary_format.

primary_format

the printf()-style format for the primary problem description.

 
+
-

xfce_dialog_confirm ()

-
gboolean            xfce_dialog_confirm                 (GtkWindow *parent,
-                                                         const gchar *stock_id,
-                                                         const gchar *confirm_label,
-                                                         const gchar *secondary_text,
-                                                         const gchar *primary_format,
-                                                         ...);
-

-Runs a questions dialog, that has a 'Cancel' and a 'Confirm' button. The 'Confirm' -button text can be set by action if given. -

-

-If stock_id is equal to GTK_STOCK_YES, the 'Cancel' button becomes a 'No' button. -

-
-+

xfce_dialog_confirm ()

+
gboolean
+xfce_dialog_confirm (GtkWindow *parent,
+                     const gchar *stock_id,
+                     const gchar *confirm_label,
+                     const gchar *secondary_text,
+                     const gchar *primary_format,
+                     ...);
+

Runs a questions dialog, that has a 'Cancel' and a 'Confirm' button. The 'Confirm' +button text can be set by action + if given.

+

If stock_id + is equal to GTK_STOCK_YES, the 'Cancel' button becomes a 'No' button.

+
+

Parameters

+
+++++ - - - - - - - - - - + + + - - + + + - - + + + - - + + + - - + + +

parent :

transient parent of the dialog, or NULL.

stock_id :

the stock name of the confirm button, for example GTK_STOCK_YES or GTK_STOCK_CLEAR.

confirm_label :

if non-NULL, this text is used on the confirm button together with the stock_id icon.

parent

transient parent of the dialog, or NULL.

 

secondary_text :

secondary text in the dialog.

stock_id

the stock name of the confirm button, for example GTK_STOCK_YES or GTK_STOCK_CLEAR.

 

primary_format :

the printf()-style format for the dialog question.

confirm_label

if non-NULL, this text is used on the confirm button together with the stock_id +icon.

 

... :

argument list for the primary_format.

secondary_text

secondary text in the dialog.

 

Returns :

TRUE if the user confirms, else FALSE.

primary_format

the printf()-style format for the dialog question.

 
-
+
+

Returns

+

TRUE if the user confirms, else FALSE.

+

+
+ + +
+

Types and Values

XFCE_BUTTON_TYPE_MIXED

#define XFCE_BUTTON_TYPE_MIXED  "button-mixed"

-Used to define a mixed button in xfce_message_dialog_new() and +Used to define a mixed button in xfce_message_dialog_new() and xfce_message_dialog_run().

@@ -480,7 +610,7 @@ 
#define XFCE_BUTTON_TYPE_PIXBUF "button-pixbuf"

-Used to define a GdkPixuf button in xfce_message_dialog_new() and +Used to define a GdkPixuf button in xfce_message_dialog_new() and xfce_message_dialog_run().

@@ -488,6 +618,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-gdk-extensions.html libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-gdk-extensions.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-gdk-extensions.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-gdk-extensions.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,30 +2,26 @@ -Xfce Gdk(-pixbuf) extensions - +Libxfce4ui Reference Manual: Xfce Gdk(-pixbuf) extensions + - + - - - - - - - - - - + + + + + + +
@@ -33,14 +29,28 @@

Xfce Gdk(-pixbuf) extensions

Xfce Gdk(-pixbuf) extensions — Common used functions that are not provided by the Gdk or Gdk-pixbuf library.

- +
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-GdkScreen *         xfce_gdk_screen_get_active          (gint *monitor_return);
+

+
Functions

+

++++
+
+
+
+
+





+GdkScreen *
+
+xfce_gdk_screen_get_active ()
+

+

+

+
Includes

+
#include <libxfce4ui/libxfce4ui.h>
 

 

 

@@ -52,33 +62,42 @@
 

 

 

-
Details

+
Functions

 

-
xfce_gdk_screen_get_active ()

-
GdkScreen *         xfce_gdk_screen_get_active          (gint *monitor_return);

-

-Returns the currently active GdkScreen, that is, the screen which
+
xfce_gdk_screen_get_active ()

+
GdkScreen *
+xfce_gdk_screen_get_active (gint *monitor_return);

+
Returns the currently active GdkScreen, that is, the screen which
 currently contains the pointer. If no active screen was found, the
-default GdkScreen is returned.
-

-

--
-
-
-
-
-
-
-
-
-
+default GdkScreen is returned.

+

+
Parameters

+


monitor_return :
Address to store the monitor number to or NULL.
Returns :
the currently active GdkScreen.

+++++
+
+
+
+
+





monitor_return
Address to store the monitor number to or NULL.
 

 

 

+

+
Returns

+
 the currently active GdkScreen.

+

+

+

+
+
+

Types and Values

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-gtk-extensions.html libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-gtk-extensions.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-gtk-extensions.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-gtk-extensions.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,53 +2,82 @@ -Xfce Gtk+ extensions - +Libxfce4ui Reference Manual: Xfce Gtk+ extensions + - + - - - - - - - - - - + + + + + + +
- +

Xfce Gtk+ extensions

-

Xfce Gtk+ extensions — Common used functions for GtkWidget's that are not provided by +

Xfce Gtk+ extensions — Common used functions for GtkWidget's that are not provided by the Gtk+ library.
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-GtkWidget *         xfce_gtk_button_new_mixed           (const gchar *stock_id,
-                                                         const gchar *label);
-GtkWidget *         xfce_gtk_frame_box_new              (const gchar *label,
-                                                         GtkWidget **container_return);
-GtkWidget *         xfce_gtk_frame_box_new_with_content (const gchar *label,
-                                                         GtkWidget *content);
-void                xfce_gtk_window_center_on_active_screen
-                                                        (GtkWindow *window);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GtkWidget *
+
+xfce_gtk_button_new_mixed ()
+

+GtkWidget *
+
+xfce_gtk_frame_box_new ()
+

+GtkWidget *
+
+xfce_gtk_frame_box_new_with_content ()
+

+void
+
+xfce_gtk_window_center_on_active_screen ()
+

+

+

+
Includes

+
#include <libxfce4ui/libxfce4ui.h>
 

 

 

@@ -60,128 +89,164 @@
 

 

 

-
Details

+
Functions

 

-
xfce_gtk_button_new_mixed ()

-
GtkWidget *         xfce_gtk_button_new_mixed           (const gchar *stock_id,
-                                                         const gchar *label);

-

-Creates a new GtkButton containing a mnemonic label and a stock icon.
-The stock_id could be something like GTK_STOCK_OK or GTK_STOCK_APPLY.
-

-

-When the stock_id is NULL a normal mnemonic button will be created,
-when label is NULL a stock button will be created. This behaviour
-is added for xfce_message_dialog_new().
-

-

-+
xfce_gtk_button_new_mixed ()

+
GtkWidget *
+xfce_gtk_button_new_mixed (const gchar *stock_id,
+                           const gchar *label);

+
Creates a new GtkButton containing a mnemonic label and a stock icon.
+The stock_id
+ could be something like GTK_STOCK_OK or GTK_STOCK_APPLY.

+
When the stock_id
+ is NULL a normal mnemonic button will be created,
+when label
+ is NULL a stock button will be created. This behaviour
+is added for xfce_message_dialog_new().

+

+
Parameters

+



+++++
-
-
+
+
+
-
-
-
-
-
-
+
+
+





 
 
stock_id :
the name of the stock item.
stock_id
the name of the stock item.
 
 

 
label :
the text of the button, with an underscore in front of
-the mnemonic character.
Returns :
the newly created GtkButton widget.
label
the text of the button, with an underscore in front of
+the mnemonic character.
 
 

 
 

 

+

+
Returns

+
 the newly created GtkButton widget.

+

+

+

 

 

-
xfce_gtk_frame_box_new ()

-
GtkWidget *         xfce_gtk_frame_box_new              (const gchar *label,
-                                                         GtkWidget **container_return);

-

-Creates an Xfce-styled frame. The frame is a GtkFrame, without
+
xfce_gtk_frame_box_new ()

+
GtkWidget *
+xfce_gtk_frame_box_new (const gchar *label,
+                        GtkWidget **container_return);

+
Creates an Xfce-styled frame. The frame is a GtkFrame, without
 outline and an optional bolded text label.  The contents of the
 frame are indented on the left.
-The return value is the GtkFrame itself.  The container_return is
-a GtkAlignment widget to which children of the frame should be added.
-

-

-See also: xfce_gtk_frame_box_new_with_content().
-

-

-+The return value is the GtkFrame itself.  The container_return
+ is
+a GtkAlignment widget to which children of the frame should be added.

+
See also: xfce_gtk_frame_box_new_with_content().

+

+
Parameters

+



+++++
-
-
-
-
-
-
+
+
+
-
-
+
+
+





 
 
label :
the text to use as the label of the frame.
container_return :
return location for the frame's container.
label
the text to use as the label of the frame.
 
 

 
Returns :
the newly created GtkFrame widget.
container_return
return location for the frame's container.
 
 

 
 

 

+

+
Returns

+
 the newly created GtkFrame widget.

+

+

+
-

xfce_gtk_frame_box_new_with_content ()

-
GtkWidget *         xfce_gtk_frame_box_new_with_content (const gchar *label,
-                                                         GtkWidget *content);
-

-Creates a widget with xfce_gtk_frame_box_new() and adds the -content GtkWidget to the frame. -

-
-+

xfce_gtk_frame_box_new_with_content ()

+
GtkWidget *
+xfce_gtk_frame_box_new_with_content (const gchar *label,
+                                     GtkWidget *content);
+

Creates a widget with xfce_gtk_frame_box_new() and adds the +content + GtkWidget to the frame.

+
+

Parameters

+
+++++ - - + + + - - - - - - + + +

label :

the text to use as the label of the frame.

label

the text to use as the label of the frame.

 

content :

the GtkWidget to put inside the frame.

Returns :

the newly created GtkFrame widget.

content

the GtkWidget to put inside the frame.

 
+
+

Returns

+

the newly created GtkFrame widget.

+

+
+
-

xfce_gtk_window_center_on_active_screen ()

-
void                xfce_gtk_window_center_on_active_screen
-                                                        (GtkWindow *window);
-

-Determines the screen that contains the pointer and centers the -window on it. If it failes to determine the current pointer position, -window is centered on the default screen. -

-

-This function only works properly if you call it before realizing the -window and you haven't set a fixed window position using gtk_window_move(). -

-

-See also: xfce_gdk_screen_get_active(). -

-
-+

xfce_gtk_window_center_on_active_screen ()

+
void
+xfce_gtk_window_center_on_active_screen
+                               (GtkWindow *window);
+

Determines the screen that contains the pointer and centers the +window + on it. If it failes to determine the current pointer position, +window + is centered on the default screen.

+

This function only works properly if you call it before realizing the +window and you haven't set a fixed window position using gtk_window_move().

+

See also: xfce_gdk_screen_get_active().

+
+

Parameters

+
+++++ - - + + +

window :

the GtkWindow to center.

window

the GtkWindow to center.

 
+
+

Types and Values

+
+
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-spawn.html libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-spawn.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-spawn.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-spawn.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,30 +2,26 @@ -Xfce Spawn - +Libxfce4ui Reference Manual: Xfce Spawn + - + - - - - - - - - - - + + + + + + +
@@ -33,38 +29,46 @@

Xfce Spawn

Xfce Spawn — Functions to spawn a command with startup notification support.

- +
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-gboolean            xfce_spawn_on_screen_with_child_watch
-                                                        (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         gboolean startup_notify,
-                                                         guint32 startup_timestamp,
-                                                         const gchar *startup_icon_name,
-                                                         GClosure *child_watch_closure,
-                                                         GError **error);
-gboolean            xfce_spawn_on_screen                (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         gboolean startup_notify,
-                                                         guint32 startup_timestamp,
-                                                         const gchar *startup_icon_name,
-                                                         GError **error);
-gboolean            xfce_spawn_command_line_on_screen   (GdkScreen *screen,
-                                                         const gchar *command_line,
-                                                         gboolean in_terminal,
-                                                         gboolean startup_notify,
-                                                         GError **error);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+gboolean
+
+xfce_spawn_on_screen_with_child_watch ()
+

+gboolean
+
+xfce_spawn_on_screen ()
+

+gboolean
+
+xfce_spawn_command_line_on_screen ()
+

+

+

+
Includes

+
#include <libxfce4ui/libxfce4ui.h>
 

 

 

@@ -75,145 +79,184 @@
 

 

 

-
Details

+
Functions

 

-
xfce_spawn_on_screen_with_child_watch ()

-
gboolean            xfce_spawn_on_screen_with_child_watch
-                                                        (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         gboolean startup_notify,
-                                                         guint32 startup_timestamp,
-                                                         const gchar *startup_icon_name,
-                                                         GClosure *child_watch_closure,
-                                                         GError **error);

+
xfce_spawn_on_screen_with_child_watch ()

+
gboolean
+xfce_spawn_on_screen_with_child_watch (GdkScreen *screen,
+                                       const gchar *working_directory,
+                                       gchar **argv,
+                                       gchar **envp,
+                                       GSpawnFlags flags,
+                                       gboolean startup_notify,
+                                       guint32 startup_timestamp,
+                                       const gchar *startup_icon_name,
+                                       GClosure *child_watch_closure,
+                                       GError **error);

 

 

+

+
Returns

+

+

 

 

 

-
xfce_spawn_on_screen ()

-
gboolean            xfce_spawn_on_screen                (GdkScreen *screen,
-                                                         const gchar *working_directory,
-                                                         gchar **argv,
-                                                         gchar **envp,
-                                                         GSpawnFlags flags,
-                                                         gboolean startup_notify,
-                                                         guint32 startup_timestamp,
-                                                         const gchar *startup_icon_name,
-                                                         GError **error);

-

-Like gdk_spawn_on_screen(), but also supports startup notification
-(if Libxfce4ui was built with startup notification support).
-

-

-+
xfce_spawn_on_screen ()

+
gboolean
+xfce_spawn_on_screen (GdkScreen *screen,
+                      const gchar *working_directory,
+                      gchar **argv,
+                      gchar **envp,
+                      GSpawnFlags flags,
+                      gboolean startup_notify,
+                      guint32 startup_timestamp,
+                      const gchar *startup_icon_name,
+                      GError **error);

+
Like gdk_spawn_on_screen(), but also supports startup notification
+(if Libxfce4ui was built with startup notification support).

+

+
Parameters

+



+++++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+gtk_get_current_event_time() or if nothing is
+available 0 is valid too.

+
-
-
+
+
+
-
-
-
-
-
-
+
+
+





 
 
screen :
a GdkScreen or NULL to use the active screen,
-see xfce_gdk_screen_get_active().
screen
a GdkScreen or NULL to use the active screen,
+see xfce_gdk_screen_get_active().
 
 

 
working_directory :
child's current working directory or NULL to
-inherit parent's.
working_directory
child's current working directory or NULL to
+inherit parent's.
 
 

 
argv :
child's argument vector.
argv
child's argument vector.
 
 

 
envp :
child's environment vector or NULL to inherit
-parent's.
envp
child's environment vector or NULL to inherit
+parent's.
 
 

 
flags :
flags from GSpawnFlags. G_SPAWN_DO_NOT_REAP_CHILD
-is not allowed, use xfce_spawn_on_screen_with_child_watch()
-if you want a child watch.
flags
flags from GSpawnFlags. G_SPAWN_DO_NOT_REAP_CHILD
+is not allowed, use xfce_spawn_on_screen_with_child_watch()
+if you want a child watch.
 
 

 
startup_notify :
whether to use startup notification.
startup_notify
whether to use startup notification.
 
 

 
startup_timestamp :
the timestamp to pass to startup notification, use
+
startup_timestamp
the timestamp to pass to startup notification, use
 the event time here if possible to make focus
 stealing prevention work property. If you don't
 have direct access to the event time you could use
-gtk_get_current_event_time() or if nothing is
-available 0 is valid too.
 
 

 
startup_icon_name :
application icon or NULL.
startup_icon_name
application icon or NULL.
 
 

 
error :
return location for errors or NULL.
Returns :

-TRUE on success, FALSE if error is set.
error
return location for errors or NULL.
 
 

 
 

 

+

+
Returns

+
 TRUE on success, FALSE if error
+is set.

+

+

+

 

 

-
xfce_spawn_command_line_on_screen ()

-
gboolean            xfce_spawn_command_line_on_screen   (GdkScreen *screen,
-                                                         const gchar *command_line,
-                                                         gboolean in_terminal,
-                                                         gboolean startup_notify,
-                                                         GError **error);

-

-Executes the given command_line and returns TRUE if the
-command terminated successfully. Else, the error is set
-to the standard error output.
-

-

-+
xfce_spawn_command_line_on_screen ()

+
gboolean
+xfce_spawn_command_line_on_screen (GdkScreen *screen,
+                                   const gchar *command_line,
+                                   gboolean in_terminal,
+                                   gboolean startup_notify,
+                                   GError **error);

+
Executes the given command_line
+ and returns TRUE if the
+command terminated successfully. Else, the error
+ is set
+to the standard error output.

+

+
Parameters

+



+++++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+





 
 
screen :
a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().
command_line :
command line to run.
screen
a GdkScreen or NULL to use the active screen, see xfce_gdk_screen_get_active().
 
 

 
in_terminal :
whether to run command_line in a terminal.
command_line
command line to run.
 
 

 
startup_notify :
whether to use startup notification.
in_terminal
whether to run command_line
+in a terminal.
 
 

 
error :
location for a GError or NULL.
startup_notify
whether to use startup notification.
 
 

 
Returns :

-TRUE if the command_line was executed
-successfully, FALSE if error is set.
error
location for a GError or NULL.
 
 

 
 

 

+

+
Returns

+
 TRUE if the command_line
+was executed
+successfully, FALSE if error
+is set.

+

+

+
+
+
+

Types and Values

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-titled-dialog.html libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-titled-dialog.html --- libxfce4ui-4.8.1/docs/html/libxfce4ui-xfce-titled-dialog.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/libxfce4ui-xfce-titled-dialog.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,232 +2,304 @@ -Xfce Titled Dialog - +Libxfce4ui Reference Manual: Xfce Titled Dialog + - + - - - - - - - - - - + + + + + + +
- +

Xfce Titled Dialog

-

Xfce Titled Dialog — A GtkDialog with heading.

+

Xfce Titled Dialog — A GtkDialog with heading.
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-                    XfceTitledDialog;
-GtkWidget *         xfce_titled_dialog_new              (void);
-GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         GtkDialogFlags flags,
-                                                         const gchar *first_button_text,
-                                                         ...);
-const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
-void                xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
-                                                         const gchar *subtitle);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
+GtkWidget * + +xfce_titled_dialog_new () +
+GtkWidget * + +xfce_titled_dialog_new_with_buttons () +
const gchar * + +xfce_titled_dialog_get_subtitle () +
+void + +xfce_titled_dialog_set_subtitle () +
+
+
+

Properties

+
+++++ + + + + + +
+gchar *subtitleRead / Write
+
+
+

Types and Values

+
++++ + + + + +
structXfceTitledDialog

Object Hierarchy

-
-  GObject
-   +----GInitiallyUnowned
-         +----GtkObject
-               +----GtkWidget
-                     +----GtkContainer
-                           +----GtkBin
-                                 +----GtkWindow
-                                       +----GtkDialog
-                                             +----XfceTitledDialog
+
    GObject
+    ╰── GInitiallyUnowned
+        ╰── GtkObject
+            ╰── GtkWidget
+                ╰── GtkContainer
+                    ╰── GtkBin
+                        ╰── GtkWindow
+                            ╰── GtkDialog
+                                ╰── XfceTitledDialog

Implemented Interfaces

XfceTitledDialog implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface and GtkBuildable.

-

Properties

-
-  "subtitle"                 gchar*                : Read / Write
+
Includes

+
#include <libxfce4ui/libxfce4ui.h>

Description

-The XfceTitledDialog is a normal GtkDialog with a heading. The icon +The XfceTitledDialog is a normal GtkDialog with a heading. The icon and title used in the heading are the same as the dialog title and icon -See gtk_window_set_icon_name(). +See gtk_window_set_icon_name().

To give the user more detailed information about the use of the dialog, -an optional subtitle and be set using xfce_titled_dialog_set_subtitle(). +an optional subtitle and be set using xfce_titled_dialog_set_subtitle().

-

Details

+

Functions

-

XfceTitledDialog

-
typedef struct _XfceTitledDialog XfceTitledDialog;
-

-Structure for the XfceTitledDialog. -

+

xfce_titled_dialog_new ()

+
GtkWidget *
+xfce_titled_dialog_new (void);
+

Allocates a new XfceTitledDialog instance.

+
+

Returns

+

the newly allocated XfceTitledDialog.

+

-
-
-

xfce_titled_dialog_new ()

-
GtkWidget *         xfce_titled_dialog_new              (void);
-

-Allocates a new XfceTitledDialog instance. -

-
-- - - - -

Returns :

the newly allocated XfceTitledDialog.
-

xfce_titled_dialog_new_with_buttons ()

-
GtkWidget *         xfce_titled_dialog_new_with_buttons (const gchar *title,
-                                                         GtkWindow *parent,
-                                                         GtkDialogFlags flags,
-                                                         const gchar *first_button_text,
-                                                         ...);
-

-See the documentation of gtk_dialog_new_with_buttons() for details about the -parameters and the returned dialog. -

-
-+

xfce_titled_dialog_new_with_buttons ()

+
GtkWidget *
+xfce_titled_dialog_new_with_buttons (const gchar *title,
+                                     GtkWindow *parent,
+                                     GtkDialogFlags flags,
+                                     const gchar *first_button_text,
+                                     ...);
+

See the documentation of gtk_dialog_new_with_buttons() for details about the +parameters and the returned dialog.

+
+

Parameters

+
+++++ - - - - - - - - - - + + + - - + + + - - + + + - - + + +

title :

title of the dialog, or NULL.

parent :

transient parent window of the dialog, or NULL.

flags :

from GtkDialogFlags.

title

title of the dialog, or NULL.

 

first_button_text :

stock ID or text to go in first, or NULL.

parent

transient parent window of the dialog, or NULL.

 

... :

response ID for the first button, then additional buttons, ending with NULL.

flags

from GtkDialogFlags.

 

Returns :

the newly allocated XfceTitledDialog.

first_button_text

stock ID or text to go in first, or NULL.

 
+
+

Returns

+

the newly allocated XfceTitledDialog.

+

+
+
-

xfce_titled_dialog_get_subtitle ()

-
const gchar *       xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
-

-Returns the subtitle of the titled_dialog, or NULL -if no subtitle is displayed in the titled_dialog. -

-
-- - - - - - - - - - +

xfce_titled_dialog_get_subtitle ()

+
const gchar *
+xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog);
+

Returns the subtitle of the titled_dialog +, or NULL +if no subtitle is displayed in the titled_dialog +.

+
+

Parameters

+

titled_dialog :

a XfceTitledDialog.

Returns :

the subtitle of titled_dialog, or NULL.
+++++ + + + + +

titled_dialog

a XfceTitledDialog.

 
+
+

Returns

+

the subtitle of titled_dialog +, or NULL.

+

+
+
-

xfce_titled_dialog_set_subtitle ()

-
void                xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
-                                                         const gchar *subtitle);
-

-Sets the subtitle displayed by titled_dialog to subtitle; if -subtitle is NULL no subtitle will be displayed by the titled_dialog. -

-
-+

xfce_titled_dialog_set_subtitle ()

+
void
+xfce_titled_dialog_set_subtitle (XfceTitledDialog *titled_dialog,
+                                 const gchar *subtitle);
+

Sets the subtitle displayed by titled_dialog + to subtitle +; if +subtitle + is NULL no subtitle will be displayed by the titled_dialog +.

+
+

Parameters

+
+++++ - - + + + - - + + +

titled_dialog :

a XfceTitledDialog.

titled_dialog

a XfceTitledDialog.

 

subtitle :

the new subtitle for the titled_dialog, or NULL.

subtitle

the new subtitle for the titled_dialog +, or NULL.

 
+
-

Property Details

+

Types and Values

-

The "subtitle" property

-
  "subtitle"                 gchar*                : Read / Write
+

struct XfceTitledDialog

+
struct XfceTitledDialog;

-The subtitle displayed below the main dialog title. +Structure for the XfceTitledDialog.

+
+
+
+

Property Details

+
+

The “subtitle” property

+
  “subtitle”                 gchar *
+

The subtitle displayed below the main dialog title.

+

Flags: Read / Write

Default value: NULL

See Also

-GtkDialog, GtkWindow +GtkDialog, GtkWindow

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/right-insensitive.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/right-insensitive.png differ Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/right.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/right.png differ diff -Nru libxfce4ui-4.8.1/docs/html/style.css libxfce4ui-4.12.1/docs/html/style.css --- libxfce4ui-4.8.1/docs/html/style.css 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/style.css 2015-03-15 18:15:03.000000000 +0000 @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -22,89 +30,6 @@ vertical-align: top; } -@media screen { - sup a.footnote - { - position: relative; - top: 0em ! important; - - } - /* this is needed so that the local anchors are displayed below the naviagtion */ - div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] - { - display: inline-block; - position: relative; - top:-5em; - } - /* this seems to be a bug in the xsl style sheets when generating indexes */ - div.index div.index - { - top: 0em; - } - /* make space for the fixed navigation bar and add space at the bottom so that - * link targets appear somewhat close to top - */ - body - { - padding-top: 3.2em; - padding-bottom: 20em; - } - /* style and size the navigation bar */ - table.navigation#top - { - position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - z-index: 10; - } - .navigation a, .navigation a:visited - { - /* tango:scarlet red 3 */ - color: #a40000; - } - .navigation a:hover - { - /* tango:scarlet red 1 */ - color: #ef2929; - } - td.shortcuts - { - /* tango:scarlet red 1 */ - color: #ef2929; - font-size: 80%; - white-space: nowrap; - } -} -@media print { - table.navigation { - visibility: collapse; - display: none; - } - div.titlepage table.navigation { - visibility: visible; - display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - } -} - -.navigation .title -{ - font-size: 200%; -} - div.gallery-float { float: left; @@ -132,6 +57,72 @@ color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 1em 0.5em; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + div.table table { border-collapse: collapse; @@ -154,14 +145,43 @@ background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +193,70 @@ font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; } -.note, .warning +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section { - margin-bottom: 0.0em + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,33 +269,52 @@ font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; font-weight: normal; } +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + /* code listings */ -.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ -.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ -.listing_code .programlisting .function { color: #000000; font-weight: bold; } -.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ -.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ +.listing_code .programlisting .normal, +.listing_code .programlisting .normal a, +.listing_code .programlisting .number, +.listing_code .programlisting .cbracket, +.listing_code .programlisting .symbol { color: #555753; } +.listing_code .programlisting .comment, .listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .normal { color: #000000; } -.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ +.listing_code .programlisting .function, +.listing_code .programlisting .function a, .listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ -.listing_code .programlisting .type { color: #000000; } -.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ -.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ +.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ +.listing_code .programlisting .keyword, +.listing_code .programlisting .usertype, +.listing_code .programlisting .type, +.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -248,19 +326,151 @@ .listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; } +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/up-insensitive.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/up-insensitive.png differ Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/docs/html/up.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/docs/html/up.png differ diff -Nru libxfce4ui-4.8.1/docs/html/XfceSMClient.html libxfce4ui-4.12.1/docs/html/XfceSMClient.html --- libxfce4ui-4.8.1/docs/html/XfceSMClient.html 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/html/XfceSMClient.html 2015-03-15 18:15:03.000000000 +0000 @@ -2,36 +2,29 @@ -XfceSMClient - +Libxfce4ui Reference Manual: XfceSMClient + - + - - - - - - - - - - + + + + + + +
@@ -39,1109 +32,1494 @@

XfceSMClient

XfceSMClient — Session management client

- +

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
-#include <libxfce4ui/libxfce4ui.h>
-
-                    XfceSMClient;
-enum                XfceSMClientPriority;
-enum                XfceSMClientRestartStyle;
-enum                XfceSMClientShutdownHint;
-GOptionGroup *      xfce_sm_client_get_option_group     (gint argc,
-                                                         gchar **argv);
-XfceSMClient *      xfce_sm_client_get                  (void);
-XfceSMClient *      xfce_sm_client_get_with_argv        (gint argc,
-                                                         gchar **argv,
-                                                         XfceSMClientRestartStyle restart_style,
-                                                         guchar priority);
-XfceSMClient *      xfce_sm_client_get_full             (XfceSMClientRestartStyle restart_style,
-                                                         guchar priority,
-                                                         const gchar *resumed_client_id,
-                                                         const gchar *current_directory,
-                                                         const gchar **restart_command,
-                                                         const gchar *desktop_file);
-gboolean            xfce_sm_client_connect              (XfceSMClient *sm_client,
-                                                         GError **error);
-void                xfce_sm_client_disconnect           (XfceSMClient *sm_client);
-gboolean            xfce_sm_client_is_connected         (XfceSMClient *sm_client);
-gboolean            xfce_sm_client_is_resumed           (XfceSMClient *sm_client);
-void                xfce_sm_client_set_desktop_file     (XfceSMClient *sm_client,
-                                                         const gchar *desktop_file);
-void                xfce_sm_client_request_shutdown     (XfceSMClient *sm_client,
-                                                         XfceSMClientShutdownHint shutdown_hint);
-const gchar *       xfce_sm_client_get_client_id        (XfceSMClient *sm_client);
-const gchar *       xfce_sm_client_get_state_file       (XfceSMClient *sm_client);
-const gchar *       xfce_sm_client_get_current_directory
-                                                        (XfceSMClient *sm_client);
-void                xfce_sm_client_set_current_directory
-                                                        (XfceSMClient *sm_client,
-                                                         const gchar *current_directory);
-guint8              xfce_sm_client_get_priority         (XfceSMClient *sm_client);
-void                xfce_sm_client_set_priority         (XfceSMClient *sm_client,
-                                                         guint8 priority);
-const gchar * const * xfce_sm_client_get_restart_command
-                                                        (XfceSMClient *sm_client);
-void                xfce_sm_client_set_restart_command  (XfceSMClient *sm_client,
-                                                         gchar **restart_command);
-XfceSMClientRestartStyle xfce_sm_client_get_restart_style
-                                                        (XfceSMClient *sm_client);
-void                xfce_sm_client_set_restart_style    (XfceSMClient *sm_client,
-                                                         XfceSMClientRestartStyle restart_style);
-
+Unstable, unless otherwise indicated
-

Object Hierarchy

-
-  GObject
-   +----XfceSMClient
-
-
-  GEnum
-   +----XfceSMClientRestartStyle
-
-
-  GEnum
-   +----XfceSMClientShutdownHint
-
-
-
-

Properties

-
-  "argc"                     gint                  : Write / Construct Only
-  "argv"                     GStrv                 : Write / Construct Only
-  "client-id"                gchar*                : Read / Write / Construct Only
-  "current-directory"        gchar*                : Read / Write
-  "desktop-file"             gchar*                : Read / Write
-  "priority"                 guchar                : Read / Write / Construct
-  "restart-command"          GStrv                 : Read / Write
-  "restart-style"            XfceSMClientRestartStyle  : Read / Write / Construct
-  "resumed"                  gboolean              : Read
-
-
-
-

Signals

-
-  "quit"                                           : Run Last
-  "quit-cancelled"                                 : Run Last
-  "quit-requested"                                 : Run Last
-  "save-state"                                     : Run Last
-  "save-state-extended"                            : Run Last
-
-
-
-

Description

-

-XfceSMClient is a session management client that speaks the X Session -Management Protocol (XSMP). It's designed to be easy to use and hide some -of the more esoteric feaures of XSMP from the API user. -

-
-
-

Details

-
-

XfceSMClient

-
typedef struct _XfceSMClient XfceSMClient;
-

-An opaque struct with only private fields. -

-
-
-
-

enum XfceSMClientPriority

-
typedef enum {
-    XFCE_SM_CLIENT_PRIORITY_HIGHEST = 0,
-    XFCE_SM_CLIENT_PRIORITY_WM = 15,
-    XFCE_SM_CLIENT_PRIORITY_CORE = 25,
-    XFCE_SM_CLIENT_PRIORITY_DESKTOP = 35,
-    XFCE_SM_CLIENT_PRIORITY_DEFAULT = 50,
-    XFCE_SM_CLIENT_PRIORITY_LOWEST = 255,
-} XfceSMClientPriority;
-
-

-Some sample priority values for use with xfce_sm_client_set_priority(). -

-
-+

Functions

+
++++ - - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + + + + +

XFCE_SM_CLIENT_PRIORITY_HIGHEST

A high priority value. You probably - don't want to use this. + +GOptionGroup * + +xfce_sm_client_get_option_group ()

XFCE_SM_CLIENT_PRIORITY_WM

A priority value for use by the window manager. + +XfceSMClient * + +xfce_sm_client_get ()

XFCE_SM_CLIENT_PRIORITY_CORE

A priority value for use by applications that - place windows on the screen and possibly set - window manager struts. + +XfceSMClient * + +xfce_sm_client_get_with_argv () +
+XfceSMClient * + +xfce_sm_client_get_full () +
+gboolean + +xfce_sm_client_connect () +
+void + +xfce_sm_client_disconnect () +
+gboolean + +xfce_sm_client_is_connected () +
+gboolean + +xfce_sm_client_is_resumed () +
+void + +xfce_sm_client_set_desktop_file () +
+void + +xfce_sm_client_request_shutdown () +
const gchar * + +xfce_sm_client_get_client_id () +
const gchar * + +xfce_sm_client_get_state_file () +
const gchar * + +xfce_sm_client_get_current_directory () +
+void + +xfce_sm_client_set_current_directory () +
+guint8 + +xfce_sm_client_get_priority () +
+void + +xfce_sm_client_set_priority ()

XFCE_SM_CLIENT_PRIORITY_DESKTOP

A priority value for use by applications - that draw on the desktop. +const gchar * const * + +xfce_sm_client_get_restart_command ()

XFCE_SM_CLIENT_PRIORITY_DEFAULT

A priority value for regular applications. + +void + +xfce_sm_client_set_restart_command ()

XFCE_SM_CLIENT_PRIORITY_LOWEST

The lowest possible priority value. + +XfceSMClientRestartStyle + +xfce_sm_client_get_restart_style () +
+void + +xfce_sm_client_set_restart_style ()
-
-
-

enum XfceSMClientRestartStyle

-
typedef enum {
-    XFCE_SM_CLIENT_RESTART_NORMAL = 0,
-    XFCE_SM_CLIENT_RESTART_IMMEDIATELY,
-} XfceSMClientRestartStyle;
-
-

-An enumeration describing how the session manager should restart -the application. -

-
-+
+

Properties

+
+++++ - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

XFCE_SM_CLIENT_RESTART_NORMAL

Only restart the application if it is - still running when the session is next - saved. -gintargcWrite / Construct Only

XFCE_SM_CLIENT_RESTART_IMMEDIATELY

Immediately restart the application - if it ever quits. -GStrvargvWrite / Construct Only
+gchar *client-idRead / Write / Construct Only
+gchar *current-directoryRead / Write
+gchar *desktop-fileRead / Write
gucharpriorityRead / Write / Construct
GStrvrestart-commandRead / Write
XfceSMClientRestartStylerestart-styleRead / Write / Construct
gbooleanresumedRead
-
-
-

enum XfceSMClientShutdownHint

-
typedef enum {
-    XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK = 0,
-    XFCE_SM_CLIENT_SHUTDOWN_HINT_LOGOUT,
-    XFCE_SM_CLIENT_SHUTDOWN_HINT_HALT,
-    XFCE_SM_CLIENT_SHUTDOWN_HINT_REBOOT,
-} XfceSMClientShutdownHint;
-
-

-Hints to the session manager what kind of shutdown the session manager -should perform. -

-
-+
+

Signals

+
+++++ - - + + + - - + + + - - + + + - - + + + + + + + +

XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK

Prompt the user for a choice, -voidquitRun Last

XFCE_SM_CLIENT_SHUTDOWN_HINT_LOGOUT

End the current session, -voidquit-cancelledRun Last

XFCE_SM_CLIENT_SHUTDOWN_HINT_HALT

Shut down the computer. -gbooleanquit-requestedRun Last

XFCE_SM_CLIENT_SHUTDOWN_HINT_REBOOT

Restart the computer. -voidsave-stateRun Last
voidsave-state-extendedRun Last
-
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
 XfceSMClient
enumXfceSMClientPriority
enumXfceSMClientRestartStyle
enumXfceSMClientShutdownHint
#defineXFCE_SM_CLIENT_ERROR
enumXfceSmCLientErrorEnum
+
+
+

Object Hierarchy

+
    GEnum
+    ├── XfceSMClientRestartStyle
+    ╰── XfceSMClientShutdownHint
+    GObject
+    ╰── XfceSMClient
+
+
+
+

Includes

+
#include <libxfce4ui/libxfce4ui.h>
+
+
+
+

Description

+

XfceSMClient is a session management client that speaks the X Session +Management Protocol (XSMP). It's designed to be easy to use and hide some +of the more esoteric feaures of XSMP from the API user.

+
+
+

Functions

-

xfce_sm_client_get_option_group ()

-
GOptionGroup *      xfce_sm_client_get_option_group     (gint argc,
-                                                         gchar **argv);
-

-Constructs a GOptionGroup suitable for use with Glib's -command-line option parser. -

-

-This function is a bit sneaky in that it will make a copy of +

xfce_sm_client_get_option_group ()

+
GOptionGroup *
+xfce_sm_client_get_option_group (gint argc,
+                                 gchar **argv);
+

Constructs a GOptionGroup suitable for use with Glib's +command-line option parser.

+

This function is a bit sneaky in that it will make a copy of the program's argc and argv before GTK+ etc. has a chance to mess around with it, so XfceSMClient can later construct an accurate restart command. Instead of calling -gtk_init() or gtk_init_with_args(), instead you'd do something -like: -

-

-

+gtk_init() or gtk_init_with_args(), instead you'd do something +like:

 GOptionContext *context = g_option_context_new("");
 g_option_context_add_group(context, gtk_get_option_group(TRUE));
 g_option_context_add_group(context, xfce_sm_client_get_option_group(argc, argv);
 g_option_context_parse(context, &argc, &argv, NULL);
-

-

-

-Error checking is omitted here for brevity, and of course you could -add your app's own options with g_option_context_add_main_entries() -or similar. -

-
-+

Error checking is omitted here for brevity, and of course you could +add your app's own options with g_option_context_add_main_entries() +or similar.

+
+

Parameters

+
+++++ - - + + + - - - - - - + + +

argc :

The application's argument count

argc

The application's argument count

 

argv :

The application's argument vector

Returns :

A new GOptionGroup -

argv

The application's argument vector

 
+
+

Returns

+

A new GOptionGroup

+

+
+
-

xfce_sm_client_get ()

-
XfceSMClient *      xfce_sm_client_get                  (void);
-

-Gets the application's SM client instance. This is best -used with xfce_sm_client_get_option_group() above (and using -the returned GOptionGroup with g_option_context_parse()), as the +

xfce_sm_client_get ()

+
XfceSMClient *
+xfce_sm_client_get (void);
+

Gets the application's SM client instance. This is best +used with xfce_sm_client_get_option_group() above (and using +the returned GOptionGroup with g_option_context_parse()), as the command line parsing will figure out many of the SM client's -required property values for you. -

-

-If you are not using Gtk or Glib's command-line option parser, +required property values for you.

+

If you are not using Gtk or Glib's command-line option parser, take a look at xfce_sm_client_new_with_argv() and -xfce_sm_client_new_full(). -

-

-If you have already created an XfceSMClient instance using +xfce_sm_client_new_full().

+

If you have already created an XfceSMClient instance using this function or one of the xfce_sm_client_new_*() functions, -this will return the same instance. -

-
-- - - - -

Returns :

A new or existing XfceSMClient -
+this will return the same instance.

+
+

Returns

+

A new or existing XfceSMClient

+

+
-

xfce_sm_client_get_with_argv ()

-
XfceSMClient *      xfce_sm_client_get_with_argv        (gint argc,
-                                                         gchar **argv,
-                                                         XfceSMClientRestartStyle restart_style,
-                                                         guchar priority);
-

-Creates a new XfceSMClient instance. It attempts to +

xfce_sm_client_get_with_argv ()

+
XfceSMClient *
+xfce_sm_client_get_with_argv (gint argc,
+                              gchar **argv,
+                              XfceSMClientRestartStyle restart_style,
+                              guchar priority);
+

Creates a new XfceSMClient instance. It attempts to set all required properties using the app's command line. Note that this function does not actually connect to the session manager, so other actions can be taken (such as setting custom properties or connecting signals) before calling -xfce_sm_client_connect(). -

-

-If you are using Gtk or Glib's command-line option parser, -it is recommended that you use xfce_sm_client_get_option_group() -and xfce_sm_client_get() instead. -

-
-+xfce_sm_client_connect().

+

If you are using Gtk or Glib's command-line option parser, +it is recommended that you use xfce_sm_client_get_option_group() +and xfce_sm_client_get() instead.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - - - - - - + + +

argc :

The number of arguments passed to main() -

argc

The number of arguments passed to main()

 

argv :

The argument vector passed to main() -

argv

The argument vector passed to main()

 

restart_style :

An XfceSMClientRestartStyle -

restart_style

An XfceSMClientRestartStyle

 

priority :

A restart priority

Returns :

A new XfceSMClient instance

priority

A restart priority

 
+
+

Returns

+

A new XfceSMClient instance

+

+
+
-

xfce_sm_client_get_full ()

-
XfceSMClient *      xfce_sm_client_get_full             (XfceSMClientRestartStyle restart_style,
-                                                         guchar priority,
-                                                         const gchar *resumed_client_id,
-                                                         const gchar *current_directory,
-                                                         const gchar **restart_command,
-                                                         const gchar *desktop_file);
-

-Creates a new SM client instance, allowing the application +

xfce_sm_client_get_full ()

+
XfceSMClient *
+xfce_sm_client_get_full (XfceSMClientRestartStyle restart_style,
+                         guchar priority,
+                         const gchar *resumed_client_id,
+                         const gchar *current_directory,
+                         const gchar **restart_command,
+                         const gchar *desktop_file);
+

Creates a new SM client instance, allowing the application fine-grained control over the initial properties set. Note that this function does not actually connect to the session manager, so other actions can be taken (such as setting custom properties or connecting signals) before calling -xfce_sm_client_connect(). -

-

-It is recommended to use xfce_sm_client_get_with_argv(), or, +xfce_sm_client_connect().

+

It is recommended to use xfce_sm_client_get_with_argv(), or, if you are using Gtk or Glib's command-line option parser, -xfce_sm_client_get_option_group() and xfce_sm_client_get() instead. -

-
-+xfce_sm_client_get_option_group() and xfce_sm_client_get() instead.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - - + + + - - + + + - - - - - - + + +

restart_style :

An XfceSMClientRestartStyle

restart_style

An XfceSMClientRestartStyle

 

priority :

A restart priority

priority

A restart priority

 

resumed_client_id :

The client id used in the previous session

resumed_client_id

The client id used in the previous session

 

current_directory :

The application's working directory

current_directory

The application's working directory

 

restart_command :

A command that can resume the application's -saved state

restart_command

A command that can resume the application's +saved state

 

desktop_file :

The application's .desktop file

Returns :

A new XfceSMClient instance

desktop_file

The application's .desktop file

 
+
+

Returns

+

A new XfceSMClient instance

+

+
+
-

xfce_sm_client_connect ()

-
gboolean            xfce_sm_client_connect              (XfceSMClient *sm_client,
-                                                         GError **error);
-

-Attempts to connect to the session manager. -

-
-+

xfce_sm_client_connect ()

+
gboolean
+xfce_sm_client_connect (XfceSMClient *sm_client,
+                        GError **error);
+

Attempts to connect to the session manager.

+
+

Parameters

+
+++++ - - + + + - - - - - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

error :

A GError location.

Returns :

 -TRUE on success, FALSE otherwise. If an error -occurs, error will be set.

error

A GError location.

 
+
+

Returns

+

TRUE on success, FALSE otherwise. If an error +occurs, error +will be set.

+

+
+
-

xfce_sm_client_disconnect ()

-
void                xfce_sm_client_disconnect           (XfceSMClient *sm_client);
-

-Disconnects the application from the session manager. -

-

-

-
-

Note

-

+

xfce_sm_client_disconnect ()

+
void
+xfce_sm_client_disconnect (XfceSMClient *sm_client);
+

Disconnects the application from the session manager.

+

This may not remove the application from the saved session (if any) if the user later does not choose to save the session when logging out. -

-
-

-

-
-+

+
+

Parameters

+
+++++ - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 
+
-

xfce_sm_client_is_connected ()

-
gboolean            xfce_sm_client_is_connected         (XfceSMClient *sm_client);
-

-Determines whether or not the application has connected to the -session manager. -

-
-- - - - - - - - - - +

xfce_sm_client_is_connected ()

+
gboolean
+xfce_sm_client_is_connected (XfceSMClient *sm_client);
+

Determines whether or not the application has connected to the +session manager.

+
+

Parameters

+

sm_client :

An XfceSMClient -

Returns :

 -TRUE if connected to the session manager, FALSE otherwise
+++++ + + + + +

sm_client

An XfceSMClient

 
+
+

Returns

+

TRUE if connected to the session manager, FALSE otherwise

+

+
+
-

xfce_sm_client_is_resumed ()

-
gboolean            xfce_sm_client_is_resumed           (XfceSMClient *sm_client);
-

-Determines whether the application was resumed from a previous +

xfce_sm_client_is_resumed ()

+
gboolean
+xfce_sm_client_is_resumed (XfceSMClient *sm_client);
+

Determines whether the application was resumed from a previous session, or if the application has been started fresh with no -state information associated with it. -

-
-- - - - - - - - - - +state information associated with it.

+
+

Parameters

+

sm_client :

An XfceSMClient -

Returns :

 -TRUE if resumed from a previous session, FALSE otherwise
+++++ + + + + +

sm_client

An XfceSMClient

 
+
+

Returns

+

TRUE if resumed from a previous session, FALSE otherwise

+

+
+
-

xfce_sm_client_set_desktop_file ()

-
void                xfce_sm_client_set_desktop_file     (XfceSMClient *sm_client,
-                                                         const gchar *desktop_file);
-

-Sets the application's .desktop file. In addition to informing +

xfce_sm_client_set_desktop_file ()

+
void
+xfce_sm_client_set_desktop_file (XfceSMClient *sm_client,
+                                 const gchar *desktop_file);
+

Sets the application's .desktop file. In addition to informing the session manager of the .desktop file so it can present localized names and an icon in session listings and the splash screen, this -also calls g_set_application_name() and -gtk_window_set_default_icon_name() (or -gtk_window_set_default_icon_from_file()) if the Name and Icon -keys are present, respectively. -

-

-If a relative path to the file is provided, this function will search -the standard application directories as specified by the +also calls g_set_application_name() and +gtk_window_set_default_icon_name() (or +gtk_window_set_default_icon_from_file()) if the Name and Icon +keys are present, respectively.

+

If a relative path to the file is provided, this function will search +the standard application directories as specified by the

XDG Desktop Menu Specification. -

-
-+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

desktop_file :

The path to the application's .desktop file

desktop_file

The path to the application's .desktop file

 
+
-

xfce_sm_client_request_shutdown ()

-
void                xfce_sm_client_request_shutdown     (XfceSMClient *sm_client,
-                                                         XfceSMClientShutdownHint shutdown_hint);
-

-Sends a request to the session manager to end the session. -Depending on hint, the session manager may prompt for a +

xfce_sm_client_request_shutdown ()

+
void
+xfce_sm_client_request_shutdown (XfceSMClient *sm_client,
+                                 XfceSMClientShutdownHint shutdown_hint);
+

Sends a request to the session manager to end the session. +Depending on hint +, the session manager may prompt for a certain action (log out, halt, reboot, etc.) or may take the -requested action without user intervention. -

-

-

-
-

Note

-

+requested action without user intervention.

+

The session manager may or may not support all requested actions, and is also free to ignore the requested action. -

-
-

-

-
-+

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

shutdown_hint :

The type of shutdown requested

shutdown_hint

The type of shutdown requested

 
+
-

xfce_sm_client_get_client_id ()

-
const gchar *       xfce_sm_client_get_client_id        (XfceSMClient *sm_client);
-

-Retrieves the session client's unique ID. This ID can +

xfce_sm_client_get_client_id ()

+
const gchar *
+xfce_sm_client_get_client_id (XfceSMClient *sm_client);
+

Retrieves the session client's unique ID. This ID can be used to construct a filename used to restore the application's state. Note that this value is only -guaranteed to be valid if connected to the session manager. -

-

-

-
-

Note

-

+guaranteed to be valid if connected to the session manager.

+

Instead of constructing a state filename, it is -recommended to use xfce_sm_client_get_state_file(). -

-
-

-

-
-- - - - - - - - - - +recommended to use xfce_sm_client_get_state_file(). +

+
+

Parameters

+

sm_client :

An XfceSMClient -

Returns :

an opaque object-owned string
+++++ + + + + +

sm_client

An XfceSMClient

 
+
+

Returns

+

an opaque object-owned string

+

+
+
-

xfce_sm_client_get_state_file ()

-
const gchar *       xfce_sm_client_get_state_file       (XfceSMClient *sm_client);
-

-Constructs a filename that can be used to restore or save -state information. -

-

-When saving state, ote that this file may already exist (and +

xfce_sm_client_get_state_file ()

+
const gchar *
+xfce_sm_client_get_state_file (XfceSMClient *sm_client);
+

Constructs a filename that can be used to restore or save +state information.

+

When saving state, ote that this file may already exist (and may have been used for saving previous state for the application), so the application should first remove or empty -the file if it requires a fresh state file. -

-

-On the next application start, this function can be used to +the file if it requires a fresh state file.

+

On the next application start, this function can be used to check to see if there is any previous saved state, and, if so, -the state can be restored from the file. -

-

-This function will use a standard location and naming scheme -and handle state cleanup (setting of the discard command) for you. -

-

-Before calling this function, the application must have a +the state can be restored from the file.

+

This function will use a standard location and naming scheme +and handle state cleanup (setting of the discard command) for you.

+

Before calling this function, the application must have a valid program identifier set (see xfce_sm_client_set_program()) -and a valid client ID (see xfce_sm_client_get_client_id()). -

-
-+and a valid client ID (see xfce_sm_client_get_client_id()).

+
+

Parameters

+
+++++ + + + + + +

sm_client

An XfceSMClient

 
+
+
+

Returns

+

a file name string, owned by the object or NULL if +the session client is disabled.

+

+
+ +
+
+

xfce_sm_client_get_current_directory ()

+
const gchar *
+xfce_sm_client_get_current_directory (XfceSMClient *sm_client);
+

Retrieves the session client's working directory. See +xfce_sm_client_set_current_directory() for more information.

+
+

Parameters

+
+++++ + + + + + +

sm_client

An XfceSMClient

 
+
+
+

Returns

+

an object-owned string

+

+
+
+
+
+

xfce_sm_client_set_current_directory ()

+
void
+xfce_sm_client_set_current_directory (XfceSMClient *sm_client,
+                                      const gchar *current_directory);
+

Sets the startup working directory of sm_client + to +current_directory +. If unset, defaults to the user's +home directory.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

Returns :

a file name string, owned by the object or NULL if -the session client is disabled.

current_directory

A valid path name

 
+
-

xfce_sm_client_get_current_directory ()

-
const gchar *       xfce_sm_client_get_current_directory
-                                                        (XfceSMClient *sm_client);
-

-Retrieves the session client's working directory. See -xfce_sm_client_set_current_directory() for more information. -

-
-+

xfce_sm_client_get_priority ()

+
guint8
+xfce_sm_client_get_priority (XfceSMClient *sm_client);
+

Retrieves the session client's restart priority. See +xfce_sm_client_set_priority() for more information.

+
+

Parameters

+
+++++ + + + + + +

sm_client

An XfceSMClient

 
+
+
+

Returns

+

a value from G_MININT8 to G_MAXINT8

+

+
+ +
+
+

xfce_sm_client_set_priority ()

+
void
+xfce_sm_client_set_priority (XfceSMClient *sm_client,
+                             guint8 priority);
+

Sets the startup priority for sm_client + to priority +. Note +that the default priority for applications is 50; lower values +should be reserved for components of the desktop environment.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

Returns :

an object-owned string

priority

A 8-bit signed priority value

 
+
-

xfce_sm_client_set_current_directory ()

-
void                xfce_sm_client_set_current_directory
-                                                        (XfceSMClient *sm_client,
-                                                         const gchar *current_directory);
-

-Sets the startup working directory of sm_client to -current_directory. If unset, defaults to the user's -home directory. -

-
-+

xfce_sm_client_get_restart_command ()

+
const gchar * const *
+xfce_sm_client_get_restart_command (XfceSMClient *sm_client);
+

Retrieves the session client's restart command. See +xfce_sm_client_set_restart_command() for more information.

+
+

Parameters

+
+++++ + + + + + +

sm_client

An XfceSMClient

 
+
+
+

Returns

+

an object-owned string vector

+

+
+ +
+
+

xfce_sm_client_set_restart_command ()

+
void
+xfce_sm_client_set_restart_command (XfceSMClient *sm_client,
+                                    gchar **restart_command);
+

Sets the application's "restart" command, which is used to restart +the application and restore any saved state from the previous +run.

+

If unset, defaults to the command used to start this instance +of the application, with session management related arguments +added (if not already present).

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

current_directory :

A valid path name

restart_command

An argument vector

 
+
-

xfce_sm_client_get_priority ()

-
guint8              xfce_sm_client_get_priority         (XfceSMClient *sm_client);
-

-Retrieves the session client's restart priority. See -xfce_sm_client_set_priority() for more information. -

-
-- - - - - - - - +

xfce_sm_client_get_restart_style ()

+
XfceSMClientRestartStyle
+xfce_sm_client_get_restart_style (XfceSMClient *sm_client);
+

Retrieves the session client's restart style. See +xfce_sm_client_set_restart_style() for more information.

+
+

Parameters

+

sm_client :

An XfceSMClient -

Returns :

a value from G_MININT8 to G_MAXINT8 -
+++++ + + + + + +

sm_client

An XfceSMClient

 
+
+
+

Returns

+

a value from the XfceSMClientRestartStyle enum

+

+
+ +
+
+

xfce_sm_client_set_restart_style ()

+
void
+xfce_sm_client_set_restart_style (XfceSMClient *sm_client,
+                                  XfceSMClientRestartStyle restart_style);
+

Sets the restart style hint to restart_style +.

+
+

Parameters

+
+++++ + + + + + + + + + +

sm_client

An XfceSMClient

 

restart_style

An XfceSMClientRestartStyle value

 
+
+ +
+

Types and Values

+
+

XfceSMClient

+
typedef struct _XfceSMClient XfceSMClient;
+

An opaque struct with only private fields.

+
-

xfce_sm_client_set_priority ()

-
void                xfce_sm_client_set_priority         (XfceSMClient *sm_client,
-                                                         guint8 priority);
-

-Sets the startup priority for sm_client to priority. Note -that the default priority for applications is 50; lower values -should be reserved for components of the desktop environment. -

-
-+

enum XfceSMClientPriority

+

Some sample priority values for use with xfce_sm_client_set_priority().

+
+

Members

+
+++++ - - + + - - + + + - -

sm_client :

An XfceSMClient +

XFCE_SM_CLIENT_PRIORITY_HIGHEST

 +

A high priority value. You probably + don't want to use this.

 

priority :

A 8-bit signed priority value

XFCE_SM_CLIENT_PRIORITY_WM

 +

A priority value for use by the window manager.

+		 
-
-
-
-

xfce_sm_client_get_restart_command ()

-
const gchar * const * xfce_sm_client_get_restart_command
-                                                        (XfceSMClient *sm_client);
-

-Retrieves the session client's restart command. See -xfce_sm_client_set_restart_command() for more information. -

-
-- - - + + - - + + + + + + + + + + + + +

sm_client :

An XfceSMClient +

XFCE_SM_CLIENT_PRIORITY_CORE

 +

A priority value for use by applications that + place windows on the screen and possibly set + window manager struts.

 

Returns :

an object-owned string vector

XFCE_SM_CLIENT_PRIORITY_DESKTOP

 +

A priority value for use by applications + that draw on the desktop.

+		 

XFCE_SM_CLIENT_PRIORITY_DEFAULT

 +

A priority value for regular applications.

+		 

XFCE_SM_CLIENT_PRIORITY_LOWEST

 +

The lowest possible priority value.

+		 
+
-

xfce_sm_client_set_restart_command ()

-
void                xfce_sm_client_set_restart_command  (XfceSMClient *sm_client,
-                                                         gchar **restart_command);
-

-Sets the application's "restart" command, which is used to restart -the application and restore any saved state from the previous -run. -

-

-If unset, defaults to the command used to start this instance -of the application, with session management related arguments -added (if not already present). -

-
-+

enum XfceSMClientRestartStyle

+

An enumeration describing how the session manager should restart +the application.

+
+

Members

+
+++++ - - + + - - + + +

sm_client :

An XfceSMClient +

XFCE_SM_CLIENT_RESTART_NORMAL

 +

Only restart the application if it is + still running when the session is next + saved.

 

restart_command :

An argument vector

XFCE_SM_CLIENT_RESTART_IMMEDIATELY

 +

Immediately restart the application + if it ever quits.

+		 
+
-

xfce_sm_client_get_restart_style ()

-
XfceSMClientRestartStyle xfce_sm_client_get_restart_style
-                                                        (XfceSMClient *sm_client);
-

-Retrieves the session client's restart style. See -xfce_sm_client_set_restart_style() for more information. -

-
-+

enum XfceSMClientShutdownHint

+

Hints to the session manager what kind of shutdown the session manager +should perform.

+
+

Members

+
+++++ - - + + + + + + + - - + + + + + + + +

sm_client :

An XfceSMClient +

XFCE_SM_CLIENT_SHUTDOWN_HINT_ASK

 +

Prompt the user for a choice,

+		 

XFCE_SM_CLIENT_SHUTDOWN_HINT_LOGOUT

 +

End the current session,

 

Returns :

a value from the XfceSMClientRestartStyle enum

XFCE_SM_CLIENT_SHUTDOWN_HINT_HALT

 +

Shut down the computer.

+		 

XFCE_SM_CLIENT_SHUTDOWN_HINT_REBOOT

 +

Restart the computer.

+		 
+
-

xfce_sm_client_set_restart_style ()

-
void                xfce_sm_client_set_restart_style    (XfceSMClient *sm_client,
-                                                         XfceSMClientRestartStyle restart_style);
-

-Sets the restart style hint to restart_style. -

-
-- - - - - - - - +

XFCE_SM_CLIENT_ERROR

+
#define XFCE_SM_CLIENT_ERROR xfce_sm_client_error_quark()
+
+ +
+
+

enum XfceSmCLientErrorEnum

+
+

Members

+

sm_client :

An XfceSMClient -

restart_style :

An XfceSMClientRestartStyle value
+++++ + + + + + + + + + +

XFCE_SM_CLIENT_ERROR_FAILED

  

XFCE_SM_CLIENT_ERROR_INVALID_CLIENT

  
+

Property Details

-

The "argc" property

-
  "argc"                     gint                  : Write / Construct Only
+

The “argc” property

+
  “argc”                     gint

Argument count passed to program.

+

Flags: Write / Construct Only

Default value: 0

-

The "argv" property

-
  "argv"                     GStrv                 : Write / Construct Only
+

The “argv” property

+
  “argv”                     GStrv

Argument vector passed to program.

+

Flags: Write / Construct Only

-

The "client-id" property

-
  "client-id"                gchar*                : Read / Write / Construct Only
+

The “client-id” property

+
  “client-id”                gchar *

A string uniquely identifying the current instance of this client.

+

Flags: Read / Write / Construct Only

Default value: NULL

-

The "current-directory" property

-
  "current-directory"        gchar*                : Read / Write
+

The “current-directory” property

+
  “current-directory”        gchar *

The directory that should be used as the working directory the next time this client is restarted.

+

Flags: Read / Write

Default value: NULL

-

The "desktop-file" property

-
  "desktop-file"             gchar*                : Read / Write
+

The “desktop-file” property

+
  “desktop-file”             gchar *

The application's .desktop file.

+

Flags: Read / Write

Default value: NULL

-

The "priority" property

-
  "priority"                 guchar                : Read / Write / Construct
+

The “priority” property

+
  “priority”                 guchar

Determines the ordering in which this client is restarted.

+

Flags: Read / Write / Construct

Default value: 50

-

The "restart-command" property

-
  "restart-command"          GStrv                 : Read / Write
+

The “restart-command” property

+
  “restart-command”          GStrv

A command used to restart this application, preserving the current state.

+

Flags: Read / Write

-

The "restart-style" property

-
  "restart-style"            XfceSMClientRestartStyle  : Read / Write / Construct
+

The “restart-style” property

+
  “restart-style”            XfceSMClientRestartStyle

Specifies how the client should be restarted by the session manager.

+

Flags: Read / Write / Construct

Default value: XFCE_SM_CLIENT_RESTART_NORMAL

-

The "resumed" property

-
  "resumed"                  gboolean              : Read
+

The “resumed” property

+
  “resumed”                  gboolean

Whether or not the client was resumed with previous state.

+

Flags: Read

Default value: FALSE

Signal Details

-

The "quit" signal

-
void                user_function                      (XfceSMClient *sm_client,
-                                                        gpointer      user_data)      : Run Last
-

-Emitted when the application is required to quit. This is not +

The “quit” signal

+
void
+user_function (XfceSMClient *sm_client,
+               gpointer      user_data)
+

Emitted when the application is required to quit. This is not optional: if the client does not quit a short time after receiving this signal, it will likely be terminated in some other way. While not required, the application will usually receive quit-requested before receiving quit. If the application does not connect to this signal, XfceSMClient will call exit(3) with -an exit code of zero on behalf of the application. -

-
-+an exit code of zero on behalf of the application.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
-

The "quit-cancelled" signal

-
void                user_function                      (XfceSMClient *sm_client,
-                                                        gpointer      user_data)      : Run Last
-

-Informs the application that it will not need to quit. In most cases, -quit-cancelled will be emitted a short time after quit-requested. -

-
-+

The “quit-cancelled” signal

+
void
+user_function (XfceSMClient *sm_client,
+               gpointer      user_data)
+

Informs the application that it will not need to quit. In most cases, +quit-cancelled will be emitted a short time after quit-requested.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
-

The "quit-requested" signal

-
gboolean            user_function                      (XfceSMClient *sm_client,
-                                                        gpointer      user_data)      : Run Last
-

-Signals the client that the session manager will soon want the +

The “quit-requested” signal

+
gboolean
+user_function (XfceSMClient *sm_client,
+               gpointer      user_data)
+

Signals the client that the session manager will soon want the application to quit, perhaps as a part of ending the session (but this should not be assumed). The application can take this opportunity to prompt the user to save any unsaved work -to disk. -

-

-This signal also expects a return value from the handler. If the +to disk.

+

This signal also expects a return value from the handler. If the application wishes to cancel the quit request (perhaps because the user selected "Cancel" in prompts to save unsaved work), it should -return TRUE from the handler. If the application is satisfied -with possibly needing to quit soon, the handler should return FALSE. -

-
-+return TRUE from the handler. If the application is satisfied +with possibly needing to quit soon, the handler should return FALSE.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
-

The "save-state" signal

-
void                user_function                      (XfceSMClient *sm_client,
-                                                        gpointer      user_data)      : Run Last
-

-Signals the client that it should save a copy of its current state +

The “save-state” signal

+
void
+user_function (XfceSMClient *sm_client,
+               gpointer      user_data)
+

Signals the client that it should save a copy of its current state such that it could be restarted later in exactly the same state as -it is at the time of signal emission. -

-

-If the state is simple enough to be encoded in the application's -command line, xfce_sm_client_set_restart_command() can be used +it is at the time of signal emission.

+

If the state is simple enough to be encoded in the application's +command line, xfce_sm_client_set_restart_command() can be used to set that command line. For more complex state data, -xfce_sm_client_get_state_file() should be used. -

-

-The application should attempt to save its state as quickly as +xfce_sm_client_get_state_file() should be used.

+

The application should attempt to save its state as quickly as possible, and MUST NOT interact with the user as a part of saving -state. -

-
-+state.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
-

The "save-state-extended" signal

-
void                user_function                      (XfceSMClient *sm_client,
-                                                        gpointer      user_data)      : Run Last
-

-Allows the application to save extra state information after all +

The “save-state-extended” signal

+
void
+user_function (XfceSMClient *sm_client,
+               gpointer      user_data)
+

Allows the application to save extra state information after all other applications in the session have had a chance to save their state. This is mainly used by the window manager to save window positions. Most applications should not need to connect to this -signal. -

-
-+signal.

+
+

Parameters

+
+++++ - - + + + - - + + +

sm_client :

An XfceSMClient -

sm_client

An XfceSMClient

 

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru libxfce4ui-4.8.1/docs/libxfce4ui-sections.txt libxfce4ui-4.12.1/docs/libxfce4ui-sections.txt --- libxfce4ui-4.8.1/docs/libxfce4ui-sections.txt 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/libxfce4ui-sections.txt 2015-03-15 18:15:03.000000000 +0000 @@ -38,6 +38,8 @@ xfce_message_dialog_new xfce_message_dialog_new_valist xfce_message_dialog +xfce_dialog_show_help +xfce_dialog_show_help_with_version xfce_dialog_show_info xfce_dialog_show_warning xfce_dialog_show_error @@ -93,6 +95,8 @@ xfce_sm_client_set_restart_command xfce_sm_client_get_restart_style xfce_sm_client_set_restart_style +XFCE_SM_CLIENT_ERROR +XfceSmCLientErrorEnum XFCE_IS_SM_CLIENT XFCE_IS_SM_CLIENT_CLASS @@ -106,4 +110,5 @@ xfce_sm_client_get_type xfce_sm_client_restart_style_get_type xfce_sm_client_shutdown_hint_get_type +xfce_sm_client_error_quark diff -Nru libxfce4ui-4.8.1/docs/Makefile.am libxfce4ui-4.12.1/docs/Makefile.am --- libxfce4ui-4.8.1/docs/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/docs/Makefile.am 2015-02-18 18:22:26.000000000 +0000 @@ -1,6 +1,4 @@ -# $Id$ - -AUTOMAKE_OPTIONS = 1.8 +AUTOMAKE_OPTIONS = 1.11 # The name of the module. DOC_MODULE=libxfce4ui @@ -45,16 +43,16 @@ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK2_CFLAGS) \ $(GTK_DOC_EXTRA_CFLAGS) GTKDOC_LIBS = \ $(LIBXFCE4UTIL_LIBS) \ - $(GTK_LIBS) \ + $(GTK2_LIBS) \ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la include $(top_srcdir)/gtk-doc.make diff -Nru libxfce4ui-4.8.1/docs/Makefile.in libxfce4ui-4.12.1/docs/Makefile.in --- libxfce4ui-4.8.1/docs/Makefile.in 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/docs/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,14 +14,57 @@ @SET_MAKE@ -# $Id$ - # -*- mode: makefile -*- #################################### # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -42,25 +84,37 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml 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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -106,16 +160,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -128,6 +187,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -157,6 +220,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -242,6 +306,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -265,7 +331,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.8 +AUTOMAKE_OPTIONS = 1.11 # The name of the module. DOC_MODULE = libxfce4ui @@ -312,16 +378,16 @@ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK2_CFLAGS) \ $(GTK_DOC_EXTRA_CFLAGS) GTKDOC_LIBS = \ $(LIBXFCE4UTIL_LIBS) \ - $(GTK_LIBS) \ + $(GTK2_LIBS) \ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -363,11 +429,47 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -392,6 +494,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -409,11 +512,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -451,6 +554,7 @@ dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -463,10 +567,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -549,56 +658,58 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -613,22 +724,19 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -636,28 +744,20 @@ $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -678,16 +778,12 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -704,13 +800,16 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -720,7 +819,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -756,12 +855,14 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff -Nru libxfce4ui-4.8.1/docs/tmpl/xfce-dialogs.sgml libxfce4ui-4.12.1/docs/tmpl/xfce-dialogs.sgml --- libxfce4ui-4.8.1/docs/tmpl/xfce-dialogs.sgml 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/tmpl/xfce-dialogs.sgml 2015-03-15 18:15:03.000000000 +0000 @@ -32,7 +32,7 @@ @primary_text: @secondary_text: @first_button_text: -@...: +@Varargs: @Returns: @@ -62,7 +62,7 @@ @primary_text: @secondary_text: @first_button_text: -@...: +@Varargs: @Returns: @@ -74,7 +74,7 @@ @parent: @secondary_text: @primary_format: -@...: +@Varargs: @@ -85,7 +85,7 @@ @parent: @secondary_text: @primary_format: -@...: +@Varargs: @@ -96,7 +96,7 @@ @parent: @error: @primary_format: -@...: +@Varargs: @@ -109,7 +109,7 @@ @confirm_label: @secondary_text: @primary_format: -@...: +@Varargs: @Returns: diff -Nru libxfce4ui-4.8.1/docs/tmpl/xfce-titled-dialog.sgml libxfce4ui-4.12.1/docs/tmpl/xfce-titled-dialog.sgml --- libxfce4ui-4.8.1/docs/tmpl/xfce-titled-dialog.sgml 2011-12-23 16:13:10.000000000 +0000 +++ libxfce4ui-4.12.1/docs/tmpl/xfce-titled-dialog.sgml 2015-03-15 18:15:03.000000000 +0000 @@ -56,7 +56,7 @@ @parent: @flags: @first_button_text: -@...: +@Varargs: @Returns: diff -Nru libxfce4ui-4.8.1/docs/version.xml libxfce4ui-4.12.1/docs/version.xml --- libxfce4ui-4.8.1/docs/version.xml 2011-12-23 16:13:01.000000000 +0000 +++ libxfce4ui-4.12.1/docs/version.xml 2015-03-15 18:14:50.000000000 +0000 @@ -1 +1 @@ -4.8.1 +4.12.1 diff -Nru libxfce4ui-4.8.1/glade/icons/16x16/Makefile.am libxfce4ui-4.12.1/glade/icons/16x16/Makefile.am --- libxfce4ui-4.8.1/glade/icons/16x16/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/16x16/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - if HAVE_GLADEUI iconsdir = $(GLADEUI_PIXMAPDIR)/hicolor/16x16/actions icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png diff -Nru libxfce4ui-4.8.1/glade/icons/16x16/Makefile.in libxfce4ui-4.12.1/glade/icons/16x16/Makefile.in --- libxfce4ui-4.8.1/glade/icons/16x16/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/16x16/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,9 +14,52 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,23 +80,34 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d 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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -76,8 +129,15 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -123,16 +183,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -145,6 +210,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -174,6 +243,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -259,6 +329,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -326,8 +398,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -341,14 +416,12 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -398,10 +471,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -482,16 +560,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru libxfce4ui-4.8.1/glade/icons/22x22/Makefile.am libxfce4ui-4.12.1/glade/icons/22x22/Makefile.am --- libxfce4ui-4.8.1/glade/icons/22x22/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/22x22/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - if HAVE_GLADEUI iconsdir = $(GLADEUI_PIXMAPDIR)/hicolor/22x22/actions icons_DATA = widget-libxfce4ui-xfce-titled-dialog.png diff -Nru libxfce4ui-4.8.1/glade/icons/22x22/Makefile.in libxfce4ui-4.12.1/glade/icons/22x22/Makefile.in --- libxfce4ui-4.8.1/glade/icons/22x22/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/22x22/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,9 +14,52 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,23 +80,34 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d 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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -76,8 +129,15 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -123,16 +183,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -145,6 +210,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -174,6 +243,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -259,6 +329,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -326,8 +398,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -341,14 +416,12 @@ @$(NORMAL_UNINSTALL) @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -398,10 +471,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -482,16 +560,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru libxfce4ui-4.8.1/glade/icons/Makefile.am libxfce4ui-4.12.1/glade/icons/Makefile.am --- libxfce4ui-4.8.1/glade/icons/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ 16x16 \ 22x22 diff -Nru libxfce4ui-4.8.1/glade/icons/Makefile.in libxfce4ui-4.12.1/glade/icons/Makefile.in --- libxfce4ui-4.8.1/glade/icons/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/glade/icons/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,9 +13,52 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $Id$ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,35 +79,67 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d 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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -139,16 +213,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -161,6 +240,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -190,6 +273,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -275,6 +359,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -343,22 +429,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -373,57 +462,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -439,12 +483,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -456,15 +495,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -473,6 +508,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -509,13 +559,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -550,10 +597,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -631,22 +683,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff -Nru libxfce4ui-4.8.1/glade/libxfce4ui-glade.c libxfce4ui-4.12.1/glade/libxfce4ui-glade.c --- libxfce4ui-4.8.1/glade/libxfce4ui-glade.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/libxfce4ui-glade.c 2013-10-04 08:51:42.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2008 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -26,6 +25,11 @@ #include #endif +/* else glade is not working */ +#ifdef SEAL_ENABLE +typedef struct gpointer GtkCombo; +#endif + #include #include #include @@ -60,11 +64,15 @@ if (XFCE_IS_TITLED_DIALOG (dialog)) { /* create the dialog vbxo */ - vbox = glade_widget_adaptor_create_internal (widget, G_OBJECT (dialog->vbox), "vbox", "dialog", FALSE, reason); + vbox = glade_widget_adaptor_create_internal (widget, + G_OBJECT (gtk_dialog_get_content_area (dialog)), + "vbox", "dialog", FALSE, reason); glade_widget_remove_property (vbox, "border-width"); /* create the action area */ - action_area = glade_widget_adaptor_create_internal (vbox, G_OBJECT (dialog->action_area), "action_area", "dialog", FALSE, reason); + action_area = glade_widget_adaptor_create_internal (vbox, + G_OBJECT (gtk_dialog_get_action_area (dialog)), + "action_area", "dialog", FALSE, reason); glade_widget_remove_property (action_area, "border-width"); glade_widget_remove_property (action_area, "spacing"); @@ -92,9 +100,9 @@ g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (dialog), NULL); if (strcmp ("vbox", name) == 0) - child = dialog->vbox; + child = gtk_dialog_get_content_area (dialog); else if (strcmp ("action_area", name) == 0) - child = dialog->action_area; + child = gtk_dialog_get_action_area (dialog); return child; } @@ -107,5 +115,5 @@ { g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (dialog), NULL); - return g_list_prepend (NULL, dialog->vbox); + return g_list_prepend (NULL, gtk_dialog_get_content_area (dialog)); } diff -Nru libxfce4ui-4.8.1/glade/libxfce4ui.xml.in libxfce4ui-4.12.1/glade/libxfce4ui.xml.in --- libxfce4ui-4.8.1/glade/libxfce4ui.xml.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/libxfce4ui.xml.in 2015-02-18 18:22:25.000000000 +0000 @@ -1,4 +1,3 @@ - diff -Nru libxfce4ui-4.8.1/glade/Makefile.am libxfce4ui-4.12.1/glade/Makefile.am --- libxfce4ui-4.8.1/glade/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/glade/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -1,6 +1,4 @@ -# $Id$ - -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libxfce4ui-glade\" \ $(PLATFORM_CPPFLAGS) diff -Nru libxfce4ui-4.8.1/glade/Makefile.in libxfce4ui-4.12.1/glade/Makefile.in --- libxfce4ui-4.8.1/glade/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/glade/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,10 +14,53 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,12 +81,13 @@ host_triplet = @host@ target_triplet = @target@ subdir = glade -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -69,6 +112,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(glademoduledir)" \ "$(DESTDIR)$(gladecatalogdir)" LTLIBRARIES = $(glademodule_LTLIBRARIES) @@ -80,15 +129,28 @@ @HAVE_GLADEUI_TRUE@am_libxfce4uiglade_la_OBJECTS = \ @HAVE_GLADEUI_TRUE@ libxfce4uiglade_la-libxfce4ui-glade.lo libxfce4uiglade_la_OBJECTS = $(am_libxfce4uiglade_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxfce4uiglade_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libxfce4uiglade_la_CFLAGS) $(CFLAGS) \ $(libxfce4uiglade_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_GLADEUI_TRUE@am_libxfce4uiglade_la_rpath = -rpath \ @HAVE_GLADEUI_TRUE@ $(glademoduledir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -99,37 +161,59 @@ $(LIBTOOLFLAGS) --mode=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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=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 " $@; +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libxfce4uiglade_la_SOURCES) DIST_SOURCES = $(am__libxfce4uiglade_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(gladecatalog_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -203,16 +287,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -225,6 +314,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -254,6 +347,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -339,6 +433,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -362,7 +458,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"libxfce4ui-glade\" \ $(PLATFORM_CPPFLAGS) @@ -442,9 +538,9 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-glademoduleLTLIBRARIES: $(glademodule_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(glademoduledir)" || $(MKDIR_P) "$(DESTDIR)$(glademoduledir)" @list='$(glademodule_LTLIBRARIES)'; test -n "$(glademoduledir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -452,6 +548,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(glademoduledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(glademoduledir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(glademoduledir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(glademoduledir)"; \ } @@ -467,13 +565,16 @@ clean-glademoduleLTLIBRARIES: -test -z "$(glademodule_LTLIBRARIES)" || rm -f $(glademodule_LTLIBRARIES) - @list='$(glademodule_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libxfce4uiglade.la: $(libxfce4uiglade_la_OBJECTS) $(libxfce4uiglade_la_DEPENDENCIES) + @list='$(glademodule_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libxfce4uiglade.la: $(libxfce4uiglade_la_OBJECTS) $(libxfce4uiglade_la_DEPENDENCIES) $(EXTRA_libxfce4uiglade_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfce4uiglade_la_LINK) $(am_libxfce4uiglade_la_rpath) $(libxfce4uiglade_la_OBJECTS) $(libxfce4uiglade_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -487,34 +588,30 @@ .c.o: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libxfce4uiglade_la-libxfce4ui-glade.lo: libxfce4ui-glade.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4uiglade_la_CFLAGS) $(CFLAGS) -MT libxfce4uiglade_la-libxfce4ui-glade.lo -MD -MP -MF $(DEPDIR)/libxfce4uiglade_la-libxfce4ui-glade.Tpo -c -o libxfce4uiglade_la-libxfce4ui-glade.lo `test -f 'libxfce4ui-glade.c' || echo '$(srcdir)/'`libxfce4ui-glade.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4uiglade_la-libxfce4ui-glade.Tpo $(DEPDIR)/libxfce4uiglade_la-libxfce4ui-glade.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libxfce4ui-glade.c' object='libxfce4uiglade_la-libxfce4ui-glade.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-glade.c' object='libxfce4uiglade_la-libxfce4ui-glade.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4uiglade_la_CFLAGS) $(CFLAGS) -c -o libxfce4uiglade_la-libxfce4ui-glade.lo `test -f 'libxfce4ui-glade.c' || echo '$(srcdir)/'`libxfce4ui-glade.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4uiglade_la_CFLAGS) $(CFLAGS) -c -o libxfce4uiglade_la-libxfce4ui-glade.lo `test -f 'libxfce4ui-glade.c' || echo '$(srcdir)/'`libxfce4ui-glade.c mostlyclean-libtool: -rm -f *.lo @@ -523,8 +620,11 @@ -rm -rf .libs _libs install-gladecatalogDATA: $(gladecatalog_DATA) @$(NORMAL_INSTALL) - test -z "$(gladecatalogdir)" || $(MKDIR_P) "$(DESTDIR)$(gladecatalogdir)" @list='$(gladecatalog_DATA)'; test -n "$(gladecatalogdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gladecatalogdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gladecatalogdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -538,27 +638,28 @@ @$(NORMAL_UNINSTALL) @list='$(gladecatalog_DATA)'; test -n "$(gladecatalogdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(gladecatalogdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gladecatalogdir)" && rm -f $$files + dir='$(DESTDIR)$(gladecatalogdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -573,57 +674,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -639,12 +695,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -656,15 +707,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -673,6 +720,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -709,13 +771,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -753,10 +812,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -842,25 +906,24 @@ uninstall-am: uninstall-gladecatalogDATA \ uninstall-glademoduleLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-glademoduleLTLIBRARIES clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-gladecatalogDATA \ - install-glademoduleLTLIBRARIES install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-gladecatalogDATA uninstall-glademoduleLTLIBRARIES +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-glademoduleLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-gladecatalogDATA install-glademoduleLTLIBRARIES \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-gladecatalogDATA \ + uninstall-glademoduleLTLIBRARIES @HAVE_GLADEUI_TRUE@@INTLTOOL_XML_NOMERGE_RULE@ diff -Nru libxfce4ui-4.8.1/gtk-doc.make libxfce4ui-4.12.1/gtk-doc.make --- libxfce4ui-4.8.1/gtk-doc.make 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/gtk-doc.make 2015-03-15 18:14:44.000000000 +0000 @@ -49,9 +49,13 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test -if ENABLE_GTK_DOC if GTK_DOC_BUILD_HTML HTML_BUILD_STAMP=html-build.stamp else @@ -63,9 +67,11 @@ PDF_BUILD_STAMP= endif -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -else -all-local: +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc endif docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -74,33 +80,44 @@ #### setup #### +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp #### scan #### -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -115,22 +132,25 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### +GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; + tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -140,26 +160,34 @@ #### xml #### +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -180,16 +208,18 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp #### pdf #### +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -206,13 +236,16 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -222,7 +255,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -258,15 +291,17 @@ # # Require gtk-doc when making dist # -if ENABLE_GTK_DOC -dist-check-gtkdoc: +if HAVE_GTK_DOC +dist-check-gtkdoc: docs else dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" @false endif -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff -Nru libxfce4ui-4.8.1/icons/48x48/Makefile.am libxfce4ui-4.12.1/icons/48x48/Makefile.am --- libxfce4ui-4.8.1/icons/48x48/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/icons/48x48/Makefile.am 2012-05-03 22:30:28.000000000 +0000 @@ -0,0 +1,5 @@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = \ + xfce4-logo.png + +EXTRA_DIST = $(icons_DATA) diff -Nru libxfce4ui-4.8.1/icons/48x48/Makefile.in libxfce4ui-4.12.1/icons/48x48/Makefile.in --- libxfce4ui-4.8.1/icons/48x48/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/icons/48x48/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -0,0 +1,579 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = icons/48x48 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(iconsdir)" +DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLADEUI_CATALOGDIR = @GLADEUI_CATALOGDIR@ +GLADEUI_CFLAGS = @GLADEUI_CFLAGS@ +GLADEUI_LIBS = @GLADEUI_LIBS@ +GLADEUI_MODULEDIR = @GLADEUI_MODULEDIR@ +GLADEUI_PIXMAPDIR = @GLADEUI_PIXMAPDIR@ +GLADEUI_REQUIRED_VERSION = @GLADEUI_REQUIRED_VERSION@ +GLADEUI_VERSION = @GLADEUI_VERSION@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ +GOBJECT_VERSION = @GOBJECT_VERSION@ +GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSM_CFLAGS = @LIBSM_CFLAGS@ +LIBSM_LDFLAGS = @LIBSM_LDFLAGS@ +LIBSM_LIBS = @LIBSM_LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4KBD_PRIVATE_VERINFO = @LIBXFCE4KBD_PRIVATE_VERINFO@ +LIBXFCE4KBD_PRIVATE_VERSION_API = @LIBXFCE4KBD_PRIVATE_VERSION_API@ +LIBXFCE4UI_VERINFO = @LIBXFCE4UI_VERINFO@ +LIBXFCE4UI_VERSION_API = @LIBXFCE4UI_VERSION_API@ +LIBXFCE4UI_VERSION_MAJOR = @LIBXFCE4UI_VERSION_MAJOR@ +LIBXFCE4UI_VERSION_MICRO = @LIBXFCE4UI_VERSION_MICRO@ +LIBXFCE4UI_VERSION_MINOR = @LIBXFCE4UI_VERSION_MINOR@ +LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ +LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ +LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ +LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_UNDEFINED = @NO_UNDEFINED@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +iconsdir = $(datadir)/icons/hicolor/48x48/apps +icons_DATA = \ + xfce4-logo.png + +EXTRA_DIST = $(icons_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/48x48/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu icons/48x48/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-iconsDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA + + +# 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: Binary files /tmp/DCYpBQbMF7/libxfce4ui-4.8.1/icons/48x48/xfce4-logo.png and /tmp/BoxxnvSzZP/libxfce4ui-4.12.1/icons/48x48/xfce4-logo.png differ diff -Nru libxfce4ui-4.8.1/icons/Makefile.am libxfce4ui-4.12.1/icons/Makefile.am --- libxfce4ui-4.8.1/icons/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/icons/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -0,0 +1,17 @@ +SUBDIRS = \ + 48x48 + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. Remember to run:"; \ + echo "***"; \ + echo "*** $(gtk_update_icon_cache)"; \ + echo "***"; \ + fi + +# vi:set ts=8 sw=8 noet ai nocindent: diff -Nru libxfce4ui-4.8.1/icons/Makefile.in libxfce4ui-4.12.1/icons/Makefile.in --- libxfce4ui-4.8.1/icons/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/icons/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -0,0 +1,720 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = icons +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLADEUI_CATALOGDIR = @GLADEUI_CATALOGDIR@ +GLADEUI_CFLAGS = @GLADEUI_CFLAGS@ +GLADEUI_LIBS = @GLADEUI_LIBS@ +GLADEUI_MODULEDIR = @GLADEUI_MODULEDIR@ +GLADEUI_PIXMAPDIR = @GLADEUI_PIXMAPDIR@ +GLADEUI_REQUIRED_VERSION = @GLADEUI_REQUIRED_VERSION@ +GLADEUI_VERSION = @GLADEUI_VERSION@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ +GOBJECT_VERSION = @GOBJECT_VERSION@ +GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSM_CFLAGS = @LIBSM_CFLAGS@ +LIBSM_LDFLAGS = @LIBSM_LDFLAGS@ +LIBSM_LIBS = @LIBSM_LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4KBD_PRIVATE_VERINFO = @LIBXFCE4KBD_PRIVATE_VERINFO@ +LIBXFCE4KBD_PRIVATE_VERSION_API = @LIBXFCE4KBD_PRIVATE_VERSION_API@ +LIBXFCE4UI_VERINFO = @LIBXFCE4UI_VERINFO@ +LIBXFCE4UI_VERSION_API = @LIBXFCE4UI_VERSION_API@ +LIBXFCE4UI_VERSION_MAJOR = @LIBXFCE4UI_VERSION_MAJOR@ +LIBXFCE4UI_VERSION_MICRO = @LIBXFCE4UI_VERSION_MICRO@ +LIBXFCE4UI_VERSION_MINOR = @LIBXFCE4UI_VERSION_MINOR@ +LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ +LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ +LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ +LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_UNDEFINED = @NO_UNDEFINED@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = \ + 48x48 + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu icons/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + + +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. Remember to run:"; \ + echo "***"; \ + echo "*** $(gtk_update_icon_cache)"; \ + echo "***"; \ + fi + +# vi:set ts=8 sw=8 noet ai nocindent: + +# 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 libxfce4ui-4.8.1/INSTALL libxfce4ui-4.12.1/INSTALL --- libxfce4ui-4.8.1/INSTALL 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/INSTALL 2015-03-15 18:14:47.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru libxfce4ui-4.8.1/install-sh libxfce4ui-4.12.1/install-sh --- libxfce4ui-4.8.1/install-sh 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/install-sh 2015-03-15 18:14:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -347,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/libxfce4kbd-private-3.pc.in libxfce4ui-4.12.1/libxfce4kbd-private/libxfce4kbd-private-3.pc.in --- libxfce4ui-4.8.1/libxfce4kbd-private/libxfce4kbd-private-3.pc.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/libxfce4kbd-private-3.pc.in 2013-10-04 08:51:42.000000000 +0000 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libxfce4kbd-private +Description: Private Xfce library for shared code between xfwm4 and xfce4-settings +Requires: gdk-3.0 gtk+-3.0 libxfce4util-1.0 libxfconf-0 libxfce4ui-2 +Version: @PACKAGE_VERSION@ +Libs: @LIBX11_LDFLAGS@ -L${libdir} -lxfce4kbd-private-3 +Cflags: @LIBX11_CFLAGS@ -I${includedir}/xfce4/libxfce4kbd-private-3 diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/Makefile.am libxfce4ui-4.12.1/libxfce4kbd-private/Makefile.am --- libxfce4ui-4.8.1/libxfce4kbd-private/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/Makefile.am 2013-10-04 08:51:42.000000000 +0000 @@ -2,7 +2,7 @@ if ENABLE_KEYBOARD_LIBRARY -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DDATADIR=\"$(datadir)\" \ @@ -11,18 +11,28 @@ -DPREFIX=\"$(prefix)\" \ $(PLATFORM_CPPFLAGS) -lib_LTLIBRARIES = libxfce4kbd-private-2.la - libxfce4kbd_headers = \ xfce-shortcuts-provider.h \ xfce-shortcuts-grabber.h \ xfce-shortcut-dialog.h \ - xfce-shortcuts.h + xfce-shortcuts.h \ + xfce-shortcuts-xfwm4.h libxfce4kbd_built_sources = \ xfce-shortcuts-marshal.c \ xfce-shortcuts-marshal.h +libxfce4kbd_sources = \ + $(libxfce4kbd_headers) \ + $(libxfce4kbd_built_sources) \ + xfce-shortcuts-provider.c \ + xfce-shortcuts-grabber.c \ + xfce-shortcut-dialog.c \ + xfce-shortcuts.c \ + xfce-shortcuts-xfwm4.c + +lib_LTLIBRARIES = libxfce4kbd-private-2.la + libxfce4kbd_private_includedir = \ $(includedir)/xfce4/libxfce4kbd-private-$(LIBXFCE4KBD_PRIVATE_VERSION_API)/libxfce4kbd-private @@ -30,20 +40,16 @@ $(libxfce4kbd_headers) libxfce4kbd_private_2_la_SOURCES = \ - $(libxfce4kbd_headers) \ - $(libxfce4kbd_built_sources) \ - xfce-shortcuts-provider.c \ - xfce-shortcuts-grabber.c \ - xfce-shortcut-dialog.c \ - xfce-shortcuts.c + $(libxfce4kbd_sources) libxfce4kbd_private_2_la_CFLAGS = \ $(PLATFORM_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GTK2_CFLAGS) \ $(LIBX11_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(XFCONF_CFLAGS) + $(XFCONF_CFLAGS) \ + $(PLATFORM_CFLAGS) libxfce4kbd_private_2_la_LDFLAGS = \ -export-dynamic \ @@ -56,7 +62,7 @@ libxfce4kbd_private_2_la_LIBADD = \ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \ $(GLIB_LIBS) \ - $(GTK_LIBS) \ + $(GTK2_LIBS) \ $(LIBX11_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ $(XFCONF_LIBS) @@ -67,6 +73,48 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4kbd-private-2.pc +if ENABLE_GTK3_LIBRARY + +lib_LTLIBRARIES += libxfce4kbd-private-3.la + +libxfce4kbd3_private_includedir = \ + $(includedir)/xfce4/libxfce4kbd-private-3/libxfce4kbd-private + +libxfce4kbd3_private_include_HEADERS = \ + $(libxfce4kbd_headers) + +libxfce4kbd_private_3_la_SOURCES = \ + $(libxfce4kbd_sources) + +libxfce4kbd_private_3_la_CFLAGS = \ + $(PLATFORM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GTK3_CFLAGS) \ + $(LIBX11_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(PLATFORM_CFLAGS) + +libxfce4kbd_private_3_la_LDFLAGS = \ + -export-dynamic \ + -version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \ + -export-symbols-regex "^[^_].*" \ + -no-undefined \ + $(LIBX11_LDFLAGS) \ + $(PLATFORM_LDFLAGS) + +libxfce4kbd_private_3_la_LIBADD = \ + $(top_builddir)/libxfce4ui/libxfce4ui-2.la \ + $(GLIB_LIBS) \ + $(GTK3_LIBS) \ + $(LIBX11_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(XFCONF_LIBS) + +pkgconfig_DATA += libxfce4kbd-private-3.pc + +endif + if MAINTAINER_MODE xfce-shortcuts-marshal.h: xfce-shortcuts-marshal.list Makefile $(AM_V_GEN) glib-genmarshal --prefix=_xfce_shortcuts_marshal --internal --header $< > $@ diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/Makefile.in libxfce4ui-4.12.1/libxfce4kbd-private/Makefile.in --- libxfce4ui-4.8.1/libxfce4kbd-private/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,6 +19,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,17 +83,21 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@am__append_1 = libxfce4kbd-private-3.la +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@am__append_2 = libxfce4kbd-private-3.pc subdir = libxfce4kbd-private -DIST_COMMON = $(am__libxfce4kbd_private_include_HEADERS_DIST) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/libxfce4kbd-private-2.pc.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/libxfce4kbd-private-2.pc.in \ + $(srcdir)/libxfce4kbd-private-3.pc.in $(top_srcdir)/depcomp \ + $(am__libxfce4kbd3_private_include_HEADERS_DIST) \ + $(am__libxfce4kbd_private_include_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libxfce4kbd-private-2.pc +CONFIG_CLEAN_FILES = libxfce4kbd-private-2.pc libxfce4kbd-private-3.pc CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -72,8 +120,15 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(settingsdir)" \ + "$(DESTDIR)$(libxfce4kbd3_private_includedir)" \ "$(DESTDIR)$(libxfce4kbd_private_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -84,30 +139,73 @@ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) am__libxfce4kbd_private_2_la_SOURCES_DIST = xfce-shortcuts-provider.h \ xfce-shortcuts-grabber.h xfce-shortcut-dialog.h \ - xfce-shortcuts.h xfce-shortcuts-marshal.c \ - xfce-shortcuts-marshal.h xfce-shortcuts-provider.c \ - xfce-shortcuts-grabber.c xfce-shortcut-dialog.c \ - xfce-shortcuts.c + xfce-shortcuts.h xfce-shortcuts-xfwm4.h \ + xfce-shortcuts-marshal.c xfce-shortcuts-marshal.h \ + xfce-shortcuts-provider.c xfce-shortcuts-grabber.c \ + xfce-shortcut-dialog.c xfce-shortcuts.c xfce-shortcuts-xfwm4.c am__objects_1 = @ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_2 = libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo -@ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_2_la_OBJECTS = \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__objects_1) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_3 = $(am__objects_1) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__objects_2) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcuts.lo +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcuts.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo +@ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_2_la_OBJECTS = \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__objects_3) libxfce4kbd_private_2_la_OBJECTS = \ $(am_libxfce4kbd_private_2_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxfce4kbd_private_2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) \ $(libxfce4kbd_private_2_la_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_2_la_rpath = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -rpath $(libdir) +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_3_la_DEPENDENCIES = $(top_builddir)/libxfce4ui/libxfce4ui-2.la \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) +am__libxfce4kbd_private_3_la_SOURCES_DIST = xfce-shortcuts-provider.h \ + xfce-shortcuts-grabber.h xfce-shortcut-dialog.h \ + xfce-shortcuts.h xfce-shortcuts-xfwm4.h \ + xfce-shortcuts-marshal.c xfce-shortcuts-marshal.h \ + xfce-shortcuts-provider.c xfce-shortcuts-grabber.c \ + xfce-shortcut-dialog.c xfce-shortcuts.c xfce-shortcuts-xfwm4.c +@ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_4 = libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo +@ENABLE_KEYBOARD_LIBRARY_TRUE@am__objects_5 = $(am__objects_1) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__objects_4) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts.lo \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_3_la_OBJECTS = $(am__objects_5) +libxfce4kbd_private_3_la_OBJECTS = \ + $(am_libxfce4kbd_private_3_la_OBJECTS) +libxfce4kbd_private_3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) \ + $(libxfce4kbd_private_3_la_LDFLAGS) $(LDFLAGS) -o $@ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@am_libxfce4kbd_private_3_la_rpath = -rpath \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -118,29 +216,53 @@ $(LIBTOOLFLAGS) --mode=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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=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 = $(libxfce4kbd_private_2_la_SOURCES) -DIST_SOURCES = $(am__libxfce4kbd_private_2_la_SOURCES_DIST) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libxfce4kbd_private_2_la_SOURCES) \ + $(libxfce4kbd_private_3_la_SOURCES) +DIST_SOURCES = $(am__libxfce4kbd_private_2_la_SOURCES_DIST) \ + $(am__libxfce4kbd_private_3_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) $(settings_DATA) +am__libxfce4kbd3_private_include_HEADERS_DIST = \ + xfce-shortcuts-provider.h xfce-shortcuts-grabber.h \ + xfce-shortcut-dialog.h xfce-shortcuts.h xfce-shortcuts-xfwm4.h am__libxfce4kbd_private_include_HEADERS_DIST = \ xfce-shortcuts-provider.h xfce-shortcuts-grabber.h \ - xfce-shortcut-dialog.h xfce-shortcuts.h -HEADERS = $(libxfce4kbd_private_include_HEADERS) + xfce-shortcut-dialog.h xfce-shortcuts.h xfce-shortcuts-xfwm4.h +HEADERS = $(libxfce4kbd3_private_include_HEADERS) \ + $(libxfce4kbd_private_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,16 +310,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -210,6 +337,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -239,6 +370,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -324,6 +456,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -347,7 +481,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@ENABLE_KEYBOARD_LIBRARY_TRUE@INCLUDES = \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@AM_CPPFLAGS = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -I$(top_builddir) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -I$(top_srcdir) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -DDATADIR=\"$(datadir)\" \ @@ -356,17 +490,29 @@ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -DPREFIX=\"$(prefix)\" \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_CPPFLAGS) -@ENABLE_KEYBOARD_LIBRARY_TRUE@lib_LTLIBRARIES = libxfce4kbd-private-2.la @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_headers = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-provider.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-grabber.h \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcut-dialog.h \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.h +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.h \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-xfwm4.h @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_built_sources = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-marshal.c \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-marshal.h +@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_sources = \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_headers) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_built_sources) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-provider.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-grabber.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcut-dialog.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.c \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-xfwm4.c + +@ENABLE_KEYBOARD_LIBRARY_TRUE@lib_LTLIBRARIES = \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd-private-2.la \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__append_1) @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_includedir = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(includedir)/xfce4/libxfce4kbd-private-$(LIBXFCE4KBD_PRIVATE_VERSION_API)/libxfce4kbd-private @@ -374,20 +520,16 @@ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_headers) @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_2_la_SOURCES = \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_headers) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_built_sources) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-provider.c \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts-grabber.c \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcut-dialog.c \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ xfce-shortcuts.c +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_sources) @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_2_la_CFLAGS = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_CFLAGS) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GLIB_CFLAGS) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK_CFLAGS) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK2_CFLAGS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBX11_CFLAGS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_CFLAGS) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_CFLAGS) +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_CFLAGS) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_CFLAGS) @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_2_la_LDFLAGS = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ -export-dynamic \ @@ -400,7 +542,7 @@ @ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_2_la_LIBADD = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GLIB_LIBS) \ -@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK_LIBS) \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK2_LIBS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBX11_LIBS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) @@ -408,7 +550,43 @@ @ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig -@ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-2.pc +@ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ libxfce4kbd-private-2.pc \ +@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(am__append_2) +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd3_private_includedir = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(includedir)/xfce4/libxfce4kbd-private-3/libxfce4kbd-private + +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd3_private_include_HEADERS = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_headers) + +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_3_la_SOURCES = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(libxfce4kbd_sources) + +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_3_la_CFLAGS = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GLIB_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK3_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBX11_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_CFLAGS) + +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_3_la_LDFLAGS = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ -export-dynamic \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ -version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ -export-symbols-regex "^[^_].*" \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ -no-undefined \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBX11_LDFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(PLATFORM_LDFLAGS) + +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@libxfce4kbd_private_3_la_LIBADD = \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(top_builddir)/libxfce4ui/libxfce4ui-2.la \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GLIB_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(GTK3_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBX11_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@@ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) + @ENABLE_KEYBOARD_LIBRARY_TRUE@@MAINTAINER_MODE_TRUE@DISTCLEANFILES = \ @ENABLE_KEYBOARD_LIBRARY_TRUE@@MAINTAINER_MODE_TRUE@ $(libxfce4kbd_built_sources) @@ -456,9 +634,11 @@ $(am__aclocal_m4_deps): libxfce4kbd-private-2.pc: $(top_builddir)/config.status $(srcdir)/libxfce4kbd-private-2.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +libxfce4kbd-private-3.pc: $(top_builddir)/config.status $(srcdir)/libxfce4kbd-private-3.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -466,6 +646,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -481,15 +663,21 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libxfce4kbd-private-2.la: $(libxfce4kbd_private_2_la_OBJECTS) $(libxfce4kbd_private_2_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libxfce4kbd-private-2.la: $(libxfce4kbd_private_2_la_OBJECTS) $(libxfce4kbd_private_2_la_DEPENDENCIES) $(EXTRA_libxfce4kbd_private_2_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfce4kbd_private_2_la_LINK) $(am_libxfce4kbd_private_2_la_rpath) $(libxfce4kbd_private_2_la_OBJECTS) $(libxfce4kbd_private_2_la_LIBADD) $(LIBS) +libxfce4kbd-private-3.la: $(libxfce4kbd_private_3_la_OBJECTS) $(libxfce4kbd_private_3_la_DEPENDENCIES) $(EXTRA_libxfce4kbd_private_3_la_DEPENDENCIES) + $(AM_V_CCLD)$(libxfce4kbd_private_3_la_LINK) $(am_libxfce4kbd_private_3_la_rpath) $(libxfce4kbd_private_3_la_OBJECTS) $(libxfce4kbd_private_3_la_LIBADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -500,71 +688,119 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-grabber.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-provider.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Plo@am__quote@ .c.o: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo: xfce-shortcuts-marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-marshal.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo `test -f 'xfce-shortcuts-marshal.c' || echo '$(srcdir)/'`xfce-shortcuts-marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-marshal.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-marshal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-shortcuts-marshal.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-marshal.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo `test -f 'xfce-shortcuts-marshal.c' || echo '$(srcdir)/'`xfce-shortcuts-marshal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-marshal.lo `test -f 'xfce-shortcuts-marshal.c' || echo '$(srcdir)/'`xfce-shortcuts-marshal.c libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo: xfce-shortcuts-provider.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-provider.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo `test -f 'xfce-shortcuts-provider.c' || echo '$(srcdir)/'`xfce-shortcuts-provider.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-provider.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-provider.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-shortcuts-provider.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-provider.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo `test -f 'xfce-shortcuts-provider.c' || echo '$(srcdir)/'`xfce-shortcuts-provider.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-provider.lo `test -f 'xfce-shortcuts-provider.c' || echo '$(srcdir)/'`xfce-shortcuts-provider.c libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo: xfce-shortcuts-grabber.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-grabber.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo `test -f 'xfce-shortcuts-grabber.c' || echo '$(srcdir)/'`xfce-shortcuts-grabber.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-grabber.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-grabber.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-shortcuts-grabber.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-grabber.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo `test -f 'xfce-shortcuts-grabber.c' || echo '$(srcdir)/'`xfce-shortcuts-grabber.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-grabber.lo `test -f 'xfce-shortcuts-grabber.c' || echo '$(srcdir)/'`xfce-shortcuts-grabber.c libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo: xfce-shortcut-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcut-dialog.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcut-dialog.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcut-dialog.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-shortcut-dialog.c' object='libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcut-dialog.c' object='libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c libxfce4kbd_private_2_la-xfce-shortcuts.lo: xfce-shortcuts.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcuts.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-shortcuts.c' object='libxfce4kbd_private_2_la-xfce-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts.c' object='libxfce4kbd_private_2_la-xfce-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c + +libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo: xfce-shortcuts-xfwm4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.Tpo -c -o libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo `test -f 'xfce-shortcuts-xfwm4.c' || echo '$(srcdir)/'`xfce-shortcuts-xfwm4.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.Tpo $(DEPDIR)/libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-xfwm4.c' object='libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_2_la-xfce-shortcuts-xfwm4.lo `test -f 'xfce-shortcuts-xfwm4.c' || echo '$(srcdir)/'`xfce-shortcuts-xfwm4.c + +libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo: xfce-shortcuts-marshal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo `test -f 'xfce-shortcuts-marshal.c' || echo '$(srcdir)/'`xfce-shortcuts-marshal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-marshal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-marshal.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-marshal.lo `test -f 'xfce-shortcuts-marshal.c' || echo '$(srcdir)/'`xfce-shortcuts-marshal.c + +libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo: xfce-shortcuts-provider.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo `test -f 'xfce-shortcuts-provider.c' || echo '$(srcdir)/'`xfce-shortcuts-provider.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-provider.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-provider.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-provider.lo `test -f 'xfce-shortcuts-provider.c' || echo '$(srcdir)/'`xfce-shortcuts-provider.c + +libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo: xfce-shortcuts-grabber.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo `test -f 'xfce-shortcuts-grabber.c' || echo '$(srcdir)/'`xfce-shortcuts-grabber.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-grabber.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-grabber.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-grabber.lo `test -f 'xfce-shortcuts-grabber.c' || echo '$(srcdir)/'`xfce-shortcuts-grabber.c + +libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo: xfce-shortcut-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcut-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcut-dialog.c' object='libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcut-dialog.lo `test -f 'xfce-shortcut-dialog.c' || echo '$(srcdir)/'`xfce-shortcut-dialog.c + +libxfce4kbd_private_3_la-xfce-shortcuts.lo: xfce-shortcuts.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts.c' object='libxfce4kbd_private_3_la-xfce-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts.lo `test -f 'xfce-shortcuts.c' || echo '$(srcdir)/'`xfce-shortcuts.c + +libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo: xfce-shortcuts-xfwm4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -MT libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo -MD -MP -MF $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.Tpo -c -o libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo `test -f 'xfce-shortcuts-xfwm4.c' || echo '$(srcdir)/'`xfce-shortcuts-xfwm4.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.Tpo $(DEPDIR)/libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-shortcuts-xfwm4.c' object='libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4kbd_private_3_la_CFLAGS) $(CFLAGS) -c -o libxfce4kbd_private_3_la-xfce-shortcuts-xfwm4.lo `test -f 'xfce-shortcuts-xfwm4.c' || echo '$(srcdir)/'`xfce-shortcuts-xfwm4.c mostlyclean-libtool: -rm -f *.lo @@ -573,8 +809,11 @@ -rm -rf .libs _libs install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -588,13 +827,14 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-settingsDATA: $(settings_DATA) @$(NORMAL_INSTALL) - test -z "$(settingsdir)" || $(MKDIR_P) "$(DESTDIR)$(settingsdir)" @list='$(settings_DATA)'; test -n "$(settingsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(settingsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(settingsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -608,13 +848,35 @@ @$(NORMAL_UNINSTALL) @list='$(settings_DATA)'; test -n "$(settingsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(settingsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(settingsdir)" && rm -f $$files + dir='$(DESTDIR)$(settingsdir)'; $(am__uninstall_files_from_dir) +install-libxfce4kbd3_private_includeHEADERS: $(libxfce4kbd3_private_include_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libxfce4kbd3_private_include_HEADERS)'; test -n "$(libxfce4kbd3_private_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libxfce4kbd3_private_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libxfce4kbd3_private_includedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libxfce4kbd3_private_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libxfce4kbd3_private_includedir)" || exit $$?; \ + done + +uninstall-libxfce4kbd3_private_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libxfce4kbd3_private_include_HEADERS)'; test -n "$(libxfce4kbd3_private_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libxfce4kbd3_private_includedir)'; $(am__uninstall_files_from_dir) install-libxfce4kbd_private_includeHEADERS: $(libxfce4kbd_private_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libxfce4kbd_private_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libxfce4kbd_private_includedir)" @list='$(libxfce4kbd_private_include_HEADERS)'; test -n "$(libxfce4kbd_private_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libxfce4kbd_private_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libxfce4kbd_private_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -628,30 +890,17 @@ @$(NORMAL_UNINSTALL) @list='$(libxfce4kbd_private_include_HEADERS)'; test -n "$(libxfce4kbd_private_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libxfce4kbd_private_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libxfce4kbd_private_includedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(libxfce4kbd_private_includedir)'; $(am__uninstall_files_from_dir) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -663,15 +912,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -680,6 +925,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -723,7 +983,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(settingsdir)" "$(DESTDIR)$(libxfce4kbd_private_includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(settingsdir)" "$(DESTDIR)$(libxfce4kbd3_private_includedir)" "$(DESTDIR)$(libxfce4kbd_private_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -737,10 +997,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -777,7 +1042,8 @@ info-am: -install-data-am: install-libxfce4kbd_private_includeHEADERS \ +install-data-am: install-libxfce4kbd3_private_includeHEADERS \ + install-libxfce4kbd_private_includeHEADERS \ install-pkgconfigDATA install-settingsDATA install-dvi: install-dvi-am @@ -825,26 +1091,29 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libxfce4kbd3_private_includeHEADERS \ uninstall-libxfce4kbd_private_includeHEADERS \ uninstall-pkgconfigDATA uninstall-settingsDATA .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-libxfce4kbd3_private_includeHEADERS \ install-libxfce4kbd_private_includeHEADERS install-man \ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ install-ps-am install-settingsDATA install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libxfce4kbd3_private_includeHEADERS \ uninstall-libxfce4kbd_private_includeHEADERS \ uninstall-pkgconfigDATA uninstall-settingsDATA diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml libxfce4ui-4.12.1/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml 2015-02-18 16:12:39.000000000 +0000 @@ -3,11 +3,20 @@ - - + + + + + + + + + - + + + @@ -21,8 +30,8 @@ - - + + @@ -32,38 +41,38 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcut-dialog.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcut-dialog.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcut-dialog.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcut-dialog.c 2015-02-18 16:57:43.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -43,9 +43,6 @@ GdkEventKey *event); static gboolean xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog, GdkEventKey *event); -static gchar *xfce_shortcut_dialog_shortcut_name (XfceShortcutDialog *dialog, - guint keyval, - guint modifiers); @@ -196,73 +193,117 @@ const gchar *action_name, const gchar *action) { + GtkWidget *content_box; + GtkWidget *alignment; + GtkWidget *box; GtkWidget *button; - GtkWidget *table; GtkWidget *label; + const gchar *action_type; const gchar *title; - const gchar *action_label; + const gchar *explanation_label; + gchar *explanation_label_escaped; + gchar *explanation_label_markup; if (g_utf8_collate (provider, "xfwm4") == 0) { title = _("Window Manager Action Shortcut"); - action_label = _("Action:"); + /* TRANSLATORS: this string will be used to create an explanation for + * the user in a following string */ + action_type = _("action"); } else if (g_utf8_collate (provider, "commands") == 0) { title = _("Command Shortcut"); - action_label = _("Command:"); + /* TRANSLATORS: this string will be used to create an explanation for + * the user in a following string */ + action_type = _("command"); } else { title = _("Shortcut"); - action_label = _("Action:"); + /* TRANSLATORS: this string will be used to create an explanation for + * the user in a following string */ + action_type = _("action"); } /* Set dialog title */ gtk_window_set_title (GTK_WINDOW (dialog), title); gtk_window_set_icon_name (GTK_WINDOW (dialog), "input-keyboard"); - /* Configure dialog */ - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - /* Create clear button for xfwm4 */ if (g_utf8_collate (provider, "xfwm4") == 0) { +#if GTK_CHECK_VERSION (3, 10, 0) + button = gtk_button_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_BUTTON); +#else button = gtk_button_new_from_stock (GTK_STOCK_CLEAR); +#endif gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_REJECT); gtk_widget_show (button); } /* Create cancel button */ +#if GTK_CHECK_VERSION (3, 10, 0) + button = gtk_button_new_with_mnemonic (_("_Cancel")); +#else button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); +#endif gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL); gtk_widget_show (button); - table = gtk_table_new (2, 2, FALSE); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table); - gtk_widget_show (table); + /* Main content container */ + alignment = gtk_alignment_new (0, 0, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 6, 12, 0); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + alignment); + gtk_widget_show (alignment); + + #if GTK_CHECK_VERSION (3, 0, 0) + content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + #else + content_box = gtk_vbox_new (FALSE, 6); + #endif + gtk_container_set_border_width (GTK_CONTAINER (content_box), 6); + gtk_container_add (GTK_CONTAINER (alignment), content_box); + gtk_widget_show (content_box); + + /* TRANSLATORS: this creates the explanation for the user. The first %s is replaced + * by the action type which you translated earlier, the second %s is replaced by the + * action name which comes from somewhere else. + * THE ORDER MUSTN'T BE REVERSED! */ + explanation_label = + g_strdup_printf (_("Press now the keyboard keys you want to use to trigger the %s '%s'."), + action_type, action_name); + explanation_label_escaped = g_markup_escape_text (explanation_label, -1); + explanation_label_markup = g_strdup_printf ("%s", explanation_label_escaped); - label = gtk_label_new (action_label); + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), explanation_label_markup); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_container_add (GTK_CONTAINER (content_box), label); gtk_widget_show (label); + g_free (explanation_label_escaped); + g_free (explanation_label_markup); - label = gtk_label_new (action_name); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); - gtk_widget_show (label); + /* Box and labels to display the shortcut currently being grabbed. + * It will be updated to key-press events. */ + #if GTK_CHECK_VERSION (3, 0, 0) + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + #else + box = gtk_hbox_new (FALSE, 12); + #endif + gtk_container_add (GTK_CONTAINER (content_box), box); + gtk_widget_show (box); label = gtk_label_new (_("Shortcut:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + gtk_container_add (GTK_CONTAINER (box), label); gtk_widget_show (label); - dialog->shortcut_label = gtk_label_new (NULL); + dialog->shortcut_label = gtk_label_new (_("No keys pressed yet, proceed.")); gtk_misc_set_alignment (GTK_MISC (dialog->shortcut_label), 0.0, 0.5); - gtk_table_attach_defaults (GTK_TABLE (table), dialog->shortcut_label, 1, 2, 1, 2); + gtk_container_add (GTK_CONTAINER (box), dialog->shortcut_label); gtk_widget_show (dialog->shortcut_label); /* Connect to key release signal for determining the new shortcut */ @@ -276,15 +317,46 @@ xfce_shortcut_dialog_run (XfceShortcutDialog *dialog, GtkWidget *parent) { - gint response = GTK_RESPONSE_CANCEL; +#if GTK_CHECK_VERSION (3, 0, 0) + GdkDisplay *display; + GdkDevice *device; + GdkDeviceManager *device_manager; + GList *devices, *li; + gboolean succeed = FALSE; +#endif + gint response = GTK_RESPONSE_CANCEL; g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (dialog), GTK_RESPONSE_CANCEL); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent)); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); +#if GTK_CHECK_VERSION (3, 0, 0) + display = gtk_widget_get_display (GTK_WIDGET (dialog)); + device_manager = gdk_display_get_device_manager (display); + devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER); + + for (li = devices; li != NULL; li =li->next) + { + device = li->data; + if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD) + continue; + + if (gdk_device_grab (device, gdk_screen_get_root_window (gdk_display_get_default_screen (display)), + GDK_OWNERSHIP_WINDOW, TRUE, + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, + NULL, GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS) + { + succeed = TRUE; + } + } + + /* Take control on the keyboard */ + if (succeed) +#else /* Take control on the keyboard */ if (G_LIKELY (gdk_keyboard_grab (gtk_widget_get_root_window (GTK_WIDGET (dialog)), TRUE, GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)) +#endif { /* Run the dialog and wait for the user to enter a valid shortcut */ response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -296,11 +368,27 @@ dialog->shortcut = g_strdup (""); } +#if GTK_CHECK_VERSION (3, 0, 0) + /* Release keyboard */ + for (li = devices; li != NULL; li =li->next) + { + device = li->data; + if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) + gdk_device_ungrab (device, GDK_CURRENT_TIME); + } +#else /* Release keyboard */ gdk_keyboard_ungrab (GDK_CURRENT_TIME); +#endif } else - g_warning ("%s", _("Could not grab the keyboard.")); + { + g_warning (_("Could not grab the keyboard.")); + } + +#if GTK_CHECK_VERSION (3, 0, 0) + g_list_free (devices); +#endif /* Return the response ID */ return response; @@ -312,21 +400,56 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog, GdkEventKey *event) { - gchar *text; - gchar *shortcut; + GdkKeymap *keymap; + GdkModifierType consumed, modifiers; + guint keyval, mod_mask; + gchar *text; + gchar *escaped_label; + gchar *label; g_free (dialog->shortcut); - /* Determine and remember the current shortcut */ - dialog->shortcut = xfce_shortcut_dialog_shortcut_name (dialog, event->keyval, event->state); + /* Get the keyboard state */ + mod_mask = gtk_accelerator_get_default_mod_mask (); + keymap = gdk_keymap_get_default (); + modifiers = event->state; + + gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode, + modifiers, event->group, + &keyval, NULL, NULL, &consumed); + + /* We want Alt + Print to be Alt + Print not SysReq. See bug #7897 */ + if (keyval == GDK_KEY_Sys_Req && (modifiers & GDK_MOD1_MASK) != 0) + { + consumed = 0; + keyval = GDK_KEY_Print; + } + + /* Get the modifiers */ - shortcut = g_markup_escape_text (dialog->shortcut, -1); - text = g_strdup_printf ("%s", shortcut); + /* If Shift was used when translating the keyboard state, we remove it + * from the consumed bit because gtk_accelerator_{name,parse} fail to + * handle this correctly. This allows us to have shortcuts with Shift + * as a modifier key (see bug #8744). */ + if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) + consumed &= ~GDK_SHIFT_MASK; + + modifiers &= ~consumed; + modifiers &= mod_mask; + + /* Get and store the pressed shortcut */ + dialog->shortcut = gtk_accelerator_name (keyval, modifiers); + + label = gtk_accelerator_get_label (keyval, modifiers); + escaped_label = g_markup_escape_text (label, -1); + text = g_strdup_printf ("%s", + escaped_label); gtk_label_set_markup (GTK_LABEL (dialog->shortcut_label), text); + g_free (label); + g_free (escaped_label); g_free (text); - g_free (shortcut); return FALSE; } @@ -345,8 +468,10 @@ /* Check if the shortcut was accepted */ if (G_LIKELY (shortcut_accepted)) { +#if !GTK_CHECK_VERSION (3, 0, 0) /* Release keyboard */ gdk_keyboard_ungrab (GDK_CURRENT_TIME); +#endif /* Exit dialog with positive response */ gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); @@ -354,94 +479,14 @@ else { /* Clear label */ - gtk_label_set_markup (GTK_LABEL (dialog->shortcut_label), ""); + gtk_label_set_markup (GTK_LABEL (dialog->shortcut_label), + _("No keys pressed yet, proceed.")); } return FALSE; } - -static gchar * -xfce_shortcut_dialog_shortcut_name (XfceShortcutDialog *dialog, - guint keyval, - guint modifiers) -{ - XModifierKeymap *modmap; - Display *display; - const KeySym *keysyms; - KeyCode keycode; - KeySym *keymap; - gint keysyms_per_keycode = 0; - gint min_keycode = 0; - gint max_keycode = 0; - gint mask; - gint i; - gint j; - - g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (dialog), NULL); - - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - - gdk_error_trap_push (); - - XDisplayKeycodes (display, &min_keycode, &max_keycode); - - keymap = XGetKeyboardMapping (display, min_keycode, max_keycode - min_keycode + 1, &keysyms_per_keycode); - - if (G_LIKELY (keymap != NULL)) - { - modmap = XGetModifierMapping (display); - - if (G_LIKELY (modmap != NULL)) - { - for (i = 0; i < 8 * modmap->max_keypermod; ++i) - { - keycode = modmap->modifiermap[i]; - - if (keycode == 0 || keycode < min_keycode || keycode > max_keycode) - continue; - - keysyms = keymap + (keycode - min_keycode) * keysyms_per_keycode; - mask = 1 << (i / modmap->max_keypermod); - - for (j = 0; j < keysyms_per_keycode; ++j) - { - if (keysyms[j] == GDK_Super_L || keysyms[j] == GDK_Super_R) - modifiers &= ~mask; - -#if 0 - if (keysyms[j] == GDK_Meta_L || keysyms[j] == GDK_Meta_R) - modifiers &= ~mask; -#endif - - if (keysyms[j] == GDK_Hyper_L || keysyms[j] == GDK_Hyper_R) - modifiers &= ~mask; - - if (keysyms[j] == GDK_Scroll_Lock) - modifiers &= ~mask; - - if (keysyms[j] == GDK_Num_Lock) - modifiers &= ~mask; - - if (keysyms[j] == GDK_Caps_Lock) - modifiers &= ~mask; - } - } - - XFreeModifiermap (modmap); - } - - XFree (keymap); - } - - gdk_flush (); - gdk_error_trap_pop (); - - return gtk_accelerator_name (keyval, modifiers); -} - - const gchar* xfce_shortcut_dialog_get_shortcut (XfceShortcutDialog *dialog) diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcut-dialog.h libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcut-dialog.h --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcut-dialog.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcut-dialog.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts.c 2015-02-18 16:57:43.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -33,6 +33,7 @@ #include #include +#include @@ -49,8 +50,8 @@ static XfceShortcutConflictMessage conflict_messages[] = { { "xfwm4", "xfwm4", - N_("This shortcut is already being used for another window manager action. Which action do you want to use?"), - N_("Use '%s'"), N_("Keep the other one") }, + N_("This shortcut is already being used for the action '%s'. Which action do you want to use?"), + N_("Use '%s'"), N_("Keep '%s'") }, { "xfwm4", "commands", N_("This shortcut is already being used for the command '%s'. Which action do you want to use?"), N_("Use '%s'"), N_("Keep '%s'") }, @@ -58,30 +59,38 @@ N_("This shortcut is already being used for the command '%s'. Which action do you want to use?"), N_("Use '%s'"), N_("Keep '%s'") }, { "commands", "xfwm4", - N_("This shortcut is already being used by a window manager action. Which action do you want to use?"), - N_("Use '%s'"), N_("Keep the window manager action") }, + N_("This shortcut is already being used by the action '%s'. Which action do you want to use?"), + N_("Use '%s'"), N_("Keep '%s'") }, { 0, 0, NULL, NULL, NULL }, }; gint -xfce_shortcut_conflict_dialog (const gchar *owner, +xfce_shortcut_conflict_dialog (GtkWindow *parent, + const gchar *owner, const gchar *other, const gchar *shortcut, const gchar *owner_action, const gchar *other_action, gboolean ignore_same_provider) { - gchar *title; - gchar *secondary_text; - gchar *owner_action_name; - gchar *other_action_name; - gchar *owner_button_text; - gchar *other_button_text; - gboolean handled = FALSE; - gint response = GTK_RESPONSE_ACCEPT; - gint i; + GdkModifierType modifiers; + gboolean handled; + gchar *other_action_name; + gchar *other_button_text; + gchar *owner_action_name; + gchar *owner_button_text; + gchar *secondary_text; + gchar *shortcut_label; + gchar *title; + guint keyval; + gint response; + gint i; + + /* Default values */ + response = GTK_RESPONSE_ACCEPT; + handled = FALSE; /* Make sure to use the translations from libxfce4ui */ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); @@ -89,24 +98,67 @@ if (g_utf8_collate (owner, other) == 0 && ignore_same_provider) return GTK_RESPONSE_ACCEPT; + /* Get the shortcut label */ + gtk_accelerator_parse (shortcut, &keyval, &modifiers); + shortcut_label = gtk_accelerator_get_label (keyval, modifiers); + if (g_utf8_collate (owner, other) == 0 && g_utf8_collate (owner_action, other_action) == 0) - return GTK_RESPONSE_ACCEPT; + { + /* This shortcut already exists in the provider, we don't want it twice */ - title = g_strdup_printf (_("Conflicting actions for %s"), shortcut); + /* Warn the user */ + xfce_dialog_show_warning (parent, _("Please use another key combination."), + _("%s already triggers this action."), shortcut_label); + + return GTK_RESPONSE_REJECT; + } + + title = g_strdup_printf (_("Conflicting actions for %s"), shortcut_label); for (i = 0; conflict_messages[i].message != NULL; ++i) if (g_utf8_collate (conflict_messages[i].owner_name, owner) == 0 && g_utf8_collate (conflict_messages[i].other_name, other) == 0) { - owner_action_name = owner_action == NULL ? NULL : g_markup_escape_text (owner_action, -1); - other_action_name = other_action == NULL ? NULL : g_markup_escape_text (other_action, -1); + if (owner_action == NULL) + owner_action_name = NULL; + else if (g_utf8_collate (owner, "xfwm4") == 0) + { + DBG ("Owner action %s is an xfwm4 action, get the string", owner_action); + + /* We need to get the human readable string of the action name */ + owner_action_name = + g_strdup (xfce_shortcuts_xfwm4_get_feature_name (owner_action)); + + } + else + owner_action_name = g_strdup(owner_action); + + DBG ("Owner action name: %s", owner_action_name); + + if (other_action == NULL) + other_action_name = NULL; + else if (g_utf8_collate (other, "xfwm4") == 0) + { + /* We need to get the human readable string of the action name */ + + other_action_name = + g_strdup (xfce_shortcuts_xfwm4_get_feature_name (other_action)); + + } + else + other_action_name = g_strdup (other_action); secondary_text = g_strdup_printf (_(conflict_messages[i].message), other_action_name); - owner_button_text = g_markup_printf_escaped (_(conflict_messages[i].owner_button_text), owner_action_name); - other_button_text = g_markup_printf_escaped (_(conflict_messages[i].other_button_text), other_action_name); + owner_button_text = g_strdup_printf (_(conflict_messages[i].owner_button_text), owner_action_name); + other_button_text = g_strdup_printf (_(conflict_messages[i].other_button_text), other_action_name); - response = xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_QUESTION, + response = xfce_message_dialog (parent, title, +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_QUESTION, +#else + "dialog-question", +#endif title, secondary_text, XFCE_BUTTON_TYPE_MIXED, NULL, owner_button_text, GTK_RESPONSE_ACCEPT, XFCE_BUTTON_TYPE_MIXED, NULL, other_button_text, GTK_RESPONSE_REJECT, @@ -117,6 +169,7 @@ g_free (secondary_text); g_free (other_action_name); g_free (owner_action_name); + g_free (shortcut_label); handled = TRUE; break; @@ -124,9 +177,19 @@ if (G_UNLIKELY (!handled)) { - xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_ERROR, + xfce_message_dialog (parent, title, +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_ERROR, +#else + "dialog-error", +#endif title, _("This shortcut is already being used for something else."), - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_CLOSE, +#else + "window-close", +#endif + GTK_RESPONSE_CLOSE, NULL); response = GTK_RESPONSE_REJECT; } diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-grabber.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-grabber.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-grabber.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-grabber.c 2015-02-18 16:57:43.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -41,45 +42,8 @@ #define XFCE_SHORTCUTS_GRABBER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFCE_TYPE_SHORTCUTS_GRABBER, XfceShortcutsGrabberPrivate)) - - - -#define MODIFIER_MASK (GDK_SHIFT_MASK | \ - GDK_CONTROL_MASK | \ - GDK_MOD1_MASK | \ - GDK_MOD2_MASK | \ - GDK_MOD3_MASK | \ - GDK_MOD4_MASK | \ - GDK_MOD5_MASK) - -#define IGNORE_MASK (0x2000 | \ - GDK_LOCK_MASK | \ - GDK_HYPER_MASK | \ - GDK_SUPER_MASK | \ - GDK_META_MASK) - - - -/* Property identifiers */ -enum -{ - PROP_0, -}; - - - -/* Cache indices for modifiers */ -enum -{ - CACHE_SUPER, - CACHE_HYPER, - CACHE_META, - CACHE_CAPS_LOCK, - CACHE_NUM_LOCK, - CACHE_SCROLL_LOCK, - CACHE_LAST, -}; - +#define MODIFIERS_ERROR ((GdkModifierType)(-1)) +#define MODIFIERS_NONE 0 typedef struct _XfceKey XfceKey; @@ -88,27 +52,13 @@ static void xfce_shortcuts_grabber_constructed (GObject *object); static void xfce_shortcuts_grabber_finalize (GObject *object); -static void xfce_shortcuts_grabber_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void xfce_shortcuts_grabber_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); static void xfce_shortcuts_grabber_keys_changed (GdkKeymap *keymap, XfceShortcutsGrabber *grabber); static void xfce_shortcuts_grabber_grab_all (XfceShortcutsGrabber *grabber); static void xfce_shortcuts_grabber_ungrab_all (XfceShortcutsGrabber *grabber); -static void xfce_shortcuts_grabber_reload_modifiers (XfceShortcutsGrabber *grabber); -static void xfce_shortcuts_grabber_parse_shortcut (XfceShortcutsGrabber *grabber, - const gchar *shortcut, - guint *keycode, - guint *modifiers); static void xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, XfceKey *key, gboolean grab); -static guint xfce_shortcuts_grabber_get_ignore_mask (XfceShortcutsGrabber *grabber); static GdkFilterReturn xfce_shortcuts_grabber_event_filter (GdkXEvent *gdk_xevent, GdkEvent *event, XfceShortcutsGrabber *grabber); @@ -118,12 +68,11 @@ struct _XfceShortcutsGrabberPrivate { GHashTable *keys; - guint modifiers[CACHE_LAST]; }; struct _XfceKey { - guint keycode; + guint keyval; guint modifiers; }; @@ -143,8 +92,6 @@ gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = xfce_shortcuts_grabber_constructed; gobject_class->finalize = xfce_shortcuts_grabber_finalize; - gobject_class->get_property = xfce_shortcuts_grabber_get_property; - gobject_class->set_property = xfce_shortcuts_grabber_set_property; g_signal_new ("shortcut-activated", XFCE_TYPE_SHORTCUTS_GRABBER, @@ -166,7 +113,12 @@ grabber->priv = XFCE_SHORTCUTS_GRABBER_GET_PRIVATE (grabber); grabber->priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - xfce_shortcuts_grabber_reload_modifiers (grabber); + /* Workaround: Make sure modmap is up to date + * There is possibly a bug in GTK+ where virtual modifiers are not + * mapped because the modmap is not updated. The following function + * updates it. + */ + (void) gdk_keymap_have_bidi_layouts (gdk_keymap_get_default ()); } @@ -208,53 +160,14 @@ static void -xfce_shortcuts_grabber_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ -#if 0 - XfceShortcutsGrabber *grabber = XFCE_SHORTCUTS_GRABBER (object); -#endif - - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - - - -static void -xfce_shortcuts_grabber_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ -#if 0 - XfceShortcutsGrabber *grabber = XFCE_SHORTCUTS_GRABBER (object); -#endif - - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - - - -static void xfce_shortcuts_grabber_keys_changed (GdkKeymap *keymap, XfceShortcutsGrabber *grabber) { g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); + TRACE ("Keys changed, regrabbing"); + xfce_shortcuts_grabber_ungrab_all (grabber); - xfce_shortcuts_grabber_reload_modifiers (grabber); xfce_shortcuts_grabber_grab_all (grabber); } @@ -301,245 +214,146 @@ static void -xfce_shortcuts_grabber_reload_modifiers (XfceShortcutsGrabber *grabber) +xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, + XfceKey *key, + gboolean grab) { - XModifierKeymap *modmap; - const KeySym *keysyms; - Display *display; - KeyCode keycode; - KeySym *keymap; - gint keysyms_per_keycode = 0; - gint min_keycode = 0; - gint max_keycode = 0; - gint mask; - gint i; - gint j; + GdkModifierType numlock_modifier; + GdkKeymapKey *keys; + GdkDisplay *display; + GdkKeymap *keymap; + gchar *shortcut_name; + guint modifiers; + guint k; + gint i, j; + gint n_keys; + gint screens; g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); + g_return_if_fail (key != NULL); - for (i = 0; i < CACHE_LAST; ++i) - grabber->priv->modifiers[i] = 0; - - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + display = gdk_display_get_default (); +#if GTK_CHECK_VERSION (3, 10, 0) + screens = 1; +#else + screens = gdk_display_get_n_screens (display); +#endif + keymap = gdk_keymap_get_default (); - gdk_error_trap_push (); + /* Map virtual modifiers to non-virtual modifiers */ + modifiers = key->modifiers; + gdk_keymap_map_virtual_modifiers (keymap, &modifiers); - XDisplayKeycodes (display, &min_keycode, &max_keycode); + /* Debugging information */ + shortcut_name = gtk_accelerator_name (key->keyval, modifiers); - keymap = XGetKeyboardMapping (display, min_keycode, max_keycode - min_keycode + 1, - &keysyms_per_keycode); + if (grab) + TRACE ("Grabbing %s", shortcut_name); + else + TRACE ("Ungrabbing %s", shortcut_name); - if (G_UNLIKELY (keymap == NULL)) - return; + TRACE ("Keyval: %d", key->keyval); + TRACE ("Modifiers: 0x%x", modifiers); - modmap = XGetModifierMapping (display); + g_free (shortcut_name); - if (G_UNLIKELY (modmap == NULL)) + if (modifiers == key->modifiers && + (GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_META_MASK) & modifiers) { - XFree (keymap); + TRACE ("Failed to map virtual modifiers"); return; } - for (i = 0; i < 8 * modmap->max_keypermod; ++i) - { - keycode = modmap->modifiermap[i]; - - if (keycode == 0 || keycode < min_keycode || keycode > max_keycode) - continue; - - keysyms = keymap + (keycode - min_keycode) * keysyms_per_keycode; - mask = 1 << (i / modmap->max_keypermod); - - for (j = 0; j < keysyms_per_keycode; ++j) - { - if (keysyms[j] == GDK_Super_L || keysyms[j] == GDK_Super_R) - grabber->priv->modifiers[CACHE_SUPER] = mask; - - if (keysyms[j] == GDK_Meta_L || keysyms[j] == GDK_Meta_R) - grabber->priv->modifiers[CACHE_META] = mask; - - if (keysyms[j] == GDK_Hyper_L || keysyms[j] == GDK_Hyper_R) - grabber->priv->modifiers[CACHE_HYPER] = mask; - - if (keysyms[j] == GDK_Scroll_Lock) - grabber->priv->modifiers[CACHE_SCROLL_LOCK] = mask; - - if (keysyms[j] == GDK_Num_Lock) - grabber->priv->modifiers[CACHE_NUM_LOCK] = mask; - - if (keysyms[j] == GDK_Caps_Lock) - grabber->priv->modifiers[CACHE_CAPS_LOCK] = mask; - } - } - - XFreeModifiermap (modmap); - XFree (keymap); - - gdk_flush (); - gdk_error_trap_pop (); -} - - - -static void -xfce_shortcuts_grabber_parse_shortcut (XfceShortcutsGrabber *grabber, - const gchar *shortcut, - guint *keycode, - guint *modifiers) -{ - guint keyval; - - g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); - - gtk_accelerator_parse (shortcut, &keyval, modifiers); - - *keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), keyval); - - if ((*modifiers & GDK_SUPER_MASK) == GDK_SUPER_MASK) - { - *modifiers |= grabber->priv->modifiers[CACHE_SUPER]; - *modifiers ^= GDK_SUPER_MASK; - } - - if ((*modifiers & GDK_HYPER_MASK) == GDK_HYPER_MASK) + /* Get all keys generating keyval */ + if (!gdk_keymap_get_entries_for_keyval (keymap,key->keyval, + &keys, &n_keys)) { - *modifiers |= grabber->priv->modifiers[CACHE_HYPER]; - *modifiers ^= GDK_HYPER_MASK; + TRACE ("Got no keys for keyval"); + return; } - if ((*modifiers & GDK_META_MASK) == GDK_META_MASK) + if (n_keys == 0) { - *modifiers |= grabber->priv->modifiers[CACHE_META]; - *modifiers ^= GDK_META_MASK; - } - - *modifiers &= MODIFIER_MASK; - *modifiers &= ~xfce_shortcuts_grabber_get_ignore_mask (grabber); -} - - - -gchar * -xfce_shortcuts_grabber_shortcut_name (XfceShortcutsGrabber *grabber, - guint keycode, - guint modifiers) -{ - Display *display; - KeySym keysym; + g_free (keys); - g_return_val_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber), NULL); - - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - keysym = XKeycodeToKeysym (display, keycode, 0); - - modifiers &= MODIFIER_MASK; - modifiers &= ~xfce_shortcuts_grabber_get_ignore_mask (grabber); - - if ((modifiers & grabber->priv->modifiers[CACHE_SUPER]) != 0) - { - modifiers |= GDK_SUPER_MASK; - modifiers ^= grabber->priv->modifiers[CACHE_SUPER]; + TRACE ("Got 0 keys for keyval"); + return; } - if ((modifiers & grabber->priv->modifiers[CACHE_HYPER]) != 0) - { - modifiers |= GDK_HYPER_MASK; - modifiers ^= grabber->priv->modifiers[CACHE_HYPER]; - } + numlock_modifier = + XkbKeysymToModifiers (GDK_DISPLAY_XDISPLAY (display), GDK_KEY_Num_Lock); -#if 0 - if ((modifiers & grabber->priv->modifiers[CACHE_META]) != 0) + for (i = 0; i < n_keys; i ++) { - modifiers |= GDK_META_MASK; - modifiers ^= grabber->priv->modifiers[CACHE_META]; - } -#endif - - return gtk_accelerator_name (keysym, modifiers); -} - - - -static void -xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber, - XfceKey *key, - gboolean grab) -{ - GdkDisplay *display; - GdkScreen *screen; - Window window; - guint bits[32]; - guint current_mask; - guint n_bits; - guint screens; - guint modifiers; - guint ignored_modifiers = 0; - gint i; - guint j; - guint k; - - g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber)); - g_return_if_fail (key != NULL); - - display = gdk_display_get_default (); - screens = gdk_display_get_n_screens (display); - - ignored_modifiers = xfce_shortcuts_grabber_get_ignore_mask (grabber); - - modifiers = key->modifiers & MODIFIER_MASK & ~ignored_modifiers; + /* Grab all hardware keys generating keyval */ - /* Store indices of all the set bits of the ignore mask in an array */ - for (i = 0, n_bits = 0; i < 32; ++i, ignored_modifiers >>= 1) - if ((ignored_modifiers & 0x1) == 0x1) - bits[n_bits++] = i; + TRACE ("Keycode: %d", keys[i].keycode); - for (i = 0; i < (1 << n_bits); ++i) - { - /* Map bits in the counter to those in the mask and thereby retrieve all ignored bit - * mask combinations */ - for (current_mask = 0, j = 0; j < n_bits; ++j) - if ((i & (1 << j)) != 0) - current_mask |= (1 << bits[j]); - - /* Grab key on all screens */ - for (k = 0; k < screens; ++k) + for (j = 0; j < screens; j++) { - /* Get current screen and X root window */ - screen = gdk_display_get_screen (display, k); - window = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)); + /* Do the grab on all screens */ + Window root_window; + + /* Ignorable modifiers */ + guint mod_masks [] = { + 0, + GDK_MOD2_MASK, + numlock_modifier | GDK_MOD2_MASK, + GDK_LOCK_MASK, + numlock_modifier | GDK_LOCK_MASK, + GDK_MOD5_MASK, + numlock_modifier | GDK_MOD5_MASK, + GDK_MOD2_MASK | GDK_LOCK_MASK, + numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK, + GDK_MOD2_MASK | GDK_MOD5_MASK, + numlock_modifier | GDK_MOD2_MASK | GDK_MOD5_MASK, + GDK_LOCK_MASK | GDK_MOD5_MASK, + numlock_modifier | GDK_LOCK_MASK | GDK_MOD5_MASK, + GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, + numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK, + }; + +#if GTK_CHECK_VERSION (3, 0, 0) + /* Retrieve the root window of the screen */ + root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (gdk_display_get_screen (display, j))); +#else + /* Retrieve the root window of the screen */ + root_window = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (gdk_display_get_screen (display, j))); +#endif gdk_error_trap_push (); - if (grab) + for (k = 0; k < G_N_ELEMENTS (mod_masks); k++) { - XGrabKey (GDK_DISPLAY_XDISPLAY (display), key->keycode, current_mask | modifiers, - window, FALSE, GrabModeAsync, GrabModeAsync); + /* Take ignorable modifiers into account when grabbing */ + if (grab) + XGrabKey (GDK_DISPLAY_XDISPLAY (display), + keys[i].keycode, + modifiers | mod_masks [k], + root_window, + False, + GrabModeAsync, + GrabModeAsync); + else + XUngrabKey (GDK_DISPLAY_XDISPLAY (display), + keys[i].keycode, + modifiers | mod_masks [k], + root_window); } - else - XUngrabKey (GDK_DISPLAY_XDISPLAY (display), key->keycode, current_mask | modifiers, - window); gdk_flush (); - gdk_error_trap_pop (); + + if (gdk_error_trap_pop ()) + { + if (grab) + TRACE ("Failed to grab"); + else + TRACE ("Failed to ungrab"); + } } } -} - - -static guint -xfce_shortcuts_grabber_get_ignore_mask (XfceShortcutsGrabber *grabber) -{ - guint mask = 0; - - g_return_val_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber), 0); - - mask |= 0x200 | GDK_LOCK_MASK | GDK_HYPER_MASK | GDK_SUPER_MASK | GDK_META_MASK; - mask |= grabber->priv->modifiers[CACHE_CAPS_LOCK]; - mask |= grabber->priv->modifiers[CACHE_NUM_LOCK]; - mask |= grabber->priv->modifiers[CACHE_SCROLL_LOCK]; - - return mask; + g_free (keys); } @@ -547,7 +361,8 @@ struct EventKeyFindContext { XfceShortcutsGrabber *grabber; - XKeyEvent *xevent; + GdkModifierType modifiers; + guint keyval; const gchar *result; }; @@ -558,29 +373,21 @@ XfceKey *key, struct EventKeyFindContext *context) { - gchar *name; - gboolean result = FALSE; + g_return_val_if_fail (context != NULL, FALSE); - g_return_val_if_fail (context != NULL, TRUE); - g_return_val_if_fail (context->xevent != NULL, TRUE); + TRACE ("Comparing to %s", shortcut); - gdk_error_trap_push (); - - name = xfce_shortcuts_grabber_shortcut_name (context->grabber, context->xevent->keycode, - context->xevent->state); - - if (G_UNLIKELY (g_str_equal (shortcut, name))) + if ((key->modifiers & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK | GDK_SUPER_MASK)) + == (context->modifiers) + && (key->keyval == context->keyval)) { context->result = shortcut; - result = TRUE; - } - - g_free (name); - gdk_flush (); - gdk_error_trap_pop (); + TRACE ("Positive match for %s", context->result); + return TRUE; + } - return result; + return FALSE; } @@ -590,9 +397,13 @@ GdkEvent *event, XfceShortcutsGrabber *grabber) { - struct EventKeyFindContext context; - XEvent *xevent; - gint timestamp; + struct EventKeyFindContext context; + GdkKeymap *keymap; + GdkModifierType consumed, modifiers; + XEvent *xevent; + guint keyval, mod_mask; + gchar *raw_shortcut_name; + gint timestamp; g_return_val_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber), GDK_FILTER_CONTINUE); @@ -602,14 +413,77 @@ return GDK_FILTER_CONTINUE; context.grabber = grabber; - context.xevent = (XKeyEvent *) xevent; context.result = NULL; - timestamp = context.xevent->time; + timestamp = xevent->xkey.time; + + /* Get the keyboard state */ + gdk_error_trap_push (); + keymap = gdk_keymap_get_default (); + mod_mask = gtk_accelerator_get_default_mod_mask (); + modifiers = xevent->xkey.state; + + gdk_keymap_translate_keyboard_state (keymap, xevent->xkey.keycode, + modifiers, + XkbGroupForCoreState (xevent->xkey.state), + &keyval, NULL, NULL, &consumed); + + /* We want Alt + Print to be Alt + Print not SysReq. See bug #7897 */ + if (keyval == GDK_KEY_Sys_Req && (modifiers & GDK_MOD1_MASK) != 0) + { + consumed = 0; + keyval = GDK_KEY_Print; + } + + /* Get the modifiers */ + + /* If Shift was used when translating the keyboard state, we remove it + * from the consumed bit because gtk_accelerator_{name,parse} fail to + * handle this correctly. This allows us to have shortcuts with Shift + * as a modifier key (see bug #8744). */ + if ((modifiers & GDK_SHIFT_MASK) && (consumed & GDK_SHIFT_MASK)) + consumed &= ~GDK_SHIFT_MASK; + + /* + * !!! FIX ME !!! + * Turn MOD4 into SUPER key press events. Although it is not clear if + * this is a proper solution, it fixes bug #10373 which some people + * experience without breaking functionality for other users. + */ + if (modifiers & GDK_MOD4_MASK) + { + modifiers &= ~GDK_MOD4_MASK; + modifiers |= GDK_SUPER_MASK; + consumed &= ~GDK_MOD4_MASK; + consumed &= ~GDK_SUPER_MASK; + } + + modifiers &= ~consumed; + modifiers &= mod_mask; + + /* Use the keyval and modifiers values of gtk_accelerator_parse. We + * will compare them with values we also get from this function and as + * it has its own logic, it's easier and safer to do so. + * See bug #8744 for a "live" example. */ + raw_shortcut_name = gtk_accelerator_name (keyval, modifiers); + gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers); + + TRACE ("Looking for %s", raw_shortcut_name); + g_free (raw_shortcut_name); g_hash_table_foreach (grabber->priv->keys, (GHFunc) find_event_key, &context); if (G_LIKELY (context.result != NULL)) - g_signal_emit_by_name (grabber, "shortcut-activated", context.result, timestamp); + /* We had a positive match */ + g_signal_emit_by_name (grabber, "shortcut-activated", + context.result, timestamp); + + gdk_flush (); + +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else + gdk_error_trap_pop (); +#endif return GDK_FILTER_CONTINUE; } @@ -635,13 +509,15 @@ key = g_new0 (XfceKey, 1); - xfce_shortcuts_grabber_parse_shortcut (grabber, shortcut, &key->keycode, &key->modifiers); + gtk_accelerator_parse (shortcut, &key->keyval, &key->modifiers); - if (G_LIKELY (key->keycode != 0)) + if (G_LIKELY (key->keyval != 0)) { xfce_shortcuts_grabber_grab (grabber, key, TRUE); g_hash_table_insert (grabber->priv->keys, g_strdup (shortcut), key); } + else + g_free (key); } diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-grabber.h libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-grabber.h --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-grabber.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-grabber.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -39,9 +39,6 @@ GType xfce_shortcuts_grabber_get_type (void) G_GNUC_CONST; XfceShortcutsGrabber *xfce_shortcuts_grabber_new (void) G_GNUC_MALLOC; -gchar *xfce_shortcuts_grabber_shortcut_name (XfceShortcutsGrabber *grabber, - guint keycode, - guint modifiers); void xfce_shortcuts_grabber_add (XfceShortcutsGrabber *grabber, const gchar *shortcut); void xfce_shortcuts_grabber_remove (XfceShortcutsGrabber *grabber, diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts.h libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts.h --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts.h 2013-10-04 08:51:42.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -26,7 +26,8 @@ G_BEGIN_DECLS -gboolean xfce_shortcut_conflict_dialog (const gchar *owner, +gboolean xfce_shortcut_conflict_dialog (GtkWindow *parent, + const gchar *owner, const gchar *other, const gchar *shortcut, const gchar *owner_action, diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-marshal.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-marshal.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-marshal.c 2011-12-23 16:13:06.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-marshal.c 2015-03-15 18:15:00.000000000 +0000 @@ -5,7 +5,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-provider.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-provider.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-provider.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-provider.c 2015-02-18 16:12:39.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or @@ -409,7 +409,7 @@ g_return_val_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (provider), TRUE); g_return_val_if_fail (XFCONF_IS_CHANNEL (provider->priv->channel), TRUE); - if (G_UNLIKELY (!G_IS_VALUE (value) || G_VALUE_TYPE (value) != G_TYPE_STRING)) + if (G_UNLIKELY (!G_IS_VALUE (value))) return FALSE; shortcut = property + strlen (provider->priv->default_base_property) + strlen ("/"); @@ -418,7 +418,7 @@ DBG ("shortcut = %s, command = %s", shortcut, command); custom_property = g_strconcat (provider->priv->custom_base_property, "/", shortcut, NULL); - xfconf_channel_set_string (provider->priv->channel, custom_property, command); + xfconf_channel_set_property (provider->priv->channel, custom_property, value); g_free (custom_property); return FALSE; @@ -575,9 +575,9 @@ xfce_shortcuts_provider_has_shortcut (XfceShortcutsProvider *provider, const gchar *shortcut) { + gboolean has_property; gchar *base_property; gchar *property; - gboolean has_property; g_return_val_if_fail (XFCE_IS_SHORTCUTS_PROVIDER (provider), FALSE); g_return_val_if_fail (XFCONF_IS_CHANNEL (provider->priv->channel), FALSE); @@ -591,6 +591,56 @@ has_property = xfconf_channel_has_property (provider->priv->channel, property); g_free (property); + if (!has_property && g_strrstr (shortcut, "")) + { + /* We want to match a shortcut with . Older versions of + * GTK+ used and this might be stored in Xfconf. We need + * to check for this too. */ + + const gchar *primary; + const gchar *p, *s; + GString *replaced; + gchar *with_control_shortcut; + + replaced = g_string_sized_new (strlen (shortcut)); + primary = "Primary"; + + /* Replace Primary in the string by Control using the same logic + * as exo_str_replace. */ + + while (*shortcut != '\0') + { + if (G_UNLIKELY (*shortcut == *primary)) + { + /* compare the pattern to the current string */ + for (p = primary + 1, s = shortcut + 1; *p == *s; ++s, ++p) + if (*p == '\0' || *s == '\0') + break; + + /* check if the pattern fully matched */ + if (G_LIKELY (*p == '\0')) + { + g_string_append (replaced, "Control"); + shortcut = s; + continue; + } + } + + g_string_append_c (replaced, *shortcut++); + } + + with_control_shortcut = g_string_free (replaced, FALSE); + + DBG ("Looking for old GTK+ shortcut %s", with_control_shortcut); + + property = + g_strconcat (base_property, "/", with_control_shortcut, NULL); + has_property = xfconf_channel_has_property (provider->priv->channel, property); + g_free (property); + + g_free (with_control_shortcut); + } + return has_property; } diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-provider.h libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-provider.h --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-provider.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-provider.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,5 @@ /* vi:set expandtab sw=2 sts=2: */ -/*- +/* * Copyright (c) 2008 Jannis Pohlmann * * This library is free software; you can redistribute it and/or diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.c libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.c --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.c 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.c 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2012 Jérôme Guelfucci + * + * 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., Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +typedef struct _ShortcutTemplate ShortcutTemplate; + +struct _ShortcutTemplate +{ + const gchar *name; + const gchar *feature; +}; + +const ShortcutTemplate xfwm4_shortcut_values[] = { + { N_("Window operations menu"), "popup_menu_key" }, + { N_("Up"), "up_key" }, + { N_("Down"), "down_key" }, + { N_("Left"), "left_key" }, + { N_("Right"), "right_key" }, + { N_("Cancel"), "cancel_key" }, + { N_("Cycle windows"), "cycle_windows_key" }, + { N_("Cycle windows (Reverse)"), "cycle_reverse_windows_key" }, + { N_("Switch window for same application"), "switch_window_key" }, + { N_("Switch application"), "switch_application_key" }, + { N_("Close window"), "close_window_key" }, + { N_("Maximize window horizontally"), "maximize_horiz_key" }, + { N_("Maximize window vertically"), "maximize_vert_key" }, + { N_("Maximize window"), "maximize_window_key" }, + { N_("Hide window"), "hide_window_key" }, + { N_("Move window"), "move_window_key" }, + { N_("Resize window"), "resize_window_key" }, + { N_("Shade window"), "shade_window_key" }, + { N_("Stick window"), "stick_window_key" }, + { N_("Raise window"), "raise_window_key" }, + { N_("Lower window"), "lower_window_key" }, + { N_("Raise or lower window"), "raiselower_window_key" }, + { N_("Fill window"), "fill_window_key" }, + { N_("Fill window horizontally"), "fill_horiz_key" }, + { N_("Fill window vertically"), "fill_vert_key" }, + { N_("Toggle above"), "above_key" }, + { N_("Toggle fullscreen"), "fullscreen_key" }, + { N_("Move window to upper workspace"), "move_window_up_workspace_key" }, + { N_("Move window to bottom workspace"), "move_window_down_workspace_key" }, + { N_("Move window to left workspace"), "move_window_left_workspace_key" }, + { N_("Move window to right workspace"), "move_window_right_workspace_key" }, + { N_("Move window to previous workspace"), "move_window_prev_workspace_key" }, + { N_("Move window to next workspace"), "move_window_next_workspace_key" }, + { N_("Move window to workspace 1"), "move_window_workspace_1_key" }, + { N_("Move window to workspace 2"), "move_window_workspace_2_key" }, + { N_("Move window to workspace 3"), "move_window_workspace_3_key" }, + { N_("Move window to workspace 4"), "move_window_workspace_4_key" }, + { N_("Move window to workspace 5"), "move_window_workspace_5_key" }, + { N_("Move window to workspace 6"), "move_window_workspace_6_key" }, + { N_("Move window to workspace 7"), "move_window_workspace_7_key" }, + { N_("Move window to workspace 8"), "move_window_workspace_8_key" }, + { N_("Move window to workspace 9"), "move_window_workspace_9_key" }, + { N_("Move window to workspace 10"), "move_window_workspace_10_key" }, + { N_("Move window to workspace 11"), "move_window_workspace_11_key" }, + { N_("Move window to workspace 12"), "move_window_workspace_12_key" }, + { N_("Tile window to the top"), "tile_up_key" }, + { N_("Tile window to the bottom"), "tile_down_key" }, + { N_("Tile window to the left"), "tile_left_key" }, + { N_("Tile window to the right"), "tile_right_key" }, + { N_("Tile window to the top-left"), "tile_up_left_key" }, + { N_("Tile window to the top-right"), "tile_up_right_key" }, + { N_("Tile window to the bottom-left"), "tile_down_left_key" }, + { N_("Tile window to the bottom-right"), "tile_down_right_key" }, + { N_("Show desktop"), "show_desktop_key" }, + { N_("Upper workspace"), "up_workspace_key" }, + { N_("Bottom workspace"), "down_workspace_key" }, + { N_("Left workspace"), "left_workspace_key" }, + { N_("Right workspace"), "right_workspace_key" }, + { N_("Previous workspace"), "prev_workspace_key" }, + { N_("Next workspace"), "next_workspace_key" }, + { N_("Workspace 1"), "workspace_1_key" }, + { N_("Workspace 2"), "workspace_2_key" }, + { N_("Workspace 3"), "workspace_3_key" }, + { N_("Workspace 4"), "workspace_4_key" }, + { N_("Workspace 5"), "workspace_5_key" }, + { N_("Workspace 6"), "workspace_6_key" }, + { N_("Workspace 7"), "workspace_7_key" }, + { N_("Workspace 8"), "workspace_8_key" }, + { N_("Workspace 9"), "workspace_9_key" }, + { N_("Workspace 10"), "workspace_10_key" }, + { N_("Workspace 11"), "workspace_11_key" }, + { N_("Workspace 12"), "workspace_12_key" }, + { N_("Add workspace"), "add_workspace_key" }, + { N_("Add adjacent workspace"), "add_adjacent_workspace_key" }, + { N_("Delete last workspace"), "del_workspace_key" }, + { N_("Delete active workspace"), "del_active_workspace_key" }, + { NULL, NULL } +}; + + + +const gchar * +xfce_shortcuts_xfwm4_get_feature_name (const gchar *feature) +{ + guint i; + + /* Make sure to use the translations from libxfce4ui */ + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + + /* We need to get the human readable string of the action name */ + for (i = 0; xfwm4_shortcut_values[i].name != NULL; ++i) + { + if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[i].feature, feature))) + { + return _(xfwm4_shortcut_values[i].name); + } + } + + /* Not a valid feature */ + return NULL; +} + +GList * +xfce_shortcuts_xfwm4_get_feature_list (void) +{ + GList *list; + guint i; + + list = NULL; + + for (i = 0; xfwm4_shortcut_values[i].name != NULL; ++i) + list = g_list_prepend (list, (gpointer) xfwm4_shortcut_values[i].feature); + + return g_list_reverse (list); +} diff -Nru libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.h libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.h --- libxfce4ui-4.8.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.h 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4kbd-private/xfce-shortcuts-xfwm4.h 2013-10-04 08:51:42.000000000 +0000 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2012 Jérôme Guelfucci + * + * 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., Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include + +const gchar *xfce_shortcuts_xfwm4_get_feature_name (const gchar *feature); +GList *xfce_shortcuts_xfwm4_get_feature_list (void); diff -Nru libxfce4ui-4.8.1/libxfce4ui/abicheck.sh libxfce4ui-4.12.1/libxfce4ui/abicheck.sh --- libxfce4ui-4.8.1/libxfce4ui/abicheck.sh 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/abicheck.sh 2012-05-03 22:30:28.000000000 +0000 @@ -1,24 +1,24 @@ #!/bin/sh # # Copyright (c) 2004 The GLib Development Team. -# Copyright (c) 2007 The Xfce Development Team. +# Copyright (c) 2005 Benedikt Meurer . +# Copyright (c) 2011 Guido Berhoerster # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library 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 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 2 of the License ONLY. # -# This library is distributed in the hope that it will be useful, +# 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 -# Library General Public License for more details. +# 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 Library General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# 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 # -cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4ui.symbols | sed -e '/^$/d' -e 's/ LIBXFCE4UI_GNUC.*$//' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi -nm -D .libs/libxfce4ui-1.so | grep " T\|R\|G " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi -diff -u expected-abi actual-abi && rm expected-abi actual-abi +trap 'rm expected-abi actual-abi' EXIT +${CPP:-cpp} -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4ui.symbols | sed 's/ G_GNUC.*$//;s/ PRIVATE//;/^ *$/d;/^#/d' | sort >expected-abi +${NM:-nm} .libs/libxfce4ui-1.so* | awk '/ [DRTG] / {print $3}' | sort | uniq > actual-abi +diff -u expected-abi actual-abi diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-1.pc.in libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-1.pc.in --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-1.pc.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-1.pc.in 2015-03-08 22:36:50.000000000 +0000 @@ -3,6 +3,10 @@ libdir=@libdir@ includedir=@includedir@ +glade_catalogdir=@GLADEUI_CATALOGDIR@ +glade_pixmapdir=@GLADEUI_PIXMAPDIR@ +glade_moduledir=@GLADEUI_MODULEDIR@ + Name: libxfce4ui Description: Widgets library for Xfce Requires: gtk+-2.0 libxfce4util-1.0 diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-2.pc.in libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-2.pc.in --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-2.pc.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-2.pc.in 2015-03-08 22:36:50.000000000 +0000 @@ -0,0 +1,15 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +glade_catalogdir=@GLADEUI_CATALOGDIR@ +glade_pixmapdir=@GLADEUI_PIXMAPDIR@ +glade_moduledir=@GLADEUI_MODULEDIR@ + +Name: libxfce4ui +Description: Widgets library for Xfce +Requires: gtk+-3.0 libxfce4util-1.0 +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lxfce4ui-2 +Cflags: -I${includedir}/xfce4/libxfce4ui-2 diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-aliasdef.c libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-aliasdef.c --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-aliasdef.c 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-aliasdef.c 2015-02-18 19:38:06.000000000 +0000 @@ -19,6 +19,9 @@ #endif #if IN_HEADER(__LIBXFCE4UI_ENUM_TYPES_H__) #if IN_SOURCE(__LIBXFCE4UI_ENUM_TYPES_C__) +#undef xfce_sm_client_error_enum_get_type +extern __typeof (xfce_sm_client_error_enum_get_type) xfce_sm_client_error_enum_get_type __attribute((alias("IA__xfce_sm_client_error_enum_get_type"), visibility("default"))); + #undef xfce_sm_client_restart_style_get_type extern __typeof (xfce_sm_client_restart_style_get_type) xfce_sm_client_restart_style_get_type __attribute((alias("IA__xfce_sm_client_restart_style_get_type"), visibility("default"))); @@ -29,6 +32,12 @@ #endif #if IN_HEADER(__XFCE_DIALOGS_H__) #if IN_SOURCE(__XFCE_DIALOGS_C__) +#undef xfce_dialog_show_help +extern __typeof (xfce_dialog_show_help) xfce_dialog_show_help __attribute((alias("IA__xfce_dialog_show_help"), visibility("default"))); + +#undef xfce_dialog_show_help_with_version +extern __typeof (xfce_dialog_show_help_with_version) xfce_dialog_show_help_with_version __attribute((alias("IA__xfce_dialog_show_help_with_version"), visibility("default"))); + #undef xfce_dialog_show_info extern __typeof (xfce_dialog_show_info) xfce_dialog_show_info __attribute((alias("IA__xfce_dialog_show_info"), visibility("default"))); @@ -111,6 +120,9 @@ #undef xfce_sm_client_disconnect extern __typeof (xfce_sm_client_disconnect) xfce_sm_client_disconnect __attribute((alias("IA__xfce_sm_client_disconnect"), visibility("default"))); +#undef xfce_sm_client_error_quark +extern __typeof (xfce_sm_client_error_quark) xfce_sm_client_error_quark __attribute((alias("IA__xfce_sm_client_error_quark"), visibility("default"))); + #undef xfce_sm_client_is_connected extern __typeof (xfce_sm_client_is_connected) xfce_sm_client_is_connected __attribute((alias("IA__xfce_sm_client_is_connected"), visibility("default"))); diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-alias.h libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-alias.h --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-alias.h 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-alias.h 2015-02-18 19:38:06.000000000 +0000 @@ -16,6 +16,9 @@ #endif #if IN_HEADER(__LIBXFCE4UI_ENUM_TYPES_H__) #if IN_SOURCE(__LIBXFCE4UI_ENUM_TYPES_C__) +extern __typeof (xfce_sm_client_error_enum_get_type) IA__xfce_sm_client_error_enum_get_type __attribute((visibility("hidden"))); +#define xfce_sm_client_error_enum_get_type IA__xfce_sm_client_error_enum_get_type + extern __typeof (xfce_sm_client_restart_style_get_type) IA__xfce_sm_client_restart_style_get_type __attribute((visibility("hidden"))); #define xfce_sm_client_restart_style_get_type IA__xfce_sm_client_restart_style_get_type @@ -26,6 +29,12 @@ #endif #if IN_HEADER(__XFCE_DIALOGS_H__) #if IN_SOURCE(__XFCE_DIALOGS_C__) +extern __typeof (xfce_dialog_show_help) IA__xfce_dialog_show_help __attribute((visibility("hidden"))); +#define xfce_dialog_show_help IA__xfce_dialog_show_help + +extern __typeof (xfce_dialog_show_help_with_version) IA__xfce_dialog_show_help_with_version __attribute((visibility("hidden"))); +#define xfce_dialog_show_help_with_version IA__xfce_dialog_show_help_with_version + extern __typeof (xfce_dialog_show_info) IA__xfce_dialog_show_info __attribute((visibility("hidden"))) G_GNUC_PRINTF (3, 4); #define xfce_dialog_show_info IA__xfce_dialog_show_info @@ -108,6 +117,9 @@ extern __typeof (xfce_sm_client_disconnect) IA__xfce_sm_client_disconnect __attribute((visibility("hidden"))); #define xfce_sm_client_disconnect IA__xfce_sm_client_disconnect +extern __typeof (xfce_sm_client_error_quark) IA__xfce_sm_client_error_quark __attribute((visibility("hidden"))); +#define xfce_sm_client_error_quark IA__xfce_sm_client_error_quark + extern __typeof (xfce_sm_client_is_connected) IA__xfce_sm_client_is_connected __attribute((visibility("hidden"))); #define xfce_sm_client_is_connected IA__xfce_sm_client_is_connected diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.c libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.c --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.c 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.h libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.h --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.h 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.h 2015-03-15 18:14:50.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) @@ -30,7 +29,7 @@ G_BEGIN_DECLS #define LIBXFCE4UI_MAJOR_VERSION (4) -#define LIBXFCE4UI_MINOR_VERSION (8) +#define LIBXFCE4UI_MINOR_VERSION (12) #define LIBXFCE4UI_MICRO_VERSION (1) #define LIBXFCE4UI_CHECK_VERSION(major,minor,micro) \ diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.h.in libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.h.in --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-config.h.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-config.h.in 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-enum-types.c libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-enum-types.c --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-enum-types.c 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-enum-types.c 2015-03-15 18:14:58.000000000 +0000 @@ -7,6 +7,23 @@ /* enumerations from "xfce-sm-client.h" */ GType +xfce_sm_client_error_enum_get_type(void) +{ + static GType type = 0; + + if(!type) { + static const GEnumValue values[] = { + { XFCE_SM_CLIENT_ERROR_FAILED, "XFCE_SM_CLIENT_ERROR_FAILED", "failed" }, + { XFCE_SM_CLIENT_ERROR_INVALID_CLIENT, "XFCE_SM_CLIENT_ERROR_INVALID_CLIENT", "invalid-client" }, + { 0, NULL, NULL } + }; + type = g_enum_register_static("XfceSmCLientErrorEnum", values); + } + + return type; +} + +GType xfce_sm_client_restart_style_get_type(void) { static GType type = 0; diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-enum-types.h libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-enum-types.h --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-enum-types.h 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-enum-types.h 2015-02-18 19:38:06.000000000 +0000 @@ -8,6 +8,9 @@ /* enumerations from "xfce-sm-client.h" */ +GType xfce_sm_client_error_enum_get_type(void) G_GNUC_CONST; +#define XFCE_TYPE_SM_CLIENT_ERROR_ENUM (xfce_sm_client_error_enum_get_type()) + GType xfce_sm_client_restart_style_get_type(void) G_GNUC_CONST; #define XFCE_TYPE_SM_CLIENT_RESTART_STYLE (xfce_sm_client_restart_style_get_type()) diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui.h libxfce4ui-4.12.1/libxfce4ui/libxfce4ui.h --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef __LIBXFCE4UI_H__ diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-marshal.c libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-marshal.c --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-marshal.c 2011-12-23 16:13:02.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-marshal.c 2015-03-15 18:14:58.000000000 +0000 @@ -5,7 +5,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-private.h libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-private.h --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui-private.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui-private.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_COMPILATION) @@ -32,6 +31,18 @@ /* support for canonical representations of strings */ #define I_(string) (g_intern_static_string ((string))) +#ifndef NDEBUG +#define _libxfce4ui_assert(expr) g_assert (expr) +#define _libxfce4ui_assert_not_reached() g_assert_not_reached () +#define _libxfce4ui_return_if_fail(expr) g_return_if_fail (expr) +#define _libxfce4ui_return_val_if_fail(expr,val) g_return_val_if_fail (expr,val) +#else +#define _libxfce4ui_assert(expr) G_STMT_START{ (void)0; }G_STMT_END +#define _libxfce4ui_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END +#define _libxfce4ui_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END +#define _libxfce4ui_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END +#endif + G_END_DECLS #endif /* !__LIBXFCE4UI_PRIVATE_H__ */ diff -Nru libxfce4ui-4.8.1/libxfce4ui/libxfce4ui.symbols libxfce4ui-4.12.1/libxfce4ui/libxfce4ui.symbols --- libxfce4ui-4.8.1/libxfce4ui/libxfce4ui.symbols 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/libxfce4ui.symbols 2015-02-18 16:12:39.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ /* This file lists all exported symbols. It is used to generate @@ -49,6 +48,7 @@ /* libxfce4ui-enum-types functions */ #if IN_HEADER(__LIBXFCE4UI_ENUM_TYPES_H__) #if IN_SOURCE(__LIBXFCE4UI_ENUM_TYPES_C__) +xfce_sm_client_error_enum_get_type xfce_sm_client_restart_style_get_type xfce_sm_client_shutdown_hint_get_type #endif @@ -57,6 +57,8 @@ /* xfce-dialogs functions */ #if IN_HEADER(__XFCE_DIALOGS_H__) #if IN_SOURCE(__XFCE_DIALOGS_C__) +xfce_dialog_show_help +xfce_dialog_show_help_with_version xfce_dialog_show_info G_GNUC_PRINTF (3, 4) xfce_dialog_show_warning G_GNUC_PRINTF (3, 4) xfce_dialog_show_error G_GNUC_PRINTF (3, 4) @@ -103,6 +105,7 @@ xfce_sm_client_get_full xfce_sm_client_connect xfce_sm_client_disconnect +xfce_sm_client_error_quark xfce_sm_client_is_connected xfce_sm_client_is_resumed xfce_sm_client_set_desktop_file diff -Nru libxfce4ui-4.8.1/libxfce4ui/Makefile.am libxfce4ui-4.12.1/libxfce4ui/Makefile.am --- libxfce4ui-4.8.1/libxfce4ui/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/Makefile.am 2015-02-18 18:22:25.000000000 +0000 @@ -1,6 +1,4 @@ -# $Id$ - -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDATADIR=\"$(datadir)\" \ -DSN_API_NOT_YET_FROZEN \ @@ -11,8 +9,6 @@ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ $(PLATFORM_CPPFLAGS) -lib_LTLIBRARIES = libxfce4ui-1.la - libxfce4ui_enum_headers = \ xfce-sm-client.h @@ -35,13 +31,7 @@ libxfce4ui-marshal.c \ libxfce4ui-marshal.h -libxfce4ui_includedir = \ - $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui - -libxfce4ui_include_HEADERS = \ - $(libxfce4ui_headers) - -libxfce4ui_1_la_SOURCES = \ +libxfce4ui_sources = \ $(libxfce4ui_headers) \ $(libxfce4ui_built_sources) \ libxfce4ui-config.c \ @@ -55,9 +45,20 @@ xfce-spawn.c \ xfce-titled-dialog.c +libxfce4ui_includedir = \ + $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui + +libxfce4ui_include_HEADERS = \ + $(libxfce4ui_headers) + +lib_LTLIBRARIES = libxfce4ui-1.la + +libxfce4ui_1_la_SOURCES = \ + $(libxfce4ui_sources) + libxfce4ui_1_la_CFLAGS = \ $(LIBSM_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK2_CFLAGS) \ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -71,13 +72,52 @@ libxfce4ui_1_la_LIBADD = \ $(LIBSM_LIBS) \ - $(GTK_LIBS) \ + $(GTK2_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ $(LIBXFCE4UTIL_LIBS) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfce4ui-1.pc +## +## GTK+ 3 support library +## +if ENABLE_GTK3_LIBRARY + +libxfce4ui2_includedir = \ + $(includedir)/xfce4/libxfce4ui-2/libxfce4ui + +libxfce4ui2_include_HEADERS = \ + $(libxfce4ui_headers) + +lib_LTLIBRARIES += libxfce4ui-2.la + +libxfce4ui_2_la_SOURCES = \ + $(libxfce4ui_sources) + +libxfce4ui_2_la_CFLAGS = \ + $(LIBSM_CFLAGS) \ + $(GTK3_CFLAGS) \ + $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(PLATFORM_CFLAGS) + +libxfce4ui_2_la_LDFLAGS = \ + -version-info $(LIBXFCE4UI_VERINFO) \ + -export-symbols-regex "^[^_].*" \ + -no-undefined \ + $(LIBSM_LDFLAGS) \ + $(PLATFORM_LDFLAGS) + +libxfce4ui_2_la_LIBADD = \ + $(LIBSM_LIBS) \ + $(GTK3_LIBS) \ + $(LIBSTARTUP_NOTIFICATION_LIBS) \ + $(LIBXFCE4UTIL_LIBS) + +pkgconfig_DATA += libxfce4ui-2.pc + +endif ## ## Rules to auto-generate built sources diff -Nru libxfce4ui-4.8.1/libxfce4ui/Makefile.in libxfce4ui-4.12.1/libxfce4ui/Makefile.in --- libxfce4ui-4.8.1/libxfce4ui/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,11 +14,54 @@ @SET_MAKE@ -# $Id$ - VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,17 +81,22 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@ENABLE_GTK3_LIBRARY_TRUE@am__append_1 = libxfce4ui-2.la +@ENABLE_GTK3_LIBRARY_TRUE@am__append_2 = libxfce4ui-2.pc subdir = libxfce4ui -DIST_COMMON = $(libxfce4ui_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/libxfce4ui-1.pc.in \ - $(srcdir)/libxfce4ui-config.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/libxfce4ui-1.pc.in $(srcdir)/libxfce4ui-2.pc.in \ + $(srcdir)/libxfce4ui-config.h.in $(top_srcdir)/depcomp \ + $(am__libxfce4ui2_include_HEADERS_DIST) \ + $(libxfce4ui_include_HEADERS) $(top_srcdir)/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = libxfce4ui-1.pc libxfce4ui-config.h +CONFIG_CLEAN_FILES = libxfce4ui-1.pc libxfce4ui-2.pc \ + libxfce4ui-config.h CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -72,7 +119,14 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(libxfce4ui2_includedir)" \ "$(DESTDIR)$(libxfce4ui_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -84,7 +138,7 @@ am__objects_3 = libxfce4ui_1_la-libxfce4ui-aliasdef.lo \ libxfce4ui_1_la-libxfce4ui-enum-types.lo \ libxfce4ui_1_la-libxfce4ui-marshal.lo -am_libxfce4ui_1_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ +am__objects_4 = $(am__objects_2) $(am__objects_3) \ libxfce4ui_1_la-libxfce4ui-config.lo \ libxfce4ui_1_la-xfce-dialogs.lo \ libxfce4ui_1_la-xfce-gdk-extensions.lo \ @@ -93,14 +147,62 @@ libxfce4ui_1_la-xfce-sm-client.lo \ libxfce4ui_1_la-xfce-spawn.lo \ libxfce4ui_1_la-xfce-titled-dialog.lo +am_libxfce4ui_1_la_OBJECTS = $(am__objects_4) libxfce4ui_1_la_OBJECTS = $(am_libxfce4ui_1_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxfce4ui_1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) $(libxfce4ui_1_la_LDFLAGS) \ $(LDFLAGS) -o $@ +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui_2_la_DEPENDENCIES = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(am__DEPENDENCIES_1) +am__libxfce4ui_2_la_SOURCES_DIST = libxfce4ui.h libxfce4ui-config.h \ + libxfce4ui-enum-types.h xfce-dialogs.h xfce-gdk-extensions.h \ + xfce-gtk-extensions.h xfce-spawn.h xfce-titled-dialog.h \ + xfce-sm-client.h libxfce4ui-alias.h libxfce4ui-aliasdef.c \ + libxfce4ui-enum-types.c libxfce4ui-marshal.c \ + libxfce4ui-marshal.h libxfce4ui-config.c libxfce4ui-private.h \ + xfce-dialogs.c xfce-gdk-extensions.c xfce-gtk-extensions.c \ + xfce-heading.c xfce-heading.h xfce-sm-client.c xfce-spawn.c \ + xfce-titled-dialog.c +am__objects_5 = libxfce4ui_2_la-libxfce4ui-aliasdef.lo \ + libxfce4ui_2_la-libxfce4ui-enum-types.lo \ + libxfce4ui_2_la-libxfce4ui-marshal.lo +am__objects_6 = $(am__objects_2) $(am__objects_5) \ + libxfce4ui_2_la-libxfce4ui-config.lo \ + libxfce4ui_2_la-xfce-dialogs.lo \ + libxfce4ui_2_la-xfce-gdk-extensions.lo \ + libxfce4ui_2_la-xfce-gtk-extensions.lo \ + libxfce4ui_2_la-xfce-heading.lo \ + libxfce4ui_2_la-xfce-sm-client.lo \ + libxfce4ui_2_la-xfce-spawn.lo \ + libxfce4ui_2_la-xfce-titled-dialog.lo +@ENABLE_GTK3_LIBRARY_TRUE@am_libxfce4ui_2_la_OBJECTS = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(am__objects_6) +libxfce4ui_2_la_OBJECTS = $(am_libxfce4ui_2_la_OBJECTS) +libxfce4ui_2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) $(libxfce4ui_2_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@ENABLE_GTK3_LIBRARY_TRUE@am_libxfce4ui_2_la_rpath = -rpath $(libdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -111,30 +213,228 @@ $(LIBTOOLFLAGS) --mode=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 = @ +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=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 = $(libxfce4ui_1_la_SOURCES) -DIST_SOURCES = $(libxfce4ui_1_la_SOURCES) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libxfce4ui_1_la_SOURCES) $(libxfce4ui_2_la_SOURCES) +DIST_SOURCES = $(libxfce4ui_1_la_SOURCES) \ + $(am__libxfce4ui_2_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(pkgconfig_DATA) -HEADERS = $(libxfce4ui_include_HEADERS) +am__libxfce4ui2_include_HEADERS_DIST = libxfce4ui.h \ + libxfce4ui-config.h libxfce4ui-enum-types.h xfce-dialogs.h \ + xfce-gdk-extensions.h xfce-gtk-extensions.h xfce-spawn.h \ + xfce-titled-dialog.h xfce-sm-client.h +HEADERS = $(libxfce4ui2_include_HEADERS) $(libxfce4ui_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -180,16 +480,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -202,6 +507,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -231,6 +540,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -316,6 +626,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -339,7 +651,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDATADIR=\"$(datadir)\" \ -DSN_API_NOT_YET_FROZEN \ @@ -350,7 +662,6 @@ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ $(PLATFORM_CPPFLAGS) -lib_LTLIBRARIES = libxfce4ui-1.la libxfce4ui_enum_headers = \ xfce-sm-client.h @@ -373,13 +684,7 @@ libxfce4ui-marshal.c \ libxfce4ui-marshal.h -libxfce4ui_includedir = \ - $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui - -libxfce4ui_include_HEADERS = \ - $(libxfce4ui_headers) - -libxfce4ui_1_la_SOURCES = \ +libxfce4ui_sources = \ $(libxfce4ui_headers) \ $(libxfce4ui_built_sources) \ libxfce4ui-config.c \ @@ -393,9 +698,19 @@ xfce-spawn.c \ xfce-titled-dialog.c +libxfce4ui_includedir = \ + $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui + +libxfce4ui_include_HEADERS = \ + $(libxfce4ui_headers) + +lib_LTLIBRARIES = libxfce4ui-1.la $(am__append_1) +libxfce4ui_1_la_SOURCES = \ + $(libxfce4ui_sources) + libxfce4ui_1_la_CFLAGS = \ $(LIBSM_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK2_CFLAGS) \ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -409,12 +724,41 @@ libxfce4ui_1_la_LIBADD = \ $(LIBSM_LIBS) \ - $(GTK_LIBS) \ + $(GTK2_LIBS) \ $(LIBSTARTUP_NOTIFICATION_LIBS) \ $(LIBXFCE4UTIL_LIBS) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libxfce4ui-1.pc +pkgconfig_DATA = libxfce4ui-1.pc $(am__append_2) +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui2_includedir = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(includedir)/xfce4/libxfce4ui-2/libxfce4ui + +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui2_include_HEADERS = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(libxfce4ui_headers) + +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui_2_la_SOURCES = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(libxfce4ui_sources) + +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui_2_la_CFLAGS = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBSM_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(GTK3_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBSTARTUP_NOTIFICATION_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBXFCE4UTIL_CFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(PLATFORM_CFLAGS) + +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui_2_la_LDFLAGS = \ +@ENABLE_GTK3_LIBRARY_TRUE@ -version-info $(LIBXFCE4UI_VERINFO) \ +@ENABLE_GTK3_LIBRARY_TRUE@ -export-symbols-regex "^[^_].*" \ +@ENABLE_GTK3_LIBRARY_TRUE@ -no-undefined \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBSM_LDFLAGS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(PLATFORM_LDFLAGS) + +@ENABLE_GTK3_LIBRARY_TRUE@libxfce4ui_2_la_LIBADD = \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBSM_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(GTK3_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBSTARTUP_NOTIFICATION_LIBS) \ +@ENABLE_GTK3_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) + @MAINTAINER_MODE_TRUE@CLEANFILES = \ @MAINTAINER_MODE_TRUE@ actual-abi \ @MAINTAINER_MODE_TRUE@ expected-abi @@ -438,7 +782,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -471,11 +815,13 @@ $(am__aclocal_m4_deps): libxfce4ui-1.pc: $(top_builddir)/config.status $(srcdir)/libxfce4ui-1.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +libxfce4ui-2.pc: $(top_builddir)/config.status $(srcdir)/libxfce4ui-2.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ libxfce4ui-config.h: $(top_builddir)/config.status $(srcdir)/libxfce4ui-config.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -483,6 +829,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -498,15 +846,21 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libxfce4ui-1.la: $(libxfce4ui_1_la_OBJECTS) $(libxfce4ui_1_la_DEPENDENCIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libxfce4ui-1.la: $(libxfce4ui_1_la_OBJECTS) $(libxfce4ui_1_la_DEPENDENCIES) $(EXTRA_libxfce4ui_1_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfce4ui_1_la_LINK) -rpath $(libdir) $(libxfce4ui_1_la_OBJECTS) $(libxfce4ui_1_la_LIBADD) $(LIBS) +libxfce4ui-2.la: $(libxfce4ui_2_la_OBJECTS) $(libxfce4ui_2_la_DEPENDENCIES) $(EXTRA_libxfce4ui_2_la_DEPENDENCIES) + $(AM_V_CCLD)$(libxfce4ui_2_la_LINK) $(am_libxfce4ui_2_la_rpath) $(libxfce4ui_2_la_OBJECTS) $(libxfce4ui_2_la_LIBADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -524,118 +878,192 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_1_la-xfce-sm-client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_1_la-xfce-spawn.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_1_la-xfce-titled-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-libxfce4ui-aliasdef.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-libxfce4ui-config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-libxfce4ui-enum-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-libxfce4ui-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-dialogs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-heading.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo@am__quote@ .c.o: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @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@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libxfce4ui_1_la-libxfce4ui-aliasdef.lo: libxfce4ui-aliasdef.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-libxfce4ui-aliasdef.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-aliasdef.Tpo -c -o libxfce4ui_1_la-libxfce4ui-aliasdef.lo `test -f 'libxfce4ui-aliasdef.c' || echo '$(srcdir)/'`libxfce4ui-aliasdef.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-aliasdef.Tpo $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-aliasdef.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libxfce4ui-aliasdef.c' object='libxfce4ui_1_la-libxfce4ui-aliasdef.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-aliasdef.c' object='libxfce4ui_1_la-libxfce4ui-aliasdef.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-aliasdef.lo `test -f 'libxfce4ui-aliasdef.c' || echo '$(srcdir)/'`libxfce4ui-aliasdef.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-aliasdef.lo `test -f 'libxfce4ui-aliasdef.c' || echo '$(srcdir)/'`libxfce4ui-aliasdef.c libxfce4ui_1_la-libxfce4ui-enum-types.lo: libxfce4ui-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-libxfce4ui-enum-types.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-enum-types.Tpo -c -o libxfce4ui_1_la-libxfce4ui-enum-types.lo `test -f 'libxfce4ui-enum-types.c' || echo '$(srcdir)/'`libxfce4ui-enum-types.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-enum-types.Tpo $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-enum-types.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libxfce4ui-enum-types.c' object='libxfce4ui_1_la-libxfce4ui-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-enum-types.c' object='libxfce4ui_1_la-libxfce4ui-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-enum-types.lo `test -f 'libxfce4ui-enum-types.c' || echo '$(srcdir)/'`libxfce4ui-enum-types.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-enum-types.lo `test -f 'libxfce4ui-enum-types.c' || echo '$(srcdir)/'`libxfce4ui-enum-types.c libxfce4ui_1_la-libxfce4ui-marshal.lo: libxfce4ui-marshal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-libxfce4ui-marshal.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-marshal.Tpo -c -o libxfce4ui_1_la-libxfce4ui-marshal.lo `test -f 'libxfce4ui-marshal.c' || echo '$(srcdir)/'`libxfce4ui-marshal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-marshal.Tpo $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-marshal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libxfce4ui-marshal.c' object='libxfce4ui_1_la-libxfce4ui-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-marshal.c' object='libxfce4ui_1_la-libxfce4ui-marshal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-marshal.lo `test -f 'libxfce4ui-marshal.c' || echo '$(srcdir)/'`libxfce4ui-marshal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-marshal.lo `test -f 'libxfce4ui-marshal.c' || echo '$(srcdir)/'`libxfce4ui-marshal.c libxfce4ui_1_la-libxfce4ui-config.lo: libxfce4ui-config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-libxfce4ui-config.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-config.Tpo -c -o libxfce4ui_1_la-libxfce4ui-config.lo `test -f 'libxfce4ui-config.c' || echo '$(srcdir)/'`libxfce4ui-config.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-config.Tpo $(DEPDIR)/libxfce4ui_1_la-libxfce4ui-config.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libxfce4ui-config.c' object='libxfce4ui_1_la-libxfce4ui-config.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-config.c' object='libxfce4ui_1_la-libxfce4ui-config.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-config.lo `test -f 'libxfce4ui-config.c' || echo '$(srcdir)/'`libxfce4ui-config.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-libxfce4ui-config.lo `test -f 'libxfce4ui-config.c' || echo '$(srcdir)/'`libxfce4ui-config.c libxfce4ui_1_la-xfce-dialogs.lo: xfce-dialogs.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-dialogs.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-dialogs.Tpo -c -o libxfce4ui_1_la-xfce-dialogs.lo `test -f 'xfce-dialogs.c' || echo '$(srcdir)/'`xfce-dialogs.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-dialogs.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-dialogs.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-dialogs.c' object='libxfce4ui_1_la-xfce-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-dialogs.c' object='libxfce4ui_1_la-xfce-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-dialogs.lo `test -f 'xfce-dialogs.c' || echo '$(srcdir)/'`xfce-dialogs.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-dialogs.lo `test -f 'xfce-dialogs.c' || echo '$(srcdir)/'`xfce-dialogs.c libxfce4ui_1_la-xfce-gdk-extensions.lo: xfce-gdk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-gdk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-gdk-extensions.Tpo -c -o libxfce4ui_1_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-gdk-extensions.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-gdk-extensions.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-gdk-extensions.c' object='libxfce4ui_1_la-xfce-gdk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gdk-extensions.c' object='libxfce4ui_1_la-xfce-gdk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c libxfce4ui_1_la-xfce-gtk-extensions.lo: xfce-gtk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-gtk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-gtk-extensions.Tpo -c -o libxfce4ui_1_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-gtk-extensions.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-gtk-extensions.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-gtk-extensions.c' object='libxfce4ui_1_la-xfce-gtk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gtk-extensions.c' object='libxfce4ui_1_la-xfce-gtk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c libxfce4ui_1_la-xfce-heading.lo: xfce-heading.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-heading.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-heading.Tpo -c -o libxfce4ui_1_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-heading.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-heading.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-heading.c' object='libxfce4ui_1_la-xfce-heading.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-heading.c' object='libxfce4ui_1_la-xfce-heading.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c libxfce4ui_1_la-xfce-sm-client.lo: xfce-sm-client.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-sm-client.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-sm-client.Tpo -c -o libxfce4ui_1_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-sm-client.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-sm-client.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-sm-client.c' object='libxfce4ui_1_la-xfce-sm-client.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-sm-client.c' object='libxfce4ui_1_la-xfce-sm-client.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c libxfce4ui_1_la-xfce-spawn.lo: xfce-spawn.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-spawn.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-spawn.Tpo -c -o libxfce4ui_1_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-spawn.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-spawn.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-spawn.c' object='libxfce4ui_1_la-xfce-spawn.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-spawn.c' object='libxfce4ui_1_la-xfce-spawn.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c libxfce4ui_1_la-xfce-titled-dialog.lo: xfce-titled-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_1_la-xfce-titled-dialog.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_1_la-xfce-titled-dialog.Tpo -c -o libxfce4ui_1_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_1_la-xfce-titled-dialog.Tpo $(DEPDIR)/libxfce4ui_1_la-xfce-titled-dialog.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfce-titled-dialog.c' object='libxfce4ui_1_la-xfce-titled-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-titled-dialog.c' object='libxfce4ui_1_la-xfce-titled-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c + +libxfce4ui_2_la-libxfce4ui-aliasdef.lo: libxfce4ui-aliasdef.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-libxfce4ui-aliasdef.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-aliasdef.Tpo -c -o libxfce4ui_2_la-libxfce4ui-aliasdef.lo `test -f 'libxfce4ui-aliasdef.c' || echo '$(srcdir)/'`libxfce4ui-aliasdef.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-aliasdef.Tpo $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-aliasdef.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-aliasdef.c' object='libxfce4ui_2_la-libxfce4ui-aliasdef.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-libxfce4ui-aliasdef.lo `test -f 'libxfce4ui-aliasdef.c' || echo '$(srcdir)/'`libxfce4ui-aliasdef.c + +libxfce4ui_2_la-libxfce4ui-enum-types.lo: libxfce4ui-enum-types.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-libxfce4ui-enum-types.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-enum-types.Tpo -c -o libxfce4ui_2_la-libxfce4ui-enum-types.lo `test -f 'libxfce4ui-enum-types.c' || echo '$(srcdir)/'`libxfce4ui-enum-types.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-enum-types.Tpo $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-enum-types.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-enum-types.c' object='libxfce4ui_2_la-libxfce4ui-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_1_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_1_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-libxfce4ui-enum-types.lo `test -f 'libxfce4ui-enum-types.c' || echo '$(srcdir)/'`libxfce4ui-enum-types.c + +libxfce4ui_2_la-libxfce4ui-marshal.lo: libxfce4ui-marshal.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-libxfce4ui-marshal.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-marshal.Tpo -c -o libxfce4ui_2_la-libxfce4ui-marshal.lo `test -f 'libxfce4ui-marshal.c' || echo '$(srcdir)/'`libxfce4ui-marshal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-marshal.Tpo $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-marshal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-marshal.c' object='libxfce4ui_2_la-libxfce4ui-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-libxfce4ui-marshal.lo `test -f 'libxfce4ui-marshal.c' || echo '$(srcdir)/'`libxfce4ui-marshal.c + +libxfce4ui_2_la-libxfce4ui-config.lo: libxfce4ui-config.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-libxfce4ui-config.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-config.Tpo -c -o libxfce4ui_2_la-libxfce4ui-config.lo `test -f 'libxfce4ui-config.c' || echo '$(srcdir)/'`libxfce4ui-config.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-config.Tpo $(DEPDIR)/libxfce4ui_2_la-libxfce4ui-config.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libxfce4ui-config.c' object='libxfce4ui_2_la-libxfce4ui-config.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-libxfce4ui-config.lo `test -f 'libxfce4ui-config.c' || echo '$(srcdir)/'`libxfce4ui-config.c + +libxfce4ui_2_la-xfce-dialogs.lo: xfce-dialogs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-dialogs.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-dialogs.Tpo -c -o libxfce4ui_2_la-xfce-dialogs.lo `test -f 'xfce-dialogs.c' || echo '$(srcdir)/'`xfce-dialogs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-dialogs.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-dialogs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-dialogs.c' object='libxfce4ui_2_la-xfce-dialogs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-dialogs.lo `test -f 'xfce-dialogs.c' || echo '$(srcdir)/'`xfce-dialogs.c + +libxfce4ui_2_la-xfce-gdk-extensions.lo: xfce-gdk-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-gdk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Tpo -c -o libxfce4ui_2_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-gdk-extensions.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gdk-extensions.c' object='libxfce4ui_2_la-xfce-gdk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-gdk-extensions.lo `test -f 'xfce-gdk-extensions.c' || echo '$(srcdir)/'`xfce-gdk-extensions.c + +libxfce4ui_2_la-xfce-gtk-extensions.lo: xfce-gtk-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-gtk-extensions.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Tpo -c -o libxfce4ui_2_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-gtk-extensions.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-gtk-extensions.c' object='libxfce4ui_2_la-xfce-gtk-extensions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-gtk-extensions.lo `test -f 'xfce-gtk-extensions.c' || echo '$(srcdir)/'`xfce-gtk-extensions.c + +libxfce4ui_2_la-xfce-heading.lo: xfce-heading.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-heading.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-heading.Tpo -c -o libxfce4ui_2_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-heading.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-heading.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-heading.c' object='libxfce4ui_2_la-xfce-heading.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-heading.lo `test -f 'xfce-heading.c' || echo '$(srcdir)/'`xfce-heading.c + +libxfce4ui_2_la-xfce-sm-client.lo: xfce-sm-client.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-sm-client.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Tpo -c -o libxfce4ui_2_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-sm-client.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-sm-client.c' object='libxfce4ui_2_la-xfce-sm-client.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-sm-client.lo `test -f 'xfce-sm-client.c' || echo '$(srcdir)/'`xfce-sm-client.c + +libxfce4ui_2_la-xfce-spawn.lo: xfce-spawn.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-spawn.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Tpo -c -o libxfce4ui_2_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-spawn.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-spawn.c' object='libxfce4ui_2_la-xfce-spawn.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-spawn.lo `test -f 'xfce-spawn.c' || echo '$(srcdir)/'`xfce-spawn.c + +libxfce4ui_2_la-xfce-titled-dialog.lo: xfce-titled-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -MT libxfce4ui_2_la-xfce-titled-dialog.lo -MD -MP -MF $(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Tpo -c -o libxfce4ui_2_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Tpo $(DEPDIR)/libxfce4ui_2_la-xfce-titled-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfce-titled-dialog.c' object='libxfce4ui_2_la-xfce-titled-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxfce4ui_2_la_CFLAGS) $(CFLAGS) -c -o libxfce4ui_2_la-xfce-titled-dialog.lo `test -f 'xfce-titled-dialog.c' || echo '$(srcdir)/'`xfce-titled-dialog.c mostlyclean-libtool: -rm -f *.lo @@ -644,8 +1072,11 @@ -rm -rf .libs _libs install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -659,13 +1090,35 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) +install-libxfce4ui2_includeHEADERS: $(libxfce4ui2_include_HEADERS) + @$(NORMAL_INSTALL) + @list='$(libxfce4ui2_include_HEADERS)'; test -n "$(libxfce4ui2_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libxfce4ui2_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libxfce4ui2_includedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libxfce4ui2_includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(libxfce4ui2_includedir)" || exit $$?; \ + done + +uninstall-libxfce4ui2_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libxfce4ui2_include_HEADERS)'; test -n "$(libxfce4ui2_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libxfce4ui2_includedir)'; $(am__uninstall_files_from_dir) install-libxfce4ui_includeHEADERS: $(libxfce4ui_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libxfce4ui_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libxfce4ui_includedir)" @list='$(libxfce4ui_include_HEADERS)'; test -n "$(libxfce4ui_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libxfce4ui_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libxfce4ui_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -679,30 +1132,17 @@ @$(NORMAL_UNINSTALL) @list='$(libxfce4ui_include_HEADERS)'; test -n "$(libxfce4ui_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libxfce4ui_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libxfce4ui_includedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS + dir='$(DESTDIR)$(libxfce4ui_includedir)'; $(am__uninstall_files_from_dir) -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -714,15 +1154,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -731,101 +1167,187 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +abicheck.sh.log: abicheck.sh + @p='abicheck.sh'; \ + b='abicheck.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -866,7 +1388,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libxfce4ui_includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libxfce4ui2_includedir)" "$(DESTDIR)$(libxfce4ui_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -880,11 +1402,19 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -921,8 +1451,8 @@ info-am: -install-data-am: install-libxfce4ui_includeHEADERS \ - install-pkgconfigDATA +install-data-am: install-libxfce4ui2_includeHEADERS \ + install-libxfce4ui_includeHEADERS install-pkgconfigDATA install-dvi: install-dvi-am @@ -969,26 +1499,29 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libxfce4ui2_includeHEADERS \ uninstall-libxfce4ui_includeHEADERS uninstall-pkgconfigDATA .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ - dist-hook distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-libxfce4ui2_includeHEADERS \ install-libxfce4ui_includeHEADERS install-man install-pdf \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-libxfce4ui_includeHEADERS \ - uninstall-pkgconfigDATA + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libxfce4ui2_includeHEADERS \ + uninstall-libxfce4ui_includeHEADERS uninstall-pkgconfigDATA @MAINTAINER_MODE_TRUE@libxfce4ui-alias.h: make-libxfce4ui-alias.pl libxfce4ui.symbols diff -Nru libxfce4ui-4.8.1/libxfce4ui/make-libxfce4ui-alias.pl libxfce4ui-4.12.1/libxfce4ui/make-libxfce4ui-alias.pl --- libxfce4ui-4.8.1/libxfce4ui/make-libxfce4ui-alias.pl 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/make-libxfce4ui-alias.pl 2012-05-03 22:30:28.000000000 +0000 @@ -14,9 +14,9 @@ # Library General Public License for more details. # # You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA # my $option_def = 0; diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-dialogs.c libxfce4ui-4.12.1/libxfce4ui/xfce-dialogs.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-dialogs.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-dialogs.c 2015-02-18 16:57:43.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2006-2007 Benedikt Meurer * Copyright (c) 2007 The Xfce Development Team * @@ -14,9 +13,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -26,10 +25,12 @@ #ifdef HAVE_STRING_H #include #endif - #ifdef HAVE_STDARG_H #include #endif +#ifdef HAVE_LOCALE_H +#include +#endif #include #include @@ -37,11 +38,275 @@ #include #include #include +#include #include #include +static void +xfce_dialog_show_help_auto_toggled (GtkWidget *button) +{ + XfceRc *rc; + gboolean active = FALSE; + + if (button != NULL) + active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); + + rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/help.rc", FALSE); + if (rc != NULL) + { + xfce_rc_write_bool_entry (rc, "auto-online", active); + xfce_rc_close (rc); + } +} + + + +static void +xfce_dialog_show_help_uri (GdkScreen *screen, + GtkWindow *parent, + GString *uri) +{ + GError *error = NULL; + gchar *path; + gchar *cmd; + gboolean result; + + g_return_if_fail (GDK_IS_SCREEN (screen)); + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); + + path = g_find_program_in_path ("exo-open"); + if (G_LIKELY (path != NULL)) + { + cmd = g_strdup_printf ("%s --launch WebBrowser '%s'", path, uri->str); + + result = xfce_spawn_command_line_on_screen (screen, cmd, FALSE, TRUE, &error); + + g_free (path); + g_free (cmd); + } + else + { + /* not very likely to happen, but it is possible exo is not installed */ + result = gtk_show_uri (screen, uri->str, gtk_get_current_event_time (), &error); + } + + if (!result) + { + xfce_dialog_show_error (parent, error, + _("Failed to open web browser for online documentation")); + g_error_free (error); + } +} + + + +static void +xfce_dialog_show_help_response (GtkWidget *dialog, + gint response_id, + GString *uri) +{ + gtk_widget_hide (dialog); + + if (response_id == GTK_RESPONSE_YES) + { + xfce_dialog_show_help_uri (gtk_widget_get_screen (dialog), + gtk_window_get_transient_for (GTK_WINDOW (dialog)), + uri); + } + else + { + /* unset auto */ + xfce_dialog_show_help_auto_toggled (NULL); + } + + g_string_free (uri, TRUE); + gtk_widget_destroy (dialog); +} + + + +/** + * xfce_dialog_show_help: + * @parent : transient parent of the dialog, or %NULL. + * @component : name of the component opening the help page or %NULL. If the + * value is %NULL the target will be the main page of the + * documentation website. + * @page : subpage of the @component on the website or %NULL. + * @offset : anchor offset in @page or %NULL. + * + * Asks the user to visit the online documentation. If confirmed, it will open + * the webbrowser and redirect the user to the correct location. + * + * Appart from the @component, @page and @offset the following information + * is also send to the server: user language and the xfce_version_string(). + * + * See also: xfce_dialog_show_help_with_version(). + * + * Since 4.10 + */ +void +xfce_dialog_show_help (GtkWindow *parent, + const gchar *component, + const gchar *page, + const gchar *offset) +{ + xfce_dialog_show_help_with_version (parent, component, page, offset, NULL); +} + + + +/** + * xfce_dialog_show_help_with_version: + * @parent : transient parent of the dialog, or %NULL. + * @component : name of the component opening the help page or %NULL. If the + * value is %NULL the target will be the main page of the + * documentation website. + * @page : subpage of the @component on the website or %NULL. + * @offset : anchor offset in @page or %NULL. + * @version : alternative version, or %NULL to use xfce_version_string(). + * + * Asks the user to visit the online documentation. If confirmed, it will open + * the webbrowser and redirect the user to the correct location. + * + * Appart from the @component, @page and @offset the following information + * is also send to the server: user language and the xfce_version_string() + * or @version if set. + * + * See also: xfce_dialog_show_help(). + * + * Since 4.12 + */ +void +xfce_dialog_show_help_with_version (GtkWindow *parent, + const gchar *component, + const gchar *page, + const gchar *offset, + const gchar *version) +{ + GtkWidget *dialog; + const gchar *name; + gchar *primary; + GString *uri; + gchar *locale; + GtkWidget *message_box; + GtkWidget *button; + XfceRc *rc; + gboolean auto_online; + GdkScreen *screen; + + g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent)); + + /* get the user's locale without encoding */ + locale = g_strdup (setlocale (LC_MESSAGES, NULL)); + if (G_LIKELY (locale != NULL)) + locale = g_strdelimit (locale, ".", '\0'); + else + locale = g_strdup ("C"); + + /* use desktop version if none is set */ + if (version == NULL) + version = xfce_version_string (); + + /* build the redirect uri */ + uri = g_string_new (MANUAL_WEBSITE); + g_string_append_printf (uri, "?version=%s&locale=%s", version, locale); + g_free (locale); + + if (component != NULL) + g_string_append_printf (uri, "&component=%s", component); + if (page != NULL) + g_string_append_printf (uri, "&page=%s", page); + if (offset != NULL) + g_string_append_printf (uri, "&offset=%s", offset); + + /* check if we should automatically go online */ + rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/help.rc", TRUE); + if (rc != NULL) + { + auto_online = xfce_rc_read_bool_entry (rc, "auto-online", FALSE); + xfce_rc_close (rc); + + if (auto_online) + { + if (parent != NULL) + screen = gtk_window_get_screen (GTK_WINDOW (parent)); + else + screen = xfce_gdk_screen_get_active (NULL); + + xfce_dialog_show_help_uri (screen, parent, uri); + g_string_free (uri, TRUE); + + return; + } + } + + /* try to get a translated name of the application */ + name = g_get_application_name (); + if (g_strcmp0 (name, g_get_prgname ()) == 0) + name = NULL; + + /* try to get a decent primary text */ + if (name != NULL) + primary = g_strdup_printf (_("Do you want to read the %s manual online?"), name); + else + primary = g_strdup (_("Do you want to read the manual online?")); + + dialog = xfce_message_dialog_new (parent, + _("Online Documentation"), +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_QUESTION, +#else + "dialog-question", +#endif + primary, + _("You will be redirected to the documentation website " + "where the help pages are maintained and translated."), +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_CANCEL, +#else + "gtk-cancel", +#endif + GTK_RESPONSE_NO, + XFCE_BUTTON_TYPE_MIXED, +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_HELP, +#else + "help-browser", +#endif + _("_Read Online"), + GTK_RESPONSE_YES, + NULL); + g_free (primary); + +#if GTK_CHECK_VERSION (2, 22, 0) + message_box = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); +#else + message_box = gtk_widget_get_parent (GTK_MESSAGE_DIALOG (dialog)->label); + g_return_if_fail (GTK_IS_VBOX (message_box)); +#endif + + button = gtk_check_button_new_with_mnemonic (_("_Always go directly to the online documentation")); + gtk_box_pack_end (GTK_BOX (message_box), button, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (button), "toggled", + G_CALLBACK (xfce_dialog_show_help_auto_toggled), NULL); + gtk_widget_show (button); + + /* don't focus the checkbutton */ + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); + button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); + gtk_widget_grab_focus (button); + + /* show the dialog without locking the mainloop */ + gtk_window_set_modal (GTK_WINDOW (dialog), parent != NULL); + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (xfce_dialog_show_help_response), uri); + gtk_window_present (GTK_WINDOW (dialog)); +} + + + /** * xfce_dialog_show_info: * @parent : transient parent of the dialog, or %NULL. @@ -66,9 +331,19 @@ primary_text = g_strdup_vprintf (primary_format, args); va_end (args); - xfce_message_dialog (parent, _("Information"), GTK_STOCK_DIALOG_INFO, + xfce_message_dialog (parent, _("Information"), +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_INFO, +#else + "dialog-information", +#endif primary_text, secondary_text, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_CLOSE, +#else + "window-close", +#endif + GTK_RESPONSE_CLOSE, NULL); g_free (primary_text); } @@ -99,9 +374,19 @@ primary_text = g_strdup_vprintf (primary_format, args); va_end (args); - xfce_message_dialog (parent, _("Warning"), GTK_STOCK_DIALOG_WARNING, + xfce_message_dialog (parent, _("Warning"), +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_WARNING, +#else + "dialog-warning", +#endif primary_text, secondary_text, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_CLOSE, +#else + "window-close", +#endif + GTK_RESPONSE_CLOSE, NULL); g_free (primary_text); } @@ -133,9 +418,19 @@ primary_text = g_strdup_vprintf (primary_format, args); va_end (args); - xfce_message_dialog (parent, _("Error"), GTK_STOCK_DIALOG_ERROR, + xfce_message_dialog (parent, _("Error"), +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_DIALOG_ERROR, +#else + "dialog-error", +#endif primary_text, error ? error->message : NULL, - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); +#if !GTK_CHECK_VERSION (3, 10, 0) + GTK_STOCK_CLOSE, +#else + "window-close", +#endif + GTK_RESPONSE_CLOSE, NULL); g_free (primary_text); } @@ -179,13 +474,29 @@ va_end (args); /* whether this will be a yes/no dialog */ - if (stock_id != NULL && strcmp (stock_id, GTK_STOCK_YES) == 0) - no_stock_id = GTK_STOCK_NO; + if (stock_id != NULL && (strcmp (stock_id, "gtk-yes") == 0 || strcmp (stock_id, "yes")) == 0) + { +#if GTK_CHECK_VERSION (3, 10, 0) + no_stock_id = "gtk-no"; +#else + no_stock_id = GTK_STOCK_NO; +#endif + } else - no_stock_id = GTK_STOCK_CANCEL; + { +#if GTK_CHECK_VERSION (3, 10, 0) + no_stock_id = "gtk-cancel"; +#else + no_stock_id = GTK_STOCK_CANCEL; +#endif + } response_id = xfce_message_dialog (parent, _("Question"), +#if !GTK_CHECK_VERSION (3, 10, 0) GTK_STOCK_DIALOG_QUESTION, +#else + "dialog-question", +#endif primary_text, secondary_text, no_stock_id, GTK_RESPONSE_NO, XFCE_BUTTON_TYPE_MIXED, stock_id, @@ -266,8 +577,14 @@ if (icon_stock_id != NULL) { /* set dialog and window icon */ +#if GTK_CHECK_VERSION (3, 10, 0) + image = gtk_image_new_from_icon_name (icon_stock_id, GTK_ICON_SIZE_DIALOG); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), image); +#else image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG); gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); +#endif + gtk_widget_show (image); gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_stock_id); } @@ -284,6 +601,7 @@ /* add a mixed button to the dialog */ button = xfce_gtk_button_new_mixed (stock_id, label); + gtk_widget_set_can_default (button, TRUE); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response); gtk_widget_show (button); } @@ -312,6 +630,7 @@ /* create button and add it to the dialog */ button = gtk_button_new_with_label (label); gtk_button_set_image (GTK_BUTTON (button), image); + gtk_widget_set_can_default (button, TRUE); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response); gtk_widget_show (button); } diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-dialogs.h libxfce4ui-4.12.1/libxfce4ui/xfce-dialogs.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-dialogs.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-dialogs.h 2015-02-18 16:12:39.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) @@ -32,51 +31,62 @@ #define XFCE_BUTTON_TYPE_MIXED "button-mixed" #define XFCE_BUTTON_TYPE_PIXBUF "button-pixbuf" -void xfce_dialog_show_info (GtkWindow *parent, - const gchar *secondary_text, - const gchar *primary_format, - ...) G_GNUC_PRINTF (3, 4); - -void xfce_dialog_show_warning (GtkWindow *parent, - const gchar *secondary_text, - const gchar *primary_format, - ...) G_GNUC_PRINTF (3, 4); - -void xfce_dialog_show_error (GtkWindow *parent, - const GError *error, - const gchar *primary_format, - ...) G_GNUC_PRINTF (3, 4); - -gboolean xfce_dialog_confirm (GtkWindow *parent, - const gchar *stock_id, - const gchar *confirm_label, - const gchar *secondary_text, - const gchar *primary_format, - ...) G_GNUC_PRINTF (5, 6); - -GtkWidget *xfce_message_dialog_new_valist (GtkWindow *parent, - const gchar *title, - const gchar *icon_stock_id, - const gchar *primary_text, - const gchar *secondary_text, - const gchar *first_button_text, - va_list args) G_GNUC_MALLOC; - -GtkWidget *xfce_message_dialog_new (GtkWindow *parent, - const gchar *title, - const gchar *stock_id, - const gchar *primary_text, - const gchar *secondary_text, - const gchar *first_button_text, - ...) G_GNUC_NULL_TERMINATED G_GNUC_MALLOC; - -gint xfce_message_dialog (GtkWindow *parent, - const gchar *title, - const gchar *stock_id, - const gchar *primary_text, - const gchar *secondary_text, - const gchar *first_button_text, - ...) G_GNUC_NULL_TERMINATED; +void xfce_dialog_show_help (GtkWindow *parent, + const gchar *application, + const gchar *page, + const gchar *offset); + +void xfce_dialog_show_help_with_version (GtkWindow *parent, + const gchar *application, + const gchar *page, + const gchar *offset, + const gchar *version); + +void xfce_dialog_show_info (GtkWindow *parent, + const gchar *secondary_text, + const gchar *primary_format, + ...) G_GNUC_PRINTF (3, 4); + +void xfce_dialog_show_warning (GtkWindow *parent, + const gchar *secondary_text, + const gchar *primary_format, + ...) G_GNUC_PRINTF (3, 4); + +void xfce_dialog_show_error (GtkWindow *parent, + const GError *error, + const gchar *primary_format, + ...) G_GNUC_PRINTF (3, 4); + +gboolean xfce_dialog_confirm (GtkWindow *parent, + const gchar *stock_id, + const gchar *confirm_label, + const gchar *secondary_text, + const gchar *primary_format, + ...) G_GNUC_PRINTF (5, 6); + +GtkWidget *xfce_message_dialog_new_valist (GtkWindow *parent, + const gchar *title, + const gchar *icon_stock_id, + const gchar *primary_text, + const gchar *secondary_text, + const gchar *first_button_text, + va_list args) G_GNUC_MALLOC; + +GtkWidget *xfce_message_dialog_new (GtkWindow *parent, + const gchar *title, + const gchar *stock_id, + const gchar *primary_text, + const gchar *secondary_text, + const gchar *first_button_text, + ...) G_GNUC_NULL_TERMINATED G_GNUC_MALLOC; + +gint xfce_message_dialog (GtkWindow *parent, + const gchar *title, + const gchar *stock_id, + const gchar *primary_text, + const gchar *secondary_text, + const gchar *first_button_text, + ...) G_GNUC_NULL_TERMINATED; G_END_DECLS diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-gdk-extensions.c libxfce4ui-4.12.1/libxfce4ui/xfce-gdk-extensions.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-gdk-extensions.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-gdk-extensions.c 2013-10-04 08:51:42.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2003-2007 Benedikt Meurer * Copyright (c) 2007 The Xfce Development Team * @@ -14,9 +13,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -50,53 +49,36 @@ GdkScreen * xfce_gdk_screen_get_active (gint *monitor_return) { -#ifdef GDK_WINDOWING_X11 - GdkScreen *screen; - Window child; - Window root; - GSList *displays; - GSList *lp; - guint xmask; - gint rootx, rooty; - gint winx, winy; - gint n; - - /* determine the list of active displays */ - displays = gdk_display_manager_list_displays (gdk_display_manager_get ()); - for (lp = displays; lp != NULL; lp = lp->next) + GdkDisplay *display; + gint rootx, rooty; + GdkScreen *screen; + +#if GTK_CHECK_VERSION (3, 0, 0) + GdkDeviceManager *manager; + + display = gdk_display_get_default (); + manager = gdk_display_get_device_manager (display); + gdk_device_get_position (gdk_device_manager_get_client_pointer (manager), + &screen, &rootx, &rooty); +#else + display = gdk_display_get_default (); + gdk_display_get_pointer (display, &screen, &rootx, &rooty, NULL); +#endif + + if (G_UNLIKELY (screen == NULL)) { - /* check all screens on this display */ - for (n = 0; n < gdk_display_get_n_screens (lp->data); ++n) - { - /* check if this screen contains the pointer */ - screen = gdk_display_get_screen (lp->data, n); - if (XQueryPointer (GDK_SCREEN_XDISPLAY (screen), - GDK_DRAWABLE_XID (gdk_screen_get_root_window (screen)), - &root, &child, &rootx, &rooty, &winx, &winy, &xmask)) - { - /* return the monitor number */ - if (monitor_return != NULL) - *monitor_return = gdk_screen_get_monitor_at_point (screen, rootx, rooty); - - /* yap, this screen contains the pointer, hence it's the active screen */ - goto out; - } - } + screen = gdk_screen_get_default (); + if (monitor_return != NULL) + *monitor_return = 0; + } + else + { + /* return the monitor number */ + if (monitor_return != NULL) + *monitor_return = gdk_screen_get_monitor_at_point (screen, rootx, rooty); } - - /* nothing found, fallback to default screen */ - screen = gdk_screen_get_default (); - if (monitor_return != NULL) - *monitor_return = 0; - -out: - g_slist_free (displays); return screen; -#else - /* dunno what to do on non-X11 window systems */ - return gdk_screen_get_default (); -#endif } diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-gdk-extensions.h libxfce4ui-4.12.1/libxfce4ui/xfce-gdk-extensions.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-gdk-extensions.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-gdk-extensions.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-gtk-extensions.c libxfce4ui-4.12.1/libxfce4ui/xfce-gtk-extensions.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-gtk-extensions.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-gtk-extensions.c 2015-02-18 16:57:43.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -66,17 +65,23 @@ if (stock_id != NULL) { /* create image widget */ +#if !GTK_CHECK_VERSION (3, 10, 0) if (g_str_has_prefix (stock_id, "gtk-")) image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); else +#endif image = gtk_image_new_from_icon_name (stock_id, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), image); } } else { +#if !GTK_CHECK_VERSION (3, 10, 0) /* fall back to a stock button */ button = gtk_button_new_from_stock (stock_id); +#else + button = gtk_button_new_with_label (label); +#endif } return button; diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-gtk-extensions.h libxfce4ui-4.12.1/libxfce4ui/xfce-gtk-extensions.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-gtk-extensions.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-gtk-extensions.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-heading.c libxfce4ui-4.12.1/libxfce4ui/xfce-heading.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-heading.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-heading.c 2013-10-04 08:51:42.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2006 Benedikt Meurer . * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -39,54 +38,48 @@ #define XFCE_HEADING_SPACING 12 #define XFCE_HEADING_ICON_SIZE 48 -#define XFCE_HEADING_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFCE_TYPE_HEADING, XfceHeadingPrivate)) - - -/* Property identifiers */ -enum -{ - PROP_0, - PROP_ICON, - PROP_ICON_NAME, - PROP_SUBTITLE, - PROP_TITLE, -}; +static void _xfce_heading_finalize (GObject *object); +static void _xfce_heading_realize (GtkWidget *widget); +static void _xfce_heading_size_request (GtkWidget *widget, + GtkRequisition *requisition); +#if GTK_CHECK_VERSION (3, 0, 0) +static void _xfce_heading_get_preferred_width (GtkWidget *widget, + gint *min, + gint *natural); +static void _xfce_heading_get_preferred_height (GtkWidget *widget, + gint *min, + gint *natural); +static gboolean _xfce_heading_draw (GtkWidget *widget, + cairo_t *ctx); +#else +static void _xfce_heading_style_set (GtkWidget *widget, + GtkStyle *previous_style); +static gboolean _xfce_heading_expose_event (GtkWidget *widget, + GdkEventExpose *event); +#endif +static AtkObject *_xfce_heading_get_accessible (GtkWidget *widget); +static PangoLayout *_xfce_heading_make_layout (XfceHeading *heading); +static GdkPixbuf *_xfce_heading_make_pixbuf (XfceHeading *heading); -static void _xfce_heading_finalize (GObject *object); -static void _xfce_heading_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void _xfce_heading_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void _xfce_heading_realize (GtkWidget *widget); -static void _xfce_heading_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void _xfce_heading_style_set (GtkWidget *widget, - GtkStyle *previous_style); -static gboolean _xfce_heading_expose_event (GtkWidget *widget, - GdkEventExpose *event); -static AtkObject *_xfce_heading_get_accessible (GtkWidget *widget); -static PangoLayout *_xfce_heading_make_layout (XfceHeading *heading); -static GdkPixbuf *_xfce_heading_make_pixbuf (XfceHeading *heading); -static GdkPixbuf *_xfce_heading_get_icon (XfceHeading *heading); -static const gchar *_xfce_heading_get_icon_name (XfceHeading *heading); -static const gchar *_xfce_heading_get_subtitle (XfceHeading *heading); -static const gchar *_xfce_heading_get_title (XfceHeading *heading); +struct _XfceHeadingClass +{ + /*< private >*/ + GtkWidgetClass __parent__; +}; +struct _XfceHeading +{ + /*< private >*/ + GtkWidget __parent__; -struct _XfceHeadingPrivate -{ - GdkPixbuf *icon; - gchar *icon_name; - gchar *subtitle; - gchar *title; + GdkPixbuf *icon; + gchar *icon_name; + gchar *subtitle; + gchar *title; }; @@ -101,90 +94,21 @@ GtkWidgetClass *gtkwidget_class; GObjectClass *gobject_class; - /* add our private data to the class */ - g_type_class_add_private (klass, sizeof (XfceHeadingPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = _xfce_heading_finalize; - gobject_class->get_property = _xfce_heading_get_property; - gobject_class->set_property = _xfce_heading_set_property; gtkwidget_class = GTK_WIDGET_CLASS (klass); gtkwidget_class->realize = _xfce_heading_realize; + gtkwidget_class->get_accessible = _xfce_heading_get_accessible; +#if GTK_CHECK_VERSION (3, 0, 0) + gtkwidget_class->get_preferred_width = _xfce_heading_get_preferred_width; + gtkwidget_class->get_preferred_height = _xfce_heading_get_preferred_height; + gtkwidget_class->draw = _xfce_heading_draw; +#else gtkwidget_class->size_request = _xfce_heading_size_request; gtkwidget_class->style_set = _xfce_heading_style_set; gtkwidget_class->expose_event = _xfce_heading_expose_event; - gtkwidget_class->get_accessible = _xfce_heading_get_accessible; - - /** - * XfceHeading:icon: - * - * The #GdkPixbuf to display as icon, or %NULL to use the - * "icon-name" property. - * - * Since: 4.4.0 - **/ - g_object_class_install_property (gobject_class, - PROP_ICON, - g_param_spec_object ("icon", - "icon", - "icon", - GDK_TYPE_PIXBUF, - G_PARAM_READWRITE - | G_PARAM_STATIC_STRINGS)); - - /** - * XfceHeading:icon-name: - * - * If the "icon" property value is %NULL this is the name of - * the icon to display instead (looked up using the icon theme). - * If this property is also %NULL or the specified icon does not - * exist in the selected icon theme, no icon will be displayed. - * - * Since: 4.4.0 - **/ - g_object_class_install_property (gobject_class, - PROP_ICON_NAME, - g_param_spec_string ("icon-name", - "icon-name", - "icon-name", - NULL, - G_PARAM_READWRITE - | G_PARAM_STATIC_STRINGS)); - - /** - * XfceHeading:subtitle: - * - * The sub title that should be displayed below the - * title. May be %NULL or the empty string to display - * only the title. - * - * Since: 4.4.0 - **/ - g_object_class_install_property (gobject_class, - PROP_SUBTITLE, - g_param_spec_string ("subtitle", - "subtitle", - "subtitle", - NULL, - G_PARAM_READWRITE - | G_PARAM_STATIC_STRINGS)); - - /** - * XfceHeading:title: - * - * The title text to display in the heading. - * - * Since: 4.4.0 - **/ - g_object_class_install_property (gobject_class, - PROP_TITLE, - g_param_spec_string ("title", - "title", - "title", - NULL, - G_PARAM_READWRITE - | G_PARAM_STATIC_STRINGS)); +#endif } @@ -192,11 +116,8 @@ static void _xfce_heading_init (XfceHeading *heading) { - /* setup the private data */ - heading->priv = XFCE_HEADING_GET_PRIVATE (heading); - /* setup the widget parameters */ - GTK_WIDGET_UNSET_FLAGS (heading, GTK_NO_WINDOW); + gtk_widget_set_has_window (GTK_WIDGET (heading), TRUE); } @@ -207,12 +128,12 @@ XfceHeading *heading = XFCE_HEADING (object); /* release the private data */ - if (G_UNLIKELY (heading->priv->icon != NULL)) - g_object_unref (G_OBJECT (heading->priv->icon)); + if (G_UNLIKELY (heading->icon != NULL)) + g_object_unref (G_OBJECT (heading->icon)); - g_free (heading->priv->icon_name); - g_free (heading->priv->subtitle); - g_free (heading->priv->title); + g_free (heading->icon_name); + g_free (heading->subtitle); + g_free (heading->title); (*G_OBJECT_CLASS (_xfce_heading_parent_class)->finalize) (object); } @@ -220,110 +141,165 @@ static void -_xfce_heading_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +_xfce_heading_realize (GtkWidget *widget) { - XfceHeading *heading = XFCE_HEADING (object); + GdkWindowAttr attributes; + GtkAllocation allocation; + GdkWindow *window; - switch (prop_id) - { - case PROP_ICON: - g_value_set_object (value, _xfce_heading_get_icon (heading)); - break; - - case PROP_ICON_NAME: - g_value_set_string (value, _xfce_heading_get_icon_name (heading)); - break; - - case PROP_SUBTITLE: - g_value_set_string (value, _xfce_heading_get_subtitle (heading)); - break; - - case PROP_TITLE: - g_value_set_string (value, _xfce_heading_get_title (heading)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + /* mark the widget as realized */ + gtk_widget_set_realized (widget, TRUE); + gtk_widget_get_allocation (widget, &allocation); + + /* setup the window attributes */ + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; +#if !GTK_CHECK_VERSION (3, 0, 0) + attributes.colormap = gtk_widget_get_colormap (widget); +#endif + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.window_type = GDK_WINDOW_CHILD; + attributes.visual = gtk_widget_get_visual (widget); + attributes.event_mask = gtk_widget_get_events (widget) + | GDK_EXPOSURE_MASK; + +#if GTK_CHECK_VERSION (3, 0, 0) + /* allocate the widget window */ + window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, + GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL); + gtk_widget_set_window (widget, window); + gdk_window_set_user_data (window, widget); +#else + /* allocate the widget window */ + window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, + GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP); + gtk_widget_set_window (widget, window); + gdk_window_set_user_data (window, widget); + + /* connect the style to the window */ + gtk_widget_style_attach (widget); + + /* set background color (using the base color) */ + gdk_window_set_background (gtk_widget_get_window (widget), + >k_widget_get_style (widget)->base[GTK_STATE_NORMAL]); +#endif } +#if GTK_CHECK_VERSION (3, 0, 0) static void -_xfce_heading_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +_xfce_heading_get_preferred_width (GtkWidget *widget, + gint *min, + gint *natural) { - XfceHeading *heading = XFCE_HEADING (object); + GtkRequisition requisition; - switch (prop_id) - { - case PROP_ICON: - _xfce_heading_set_icon (heading, g_value_get_object (value)); - break; - - case PROP_ICON_NAME: - _xfce_heading_set_icon_name (heading, g_value_get_string (value)); - break; - - case PROP_SUBTITLE: - _xfce_heading_set_subtitle (heading, g_value_get_string (value)); - break; - - case PROP_TITLE: - _xfce_heading_set_title (heading, g_value_get_string (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + _xfce_heading_size_request (widget, &requisition); + + *min = *natural = requisition.width; } static void -_xfce_heading_realize (GtkWidget *widget) +_xfce_heading_get_preferred_height (GtkWidget *widget, + gint *min, + gint *natural) { - GdkWindowAttr attributes; - /* mark the widget as realized */ - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + GtkRequisition requisition; - /* setup the window attributes */ - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.window_type = GDK_WINDOW_CHILD; - attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = gtk_widget_get_events (widget) - | GDK_EXPOSURE_MASK; + _xfce_heading_size_request (widget, &requisition); - /* allocate the widget window */ - widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, - GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP); - gdk_window_set_user_data (widget->window, widget); + *min = *natural = requisition.height; +} - /* connect the style to the window */ - widget->style = gtk_style_attach (widget->style, widget->window); - /* set background color (using the base color) */ - gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]); + +static gboolean +_xfce_heading_draw (GtkWidget *widget, + cairo_t *ctx) +{ + XfceHeading *heading = XFCE_HEADING (widget); + PangoLayout *layout; + GdkPixbuf *pixbuf; + gboolean rtl; + gint width; + gint height; + gint x; + gint y; + GtkAllocation allocation; + GtkStyleContext *context; + + gtk_widget_get_allocation (widget, &allocation); + + context = gtk_widget_get_style_context (widget); + + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); + + /* check if we should render from right to left */ + rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); + + /* determine the initial horizontal position */ + x = (rtl ? allocation.width - XFCE_HEADING_BORDER : XFCE_HEADING_BORDER); + + gtk_render_background (context, ctx, + allocation.x, allocation.y, + allocation.x + allocation.width, + allocation.y + allocation.height); + + /* check if we have a pixbuf to render */ + pixbuf = _xfce_heading_make_pixbuf (heading); + if (G_LIKELY (pixbuf != NULL)) + { + /* determine the pixbuf dimensions */ + width = gdk_pixbuf_get_width (pixbuf); + height = gdk_pixbuf_get_height (pixbuf); + + /* determine the vertical position */ + y = (allocation.height - height) / 2; + + gtk_render_icon (context, ctx, + pixbuf, + rtl ? x - width : x, + y); + + /* release the pixbuf */ + g_object_unref (G_OBJECT (pixbuf)); + + /* advance the horizontal position */ + x += (rtl ? -1 : 1) * (width + XFCE_HEADING_SPACING); + } + + /* generate the title layout */ + layout = _xfce_heading_make_layout (heading); + pango_layout_get_pixel_size (layout, &width, &height); + + /* determine the vertical position */ + y = (allocation.height - height) / 2; + + gtk_render_layout (context, ctx, + rtl ? x - width : x, y, + layout); + + /* release the layout */ + g_object_unref (G_OBJECT (layout)); + + gtk_style_context_restore (context); + + return FALSE; } +#endif static void _xfce_heading_size_request (GtkWidget *widget, - GtkRequisition *requisition) + GtkRequisition *requisition) { XfceHeading *heading = XFCE_HEADING (widget); PangoLayout *layout; @@ -358,15 +334,17 @@ +#if !GTK_CHECK_VERSION (3, 0, 0) static void _xfce_heading_style_set (GtkWidget *widget, - GtkStyle *previous_style) + GtkStyle *previous_style) { /* check if we're already realized */ - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized (widget)) { /* set background color (using the base color) */ - gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]); + gdk_window_set_background (gtk_widget_get_window (widget), + >k_widget_get_style (widget)->base[GTK_STATE_NORMAL]); } } @@ -374,22 +352,26 @@ static gboolean _xfce_heading_expose_event (GtkWidget *widget, - GdkEventExpose *event) + GdkEventExpose *event) { - XfceHeading *heading = XFCE_HEADING (widget); - PangoLayout *layout; - GdkPixbuf *pixbuf; - gboolean rtl; - gint width; - gint height; - gint x; - gint y; + XfceHeading *heading = XFCE_HEADING (widget); + PangoLayout *layout; + GdkPixbuf *pixbuf; + gboolean rtl; + gint width; + gint height; + gint x; + gint y; + cairo_t *cr; + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); /* check if we should render from right to left */ rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL); /* determine the initial horizontal position */ - x = (rtl ? widget->allocation.width - XFCE_HEADING_BORDER : XFCE_HEADING_BORDER); + x = (rtl ? allocation.width - XFCE_HEADING_BORDER : XFCE_HEADING_BORDER); /* check if we have a pixbuf to render */ pixbuf = _xfce_heading_make_pixbuf (heading); @@ -400,12 +382,13 @@ height = gdk_pixbuf_get_height (pixbuf); /* determine the vertical position */ - y = (widget->allocation.height - height) / 2; + y = (allocation.height - height) / 2; /* render the pixbuf */ - gdk_draw_pixbuf (widget->window, widget->style->black_gc, pixbuf, 0, 0, - (rtl ? x - width : x), y, width, height, - GDK_RGB_DITHER_NORMAL, 0, 0); + cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget))); + gdk_cairo_set_source_pixbuf (cr, pixbuf, (rtl ? x - width : x), y); + cairo_paint (cr); + cairo_destroy (cr); /* release the pixbuf */ g_object_unref (G_OBJECT (pixbuf)); @@ -419,17 +402,21 @@ pango_layout_get_pixel_size (layout, &width, &height); /* determine the vertical position */ - y = (widget->allocation.height - height) / 2; + y = (allocation.height - height) / 2; /* render the title */ - gtk_paint_layout (widget->style, widget->window, GTK_WIDGET_STATE (widget), TRUE, &event->area, - widget, "heading", (rtl ? x - width : x), y, layout); + gtk_paint_layout (gtk_widget_get_style (widget), + gtk_widget_get_window (widget), + gtk_widget_get_state (widget), + TRUE, &event->area, widget, + "heading", (rtl ? x - width : x), y, layout); /* release the layout */ g_object_unref (G_OBJECT (layout)); return FALSE; } +#endif @@ -457,25 +444,26 @@ /* generate the full text */ text = g_string_sized_new (128); - if (G_LIKELY (heading->priv->title != NULL)) + if (G_LIKELY (heading->title != NULL)) { /* add the main title */ - title_length = strlen (heading->priv->title); - g_string_append (text, heading->priv->title); + title_length = strlen (heading->title); + g_string_append (text, heading->title); } - if (heading->priv->subtitle != NULL && *heading->priv->subtitle != '\0') + if (heading->subtitle != NULL && *heading->subtitle != '\0') { /* add an empty line between the title and the subtitle */ - if (G_LIKELY (heading->priv->title != NULL)) + if (G_LIKELY (heading->title != NULL)) g_string_append (text, "\n"); /* add the subtitle */ - g_string_append (text, heading->priv->subtitle); + g_string_append (text, heading->subtitle); } /* allocate and setup a new layout from the widget's context */ layout = gtk_widget_create_pango_layout (GTK_WIDGET (heading), text->str); + /* allocate an attribute list (large bold title) */ attr_list = pango_attr_list_new (); attribute = pango_attr_scale_new (PANGO_SCALE_LARGE); /* large title */ @@ -503,22 +491,44 @@ GtkIconTheme *icon_theme; GdkPixbuf *pixbuf = NULL; GdkScreen *screen; + GdkPixbuf *scaled; - if (G_UNLIKELY (heading->priv->icon != NULL)) + if (G_UNLIKELY (heading->icon != NULL)) { /* just use the specified icon */ - pixbuf = g_object_ref (G_OBJECT (heading->priv->icon)); + pixbuf = g_object_ref (G_OBJECT (heading->icon)); } - else if (G_LIKELY (heading->priv->icon_name != NULL)) + else if (G_LIKELY (heading->icon_name != NULL)) { /* determine the icon theme for the current screen */ screen = gtk_widget_get_screen (GTK_WIDGET (heading)); icon_theme = gtk_icon_theme_get_for_screen (screen); /* try to load the icon from the icon theme */ - pixbuf = gtk_icon_theme_load_icon (icon_theme, heading->priv->icon_name, + pixbuf = gtk_icon_theme_load_icon (icon_theme, heading->icon_name, XFCE_HEADING_ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL); + + if (pixbuf != NULL + && (gdk_pixbuf_get_height (pixbuf) > XFCE_HEADING_ICON_SIZE + || gdk_pixbuf_get_width (pixbuf) > XFCE_HEADING_ICON_SIZE)) + { + /* this doesn't happen often, so be stupid + * and assume icons are always squared */ + scaled = gdk_pixbuf_scale_simple (pixbuf, + XFCE_HEADING_ICON_SIZE, + XFCE_HEADING_ICON_SIZE, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + pixbuf = scaled; + } + + /* cache the icon, this does not take theme changes in account, + * but because of the only use in the titled dialog, this works + * fine, since the window properties are emitted on icon changes */ + if (heading->icon == NULL + && pixbuf != NULL) + heading->icon = g_object_ref (pixbuf); } return pixbuf; @@ -527,40 +537,6 @@ /** - * _xfce_heading_new: - * - * Allocates a new #XfceHeading instance. - * - * Return value: the newly allocated #XfceHeading. - **/ -GtkWidget* -_xfce_heading_new (void) -{ - return g_object_new (XFCE_TYPE_HEADING, NULL); -} - - - -/** - * _xfce_heading_get_icon: - * @heading : a #XfceHeading. - * - * Returns the #GdkPixbuf that was set as icon for - * @heading or %NULL if no icon is set. The returned - * #GdkPixbuf object is owned by @heading. - * - * Return value: the icon for @heading, or %NULL. - **/ -static GdkPixbuf* -_xfce_heading_get_icon (XfceHeading *heading) -{ - g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); - return heading->priv->icon; -} - - - -/** * _xfce_heading_set_icon: * @heading : a #XfceHeading. * @icon : the new icon or %NULL. @@ -573,53 +549,45 @@ _xfce_heading_set_icon (XfceHeading *heading, GdkPixbuf *icon) { - g_return_if_fail (XFCE_IS_HEADING (heading)); - g_return_if_fail (icon == NULL || GDK_IS_PIXBUF (icon)); + _libxfce4ui_return_if_fail (XFCE_IS_HEADING (heading)); + _libxfce4ui_return_if_fail (icon == NULL || GDK_IS_PIXBUF (icon)); /* check if we have a new icon */ - if (G_LIKELY (heading->priv->icon != icon)) + if (G_LIKELY (heading->icon != icon)) { /* disconnect from the previous icon */ - if (G_LIKELY (heading->priv->icon != NULL)) - g_object_unref (G_OBJECT (heading->priv->icon)); - - /* activate the new icon */ - heading->priv->icon = icon; + if (G_LIKELY (heading->icon != NULL)) + g_object_unref (G_OBJECT (heading->icon)); - /* connect to the new icon */ - if (G_LIKELY (icon != NULL)) - g_object_ref (G_OBJECT (icon)); + if (icon != NULL) + { + if (gdk_pixbuf_get_height (icon) > XFCE_HEADING_ICON_SIZE + || gdk_pixbuf_get_width (icon) > XFCE_HEADING_ICON_SIZE) + { + /* this doesn't happen often, so be stupid + * and assume icons are always squared */ + heading->icon = gdk_pixbuf_scale_simple (icon, + XFCE_HEADING_ICON_SIZE, + XFCE_HEADING_ICON_SIZE, + GDK_INTERP_BILINEAR); + } + else + { + heading->icon = g_object_ref (icon); + } + } + else + { + heading->icon = NULL; + } - /* schedule a resize */ gtk_widget_queue_resize (GTK_WIDGET (heading)); - - /* notify listeners */ - g_object_notify (G_OBJECT (heading), "icon"); } } /** - * _xfce_heading_get_icon_name: - * @heading : a #XfceHeading. - * - * Returns the icon name previously set by a call to - * _xfce_heading_set_icon_name() or %NULL if no icon name - * is set for @heading. - * - * Return value: the icon name for @heading, or %NULL. - **/ -static const gchar* -_xfce_heading_get_icon_name (XfceHeading *heading) -{ - g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); - return heading->priv->icon_name; -} - - - -/** * _xfce_heading_set_icon_name: * @heading : a #XfceHeading. * @icon_name : the new icon name, or %NULL. @@ -632,38 +600,13 @@ _xfce_heading_set_icon_name (XfceHeading *heading, const gchar *icon_name) { - g_return_if_fail (XFCE_IS_HEADING (heading)); - - /* release the previous icon name */ - g_free (heading->priv->icon_name); + _libxfce4ui_return_if_fail (XFCE_IS_HEADING (heading)); /* activate the new icon name */ - heading->priv->icon_name = g_strdup (icon_name); + g_free (heading->icon_name); + heading->icon_name = g_strdup (icon_name); - /* schedule a resize */ gtk_widget_queue_resize (GTK_WIDGET (heading)); - - /* notify listeners */ - g_object_notify (G_OBJECT (heading), "icon-name"); -} - - - -/** - * _xfce_heading_get_subtitle: - * @heading : a #XfceHeading. - * - * Returns the sub title displayed below the - * main title of the @heading, or %NULL if - * no subtitle is set. - * - * Return value: the subtitle of @heading, or %NULL. - **/ -static const gchar* -_xfce_heading_get_subtitle (XfceHeading *heading) -{ - g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); - return heading->priv->subtitle; } @@ -680,37 +623,14 @@ _xfce_heading_set_subtitle (XfceHeading *heading, const gchar *subtitle) { - g_return_if_fail (XFCE_IS_HEADING (heading)); - g_return_if_fail (subtitle == NULL || g_utf8_validate (subtitle, -1, NULL)); - - /* release the previous subtitle */ - g_free (heading->priv->subtitle); + _libxfce4ui_return_if_fail (XFCE_IS_HEADING (heading)); + _libxfce4ui_return_if_fail (subtitle == NULL || g_utf8_validate (subtitle, -1, NULL)); /* activate the new subtitle */ - heading->priv->subtitle = g_strdup (subtitle); + g_free (heading->subtitle); + heading->subtitle = g_strdup (subtitle); - /* schedule a resize */ gtk_widget_queue_resize (GTK_WIDGET (heading)); - - /* notify listeners */ - g_object_notify (G_OBJECT (heading), "subtitle"); -} - - - -/** - * _xfce_heading_get_title: - * @heading : a #XfceHeading. - * - * Returns the title displayed by the @heading. - * - * Return value: the title displayed by the @heading. - **/ -static const gchar* -_xfce_heading_get_title (XfceHeading *heading) -{ - g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL); - return heading->priv->title; } @@ -727,20 +647,14 @@ _xfce_heading_set_title (XfceHeading *heading, const gchar *title) { - g_return_if_fail (XFCE_IS_HEADING (heading)); - g_return_if_fail (title == NULL || g_utf8_validate (title, -1, NULL)); - - /* release the previous title */ - g_free (heading->priv->title); + _libxfce4ui_return_if_fail (XFCE_IS_HEADING (heading)); + _libxfce4ui_return_if_fail (title == NULL || g_utf8_validate (title, -1, NULL)); /* activate the new title */ - heading->priv->title = g_strdup (title); + g_free (heading->title); + heading->title = g_strdup (title); - /* schedule a resize */ gtk_widget_queue_resize (GTK_WIDGET (heading)); - - /* notify listeners */ - g_object_notify (G_OBJECT (heading), "title"); } diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-heading.h libxfce4ui-4.12.1/libxfce4ui/xfce-heading.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-heading.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-heading.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2006 Benedikt Meurer . * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) @@ -29,7 +28,6 @@ G_BEGIN_DECLS -typedef struct _XfceHeadingPrivate XfceHeadingPrivate; typedef struct _XfceHeadingClass XfceHeadingClass; typedef struct _XfceHeading XfceHeading; @@ -40,23 +38,8 @@ #define XFCE_IS_HEADING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_HEADING)) #define XFCE_HEADING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_HEADING, XfceHeadingClass)) -struct _XfceHeadingClass -{ - /*< private >*/ - GtkWidgetClass __parent__; -}; - -struct _XfceHeading -{ - /*< private >*/ - GtkWidget __parent__; - XfceHeadingPrivate *priv; -}; - GType _xfce_heading_get_type (void) G_GNUC_CONST; -GtkWidget *_xfce_heading_new (void) G_GNUC_MALLOC; - void _xfce_heading_set_icon (XfceHeading *heading, GdkPixbuf *icon); diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-sm-client.c libxfce4ui-4.12.1/libxfce4ui/xfce-sm-client.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-sm-client.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-sm-client.c 2013-10-04 08:51:42.000000000 +0000 @@ -1,20 +1,21 @@ /* - * Copyright (c) 2009 Brian Tarricone - * Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) + * Copyright (c) 2009 Brian Tarricone + * Copyright (C) 1999 Olivier Fourdan * - * 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 2.1 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 Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ /** @@ -55,7 +56,8 @@ #include #endif -#include +#include +#include #include #include @@ -642,7 +644,7 @@ g_free(sm_client->client_id); sm_client->client_id = g_strdup(client_id); - gdk_set_sm_client_id(sm_client->client_id); + gdk_x11_set_sm_client_id(sm_client->client_id); g_object_notify(G_OBJECT(sm_client), "client-id"); } @@ -1365,6 +1367,27 @@ #endif + +/** + * xfce_sm_client_error_quark: + * + * Gets the XfceSmClient Error Quark. + * + * Return value: a #GQuark. + **/ +GQuark +xfce_sm_client_error_quark (void) +{ + static GQuark q; + + if G_UNLIKELY (q == 0) + q = g_quark_from_static_string ("xfce-sm-client-error-quark"); + + return q; +} + + + /** * xfce_sm_client_get_option_group: * @argc: The application's argument count @@ -1584,15 +1607,13 @@ if(!sm_client->session_connection) { if(error) { - /* FIXME: error domain/code */ - g_set_error(error, 0, 1, + g_set_error(error, XFCE_SM_CLIENT_ERROR, XFCE_SM_CLIENT_ERROR_FAILED, _("Failed to connect to the session manager: %s"), buf); } return FALSE; } else if(!given_client_id) { if(error) { - /* FIXME: error domain/code */ - g_set_error(error, 0, 1, + g_set_error(error, XFCE_SM_CLIENT_ERROR, XFCE_SM_CLIENT_ERROR_INVALID_CLIENT, _("Session manager did not return a valid client id")); } return FALSE; @@ -1718,7 +1739,7 @@ SmcCloseConnection(sm_client->session_connection, 0, NULL); sm_client->session_connection = NULL; - gdk_set_sm_client_id(NULL); + gdk_x11_set_sm_client_id(NULL); xfce_sm_client_set_state(sm_client, XFCE_SM_CLIENT_STATE_DISCONNECTED); #endif @@ -2138,7 +2159,7 @@ * * Returns: an opaque object-owned string **/ -G_CONST_RETURN gchar * +const gchar * xfce_sm_client_get_client_id(XfceSMClient *sm_client) { g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL); @@ -2171,7 +2192,7 @@ * Returns: a file name string, owned by the object or %NULL if * the session client is disabled. **/ -G_CONST_RETURN gchar * +const gchar * xfce_sm_client_get_state_file(XfceSMClient *sm_client) { gchar *resource, *p; @@ -2233,7 +2254,7 @@ * * Returns: an object-owned string **/ -G_CONST_RETURN gchar * +const gchar * xfce_sm_client_get_current_directory(XfceSMClient *sm_client) { g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL); @@ -2249,7 +2270,7 @@ * * Returns: an object-owned string vector **/ -G_CONST_RETURN gchar * G_CONST_RETURN * +const gchar * const * xfce_sm_client_get_restart_command(XfceSMClient *sm_client) { g_return_val_if_fail(XFCE_IS_SM_CLIENT(sm_client), NULL); diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-sm-client.h libxfce4ui-4.12.1/libxfce4ui/xfce-sm-client.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-sm-client.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-sm-client.h 2013-10-04 08:51:42.000000000 +0000 @@ -1,20 +1,21 @@ /* - * Copyright (c) 2009 Brian Tarricone - * Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) + * Copyright (c) 2009 Brian Tarricone + * Copyright (C) 1999 Olivier Fourdan * - * 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 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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. + * 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 + * Library 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 Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifndef __XFCE_SM_CLIENT_H__ @@ -33,6 +34,26 @@ #define XFCE_IS_SM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), XFCE_TYPE_SM_CLIENT)) #define XFCE_SM_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XFCE_TYPE_SM_CLIENT, XfceSMClientClass)) +/** + * XFCE_SM_CLIENT_ERROR: + * + * Error domain for XfceSmCLient. Errors in this domain will be from the #XfceSmCLientErrorEnum enumeration. + * See #GError for more information on error domains. + **/ +#define XFCE_SM_CLIENT_ERROR xfce_sm_client_error_quark() + +/** + * XfceSmCLientErrorEnum: + * @G_IO_ERROR_FAILED: Failed to connect to the session manager. + * @XFCE_SM_CLIENT_ERROR_INVALID_CLIENT: Session does not have a valid client id. + * + * Error codes returned by XfceSmCLient functions. + **/ +typedef enum { + XFCE_SM_CLIENT_ERROR_FAILED, + XFCE_SM_CLIENT_ERROR_INVALID_CLIENT +} XfceSmCLientErrorEnum; + G_BEGIN_DECLS typedef enum @@ -63,6 +84,8 @@ GType xfce_sm_client_get_type(void) G_GNUC_CONST; +GQuark xfce_sm_client_error_quark (void); + GOptionGroup *xfce_sm_client_get_option_group(gint argc, gchar **argv); @@ -93,9 +116,9 @@ void xfce_sm_client_set_desktop_file(XfceSMClient *sm_client, const gchar *desktop_file); -G_CONST_RETURN gchar *xfce_sm_client_get_client_id(XfceSMClient *sm_client); +const gchar *xfce_sm_client_get_client_id(XfceSMClient *sm_client); -G_CONST_RETURN gchar *xfce_sm_client_get_state_file(XfceSMClient *sm_client); +const gchar *xfce_sm_client_get_state_file(XfceSMClient *sm_client); void xfce_sm_client_set_restart_style(XfceSMClient *sm_client, XfceSMClientRestartStyle restart_style); @@ -107,11 +130,11 @@ void xfce_sm_client_set_current_directory(XfceSMClient *sm_client, const gchar *current_directory); -G_CONST_RETURN gchar *xfce_sm_client_get_current_directory(XfceSMClient *sm_client); +const gchar *xfce_sm_client_get_current_directory(XfceSMClient *sm_client); void xfce_sm_client_set_restart_command(XfceSMClient *sm_client, gchar **restart_command); -G_CONST_RETURN gchar * G_CONST_RETURN * +const gchar * const * xfce_sm_client_get_restart_command(XfceSMClient *sm_client); G_END_DECLS diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-spawn.c libxfce4ui-4.12.1/libxfce4ui/xfce-spawn.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-spawn.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-spawn.c 2015-02-18 16:12:39.000000000 +0000 @@ -1,7 +1,6 @@ -/* $Id$ */ -/*- - * Copyright (c) 2005-2007 Benedikt Meurer - * Copyright (c) 2007 The Xfce Development Team +/* + * Copyright (c) 2009 Brian Tarricone + * Copyright (C) 1999 Olivier Fourdan * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -14,9 +13,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -211,12 +210,14 @@ _NET_CURRENT_DESKTOP = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_NET_CURRENT_DESKTOP", False); _WIN_WORKSPACE = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_WIN_WORKSPACE", False); - if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), GDK_WINDOW_XWINDOW (root), + if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), + gdk_x11_get_default_root_xwindow(), _NET_CURRENT_DESKTOP, 0, 32, False, XA_CARDINAL, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, (gpointer) &prop_ret) != Success) { - if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), GDK_WINDOW_XWINDOW (root), + if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), + gdk_x11_get_default_root_xwindow(), _WIN_WORKSPACE, 0, 32, False, XA_CARDINAL, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, (gpointer) &prop_ret) != Success) @@ -236,7 +237,12 @@ XFree (prop_ret); } - gdk_error_trap_pop (); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else + if (gdk_error_trap_pop () != 0) + return 0; +#endif return ws_num; } @@ -383,17 +389,13 @@ startup_id = sn_launcher_context_get_startup_id (sn_launcher); if (G_LIKELY (startup_id != NULL)) cenvp[n_cenvp++] = g_strconcat ("DESKTOP_STARTUP_ID=", startup_id, NULL); - - /* we want to watch the child process */ - flags |= G_SPAWN_DO_NOT_REAP_CHILD; } } } #endif - /* watch the child when the user supplied a closure too */ - if (child_watch_closure != NULL) - flags |= G_SPAWN_DO_NOT_REAP_CHILD; + /* watch the child process */ + flags |= G_SPAWN_DO_NOT_REAP_CHILD; /* test if the working directory exists */ if (working_directory == NULL || *working_directory == '\0') @@ -417,37 +419,34 @@ if (G_LIKELY (succeed)) { - if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) != 0) + /* setup data to watch the child */ + spawn_data = g_slice_new0 (XfceSpawnData); + spawn_data->pid = pid; + if (child_watch_closure != NULL) { - /* setup data to watch the child */ - spawn_data = g_slice_new0 (XfceSpawnData); - spawn_data->pid = pid; - if (child_watch_closure != NULL) - { - spawn_data->closure = g_closure_ref (child_watch_closure); - g_closure_sink (spawn_data->closure); - } + spawn_data->closure = g_closure_ref (child_watch_closure); + g_closure_sink (spawn_data->closure); + } - spawn_data->watch_id = g_child_watch_add_full (G_PRIORITY_LOW, pid, - xfce_spawn_startup_watch, - spawn_data, - xfce_spawn_startup_watch_destroy); + spawn_data->watch_id = g_child_watch_add_full (G_PRIORITY_LOW, pid, + xfce_spawn_startup_watch, + spawn_data, + xfce_spawn_startup_watch_destroy); #ifdef HAVE_LIBSTARTUP_NOTIFICATION - if (G_LIKELY (sn_launcher != NULL)) - { - /* start a timeout to stop the startup notification sequence after - * a certain about of time, to handle applications that do not - * properly implement startup notify */ - spawn_data->sn_launcher = sn_launcher; - spawn_data->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, - XFCE_SPAWN_STARTUP_TIMEOUT, - xfce_spawn_startup_timeout, - spawn_data, - xfce_spawn_startup_timeout_destroy); - } -#endif + if (G_LIKELY (sn_launcher != NULL)) + { + /* start a timeout to stop the startup notification sequence after + * a certain about of time, to handle applications that do not + * properly implement startup notify */ + spawn_data->sn_launcher = sn_launcher; + spawn_data->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_LOW, + XFCE_SPAWN_STARTUP_TIMEOUT, + xfce_spawn_startup_timeout, + spawn_data, + xfce_spawn_startup_timeout_destroy); } +#endif } else { diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-spawn.h libxfce4ui-4.12.1/libxfce4ui/xfce-spawn.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-spawn.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-spawn.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2007 The Xfce Development Team * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-titled-dialog.c libxfce4ui-4.12.1/libxfce4ui/xfce-titled-dialog.c --- libxfce4ui-4.8.1/libxfce4ui/xfce-titled-dialog.c 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-titled-dialog.c 2013-10-04 08:51:42.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2006 Benedikt Meurer . * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #ifdef HAVE_CONFIG_H @@ -107,8 +106,8 @@ /* connect additional key bindings to the GtkDialog::close action signal */ binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_w, GDK_CONTROL_MASK, "close", 0); - gtk_binding_entry_add_signal (binding_set, GDK_W, GDK_CONTROL_MASK, "close", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_w, GDK_CONTROL_MASK, "close", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_W, GDK_CONTROL_MASK, "close", 0); } @@ -118,40 +117,47 @@ { GtkWidget *line; GtkWidget *vbox; + GtkWidget *content_area; /* connect the private data */ titled_dialog->priv = XFCE_TITLED_DIALOG_GET_PRIVATE (titled_dialog); /* remove the main dialog box from the window */ - g_object_ref (G_OBJECT (GTK_DIALOG (titled_dialog)->vbox)); - gtk_container_remove (GTK_CONTAINER (titled_dialog), GTK_DIALOG (titled_dialog)->vbox); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (titled_dialog)); + g_object_ref (G_OBJECT (content_area)); + gtk_container_remove (GTK_CONTAINER (titled_dialog), content_area); /* add a new vbox w/o border to the main window */ +#if GTK_CHECK_VERSION (3, 0, 0) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#else vbox = gtk_vbox_new (FALSE, 0); +#endif gtk_container_add (GTK_CONTAINER (titled_dialog), vbox); gtk_widget_show (vbox); /* add the heading to the window */ - titled_dialog->priv->heading = _xfce_heading_new (); + titled_dialog->priv->heading = g_object_new (XFCE_TYPE_HEADING, NULL); gtk_box_pack_start (GTK_BOX (vbox), titled_dialog->priv->heading, FALSE, FALSE, 0); gtk_widget_show (titled_dialog->priv->heading); /* add the separator between header and content */ +#if GTK_CHECK_VERSION (3, 0, 0) + line = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); +#else line = gtk_hseparator_new (); +#endif gtk_box_pack_start (GTK_BOX (vbox), line, FALSE, FALSE, 0); gtk_widget_show (line); /* add the main dialog box to the new vbox */ - gtk_box_pack_start (GTK_BOX (vbox), GTK_DIALOG (titled_dialog)->vbox, TRUE, TRUE, 0); - g_object_unref (G_OBJECT (GTK_DIALOG (titled_dialog)->vbox)); + gtk_box_pack_start (GTK_BOX (vbox), content_area, TRUE, TRUE, 0); + g_object_unref (G_OBJECT(content_area)); /* make sure to update the heading whenever one of the relevant window properties changes */ g_signal_connect (G_OBJECT (titled_dialog), "notify::icon", G_CALLBACK (xfce_titled_dialog_update_heading), NULL); g_signal_connect (G_OBJECT (titled_dialog), "notify::icon-name", G_CALLBACK (xfce_titled_dialog_update_heading), NULL); g_signal_connect (G_OBJECT (titled_dialog), "notify::title", G_CALLBACK (xfce_titled_dialog_update_heading), NULL); - - /* initially update the heading properties */ - xfce_titled_dialog_update_heading (titled_dialog); } @@ -220,11 +226,11 @@ GdkEvent *event; /* verify that the dialog is realized */ - if (G_LIKELY (GTK_WIDGET_REALIZED (dialog))) + if (G_LIKELY (gtk_widget_get_realized (GTK_WIDGET (dialog)))) { /* send a delete event to the dialog */ event = gdk_event_new (GDK_DELETE); - event->any.window = g_object_ref (GTK_WIDGET (dialog)->window); + event->any.window = g_object_ref (gtk_widget_get_window(GTK_WIDGET (dialog))); event->any.send_event = TRUE; gtk_main_do_event (event); gdk_event_free (event); @@ -287,7 +293,6 @@ /* allocate the dialog */ dialog = g_object_new (XFCE_TYPE_TITLED_DIALOG, "destroy-with-parent", ((flags & GTK_DIALOG_DESTROY_WITH_PARENT) != 0), - "has-separator", ((flags & GTK_DIALOG_NO_SEPARATOR) == 0), "modal", ((flags & GTK_DIALOG_MODAL) != 0), "title", title, NULL); @@ -320,7 +325,7 @@ * * Return value: the subtitle of @titled_dialog, or %NULL. **/ -G_CONST_RETURN gchar* +const gchar* xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog) { g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (titled_dialog), NULL); diff -Nru libxfce4ui-4.8.1/libxfce4ui/xfce-titled-dialog.h libxfce4ui-4.12.1/libxfce4ui/xfce-titled-dialog.h --- libxfce4ui-4.8.1/libxfce4ui/xfce-titled-dialog.h 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui/xfce-titled-dialog.h 2012-05-03 22:30:28.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id$ */ -/*- +/* * Copyright (c) 2006 Benedikt Meurer . * * This library is free software; you can redistribute it and/or @@ -13,9 +12,9 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA */ #if !defined (LIBXFCE4UI_INSIDE_LIBXFCE4UI_H) && !defined (LIBXFCE4UI_COMPILATION) @@ -70,7 +69,7 @@ const gchar *first_button_text, ...) G_GNUC_MALLOC; -G_CONST_RETURN gchar *xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog); +const gchar *xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog); void xfce_titled_dialog_set_subtitle (XfceTitledDialog *titled_dialog, const gchar *subtitle); diff -Nru libxfce4ui-4.8.1/libxfce4ui.spec.in libxfce4ui-4.12.1/libxfce4ui.spec.in --- libxfce4ui-4.8.1/libxfce4ui.spec.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/libxfce4ui.spec.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -Summary: Widgets library for the Xfce desktop environment -Name: @PACKAGE_TARNAME@ -Version: @PACKAGE_VERSION@ -Release: 1 -License: LGPL -URL: http://www.xfce.org/ -Source0: %{name}-%{version}.tar.gz -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-root -Requires: glib2 >= @GOBJECT_REQUIRED_VERSION@ -Requires: gtk2 >= @GTK_REQUIRED_VERSION@ -Requires: libxfce4util >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: glib2-devel >= @GOBJECT_REQUIRED_VERSION@ -BuildRequires: gtk2-devel >= @GTK_REQUIRED_VERSION@ -BuildRequires: libxfce4util-devel >= @LIBXFCE4UTIL_REQUIRED_VERSION@ -BuildRequires: gtk-doc - -%description -Widgets and other frequently used functions for the Xfce desktop environment. - -%package devel -Summary: Development files for the libxfce4ui library -Group: Development/Libraries -Requires: @PACKAGE_TARNAME@@LIBXFCE4UI_VERSION_API@ >= @PACKAGE_VERSION@ - -%description devel -Static libraries and header files for the libxfce4ui library. - -%prep -%setup -q - -%build -%configure --enable-final --enable-gtk-doc -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root) -%{_libdir}/lib*.so.* -%{_sbindir}/* - -%files devel -%defattr(-, root, root) -%{_libdir}/lib*.so -%{_libdir}/*a -%{_libdir}/pkgconfig/*.pc -%{_includedir}/xfce4/libxfce4ui -%{_datadir}/gtk-doc - diff -Nru libxfce4ui-4.8.1/ltmain.sh libxfce4ui-4.12.1/ltmain.sh --- libxfce4ui-4.8.1/ltmain.sh 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/ltmain.sh 2015-03-15 18:14:44.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 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. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# 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 -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --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 -# -# 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.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 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. + +# 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. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES 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 . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -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. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +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" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -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 +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_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 +# 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 +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# 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 +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# 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,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# 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 -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# 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 +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # 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 +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # 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 -} +# 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 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# 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='s/\([`"$\\]\)/\\\1/g' - -# 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. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# 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: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# 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. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # 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 "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_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 "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_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_append 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 +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + 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 -z "$func_relative_path_tlibdir"; 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 -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# 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). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + 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 () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 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. + +# 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 . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# 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 + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $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/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# 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 () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - 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_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# 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 () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - 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 + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --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 + --no-warnings equivalent to '-Wnone' + --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 more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +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 + +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) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # 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 + 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 + 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 + 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 + fi - exit $EXIT_MISMATCH - 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 +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# 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_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # 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 + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# 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 - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --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" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --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: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # 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: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + 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 $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # 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 +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; 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=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { 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_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + 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"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + 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 -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" + 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 @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # 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"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + 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. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# 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. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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. @@ -1731,11 +3019,12 @@ # 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" + $debug_cmd + + 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" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + 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" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# 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. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + 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}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + 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 ';.'; @@ -1849,7 +3143,7 @@ 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_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" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # 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" + $debug_cmd + + 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_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" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + 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_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" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + 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 @@ -1937,7 +3235,7 @@ 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_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" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # 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 "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -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 + -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 +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -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 + -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) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -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. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # 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" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + 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 \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ 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 "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 " - 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 " - 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" + $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'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # 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 + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # 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" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#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 +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#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 +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + 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 @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result 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="" + 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 + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# 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 () +{ + $debug_cmd + + 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 () +{ + $debug_cmd + + 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_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # 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 (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 ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + 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 /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./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 + # archive that possess that section. Heuristic: eliminate + # all those that 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 @@ -3658,30 +5053,6 @@ $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 @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + 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 + 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="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; 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" @@ -3724,7 +5097,7 @@ 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 + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # 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 +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # 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 +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$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 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#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) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#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__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ 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'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" 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" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -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 + # -fstack-protector* stack protector 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 + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # 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_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ 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 "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi 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 + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; 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" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + 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" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot 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." - if test "$module" = yes; then + if test yes = "$module"; 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." 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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append 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 ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + 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` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$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 func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ 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 + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do 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 + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ 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 + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= 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 + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ 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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; 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." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || 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" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ 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" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # 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 @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + 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" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi 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" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_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 + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ 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 + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { 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" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; 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 @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac 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 "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $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 - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. 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" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ case $host,$output,$installed,$module,$dlname in *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 + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then 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 + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru libxfce4ui-4.8.1/Makefile.am libxfce4ui-4.12.1/Makefile.am --- libxfce4ui-4.8.1/Makefile.am 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/Makefile.am 2015-02-18 17:34:14.000000000 +0000 @@ -1,18 +1,19 @@ -# $Id$ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ libxfce4ui \ libxfce4kbd-private \ + xfce4-about \ glade \ + icons \ docs \ po -distclean-local: - rm -rf *.spec *.cache *~ +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz +distclean-local: + rm -rf *.cache *~ .PHONY: ChangeLog @@ -24,13 +25,11 @@ dist-hook: ChangeLog EXTRA_DIST = \ - libxfce4ui.spec.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - libxfce4ui.spec \ intltool-extract \ intltool-merge \ intltool-update diff -Nru libxfce4ui-4.8.1/Makefile.in libxfce4ui-4.12.1/Makefile.in --- libxfce4ui-4.8.1/Makefile.in 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,9 +13,52 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -# $Id$ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,52 +79,88 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libxfce4ui.spec.in $(top_srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL NEWS THANKS TODO compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ - mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING THANKS TODO compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = libxfce4ui.spec +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_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -108,9 +186,11 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -156,16 +236,21 @@ GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ GOBJECT_VERSION = @GOBJECT_VERSION@ GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ -GTK_VERSION = @GTK_VERSION@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -178,6 +263,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -207,6 +296,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -292,6 +382,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -315,21 +407,25 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ libxfce4ui \ libxfce4kbd-private \ + xfce4-about \ glade \ + icons \ docs \ po +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + EXTRA_DIST = \ - libxfce4ui.spec.in \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - libxfce4ui.spec \ intltool-extract \ intltool-merge \ intltool-update @@ -342,7 +438,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -378,10 +474,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -393,8 +487,6 @@ distclean-hdr: -rm -f config.h stamp-h1 -libxfce4ui.spec: $(top_builddir)/config.status $(srcdir)/libxfce4ui.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -406,22 +498,25 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -436,57 +531,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -502,12 +552,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -519,15 +564,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -536,9 +577,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -574,13 +637,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -612,36 +672,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -652,8 +717,8 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -663,17 +728,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -696,13 +763,21 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -733,10 +808,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -819,33 +899,28 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-local distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am distclean-local: - rm -rf *.spec *.cache *~ - -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz + rm -rf *.cache *~ .PHONY: ChangeLog diff -Nru libxfce4ui-4.8.1/missing libxfce4ui-4.12.1/missing --- libxfce4ui-4.8.1/missing 2011-12-23 16:12:56.000000000 +0000 +++ libxfce4ui-4.12.1/missing 2015-03-15 18:14:47.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru libxfce4ui-4.8.1/mkinstalldirs libxfce4ui-4.12.1/mkinstalldirs --- libxfce4ui-4.8.1/mkinstalldirs 2011-12-23 16:12:57.000000000 +0000 +++ libxfce4ui-4.12.1/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru libxfce4ui-4.8.1/NEWS libxfce4ui-4.12.1/NEWS --- libxfce4ui-4.8.1/NEWS 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/NEWS 2015-03-15 18:11:26.000000000 +0000 @@ -1,3 +1,114 @@ +4.12.1 +====== +- Fix glade directory information in .pc file (bug #11353) +- Add shortcuts for xfwm4 to tile windows to corners (bug #11652) +- Remove unused 'has_member' variable in xfce4-about (bug #11654) +- Update .gitignore +- Increase xfce4-about default size +- Improve formatting of translators list +- Update translation contributors in xfce4-about +- Update contributors lists +- Translation updates: Bulgarian, Chinese (China), Croatian, Czech, Dutch + (Flemish), French, German, Hebrew, Indonesian, Italian, Japanese, Kazakh, + Korean, Malay, Polish, Portuguese, Russian, Serbian, Slovak, Spanish, Thai, + Turkish, Ukrainian + +4.12.0 +====== +- Bump version +- Lots of translation updates + +4.11.2 +====== +- Bump dependencies versions (autotools, Xfce libraries) +- Remove SVN $Id$ tags +- Properly quote AC_LANG_SOURCE +- Fix autoconf m4 directory warning +- Fix IT_PROG_INTLTOOL warning +- Fix build with --enable-debug=full and GTK3 (bug #11176) +- Add .gitignore +- Fix grabbing shortcuts with modifier (bug #10373) +- Avoid double forking when spawning external apps (bug #9373) +- Don't drop startup notify hint when resetting to defaults (bug #10630) +- Add l shortcut for screen locking (xflock4) (bug #10728) +- Fix xfce_dialog_show_help() + +4.11.1 +====== +- Add xfce_dialog_show_help_with_version() so applications can send + their own version number and not the desktop version. +- Translation updates: Arabic, Bulgarian, Bengali, Danish, German, + Greek, Finnish, Galician, Croatian, Icelandic, Japanese, Kazakh, + Korean, Lithuanian, Malay, Norwegian Bokmal, Norwegian Nynorsk, + Occitan (post 1500), Portuguese, Portuguese (Brazilian), Romanian, + Russian, Slovak, Slovenian, Serbian, Telugu, Ukrainian, Chinese + (China), Chinese (Hong Kong), Chinese (Taiwan). + +4.11.0 +====== +- Compile GTK+-3 version of libxfce4ui when possible. +- Depend on GTK 2.24 and Glib 2.28. +- Only define distclean files in maintainer mode (bug #8974). +- Don't remove keyboard shortcut when entered twice (bug #8749). +- Fix keyboard shortcuts with Shift modifier (bug #8744). +- Fix alt + print being detected as SysReq (bug #7897). +- Use instead of (bug #8200). +- Fix keyboard shortcuts with keypad (bug #4178). +- Autotools updates. +- Prefer exo-open for opening the manual pages. +- Add error domain for XfceSmClient. +- Translation updates: Amharic, Arabic, Asturian, Bulgarian, Bengali, + Catalan (Valencian), Czech, Danish, German, Greek, English (United + Kingdom), Spanish (Castilian), Basque, Finnish, French, Galician, + Hebrew, Croatian, Hungarian, Indonesian, Icelandic, Italian, + Japanese, Kazakh, Korean, Kurdish, Lithuanian, Latvian, Norwegian + Bokmal, Dutch (Flemish), Norwegian Nynorsk, Panjabi (Punjabi), + Polish, Portuguese, Portuguese (Brazilian), Romanian, Russian, + Sinhala, Slovak, Serbian, Swedish, Telugu, Thai, Tagalog, Tagalog + (Philippines), Turkish, Uyghur, Ukrainian, Urdu, Urdu (Pakistan), + Vietnamese, Chinese (China), Chinese (Taiwan). + +4.10.0 +====== +- Update contributor credits. +- Update translators, week 15 and 16. +- Enable startup notification in xfce4-appfinder shortcuts. +- Check abicheck.sh to be more portable (bug #8702). +- Translation updates: English (United Kingdom), Spanish (Castilian), + Galician, Japanese, Kazakh, Korean, Dutch (Flemish), Portuguese, + Portuguese (Brazilian), Chinese (China). + +4.9.2 +===== +- Update translators, week 13 and 14. +- Increase gtk and glib versions. +- Bump 4util dependency. +- Remove unused function prototype. +- Translation updates: German, Greek, Galician, Japanese, Korean, + Dutch (Flemish), Polish, Portuguese, Russian, Turkish. + +4.9.1 +===== +- Open docs.xfce.org when Help in xfce4-about is clicked. +- Cache header icons and avoid large icons in XfceTitledDialog. +- Restore glade directory information in .pc file. +- Update translator credits. +- Translation updates (ar, ca, cs, da, de, es, eu, fi, fr, hu, id, + it, kk, ko, lt, nl, nn, pt, pt_BR, ru, sk, te, tr, uk, zh_CN, zh_TW). + +4.9.0 +===== +- A lot of improvements in the shortcuts code. +- Add Alt + F1 as a shortcut for applications menu. +- Remove unused code from the internal header widget. +- Add xfce4-about from xfce-utils package. +- Use xdt-csource instead of exo-csource, depend on xdt 4.9.0. +- Update to new xfce4-appfinder commands. +- Fix build against 3.9 Glade (bug #7334). +- Add shortcuts for XF86WWW and XF86Mail. +- Simplify the xfce_gdk_screen_get_active fucntion. +- Add xfce_dialog_show_help function. + 4.8.1 ===== - Fix memory leak (bug #8079). diff -Nru libxfce4ui-4.8.1/po/am.po libxfce4ui-4.12.1/po/am.po --- libxfce4ui-4.8.1/po/am.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/am.po 2013-10-04 08:51:42.000000000 +0000 @@ -0,0 +1,822 @@ +# 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: libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" +"PO-Revision-Date: 2012-09-19 09:04+0300\n" +"Last-Translator: tefera \n" +"Language-Team: Amharic\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Amharic\n" +"X-Poedit-Country: ETHIOPIA\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1403 +msgid "Session management client ID" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1403 +msgid "ID" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1404 +msgid "Disable session management" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1414 +msgid "Session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1415 +msgid "Show session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1591 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1598 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" +"\"." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" +msgstr "" +"አቋራጩ በጥቅም ላይ ውሏል!\n" +"ለመጠቀም እንደሚፈልጉ ርግጠኛ ነዎት?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "" +"አቋራጩ በጥቅም ላይ ውሏል!\n" +"ለመጠቀም እንደሚፈልጉ ርግጠኛ ነዎት?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" +"አቋራጩ በጥቅም ላይ ውሏል!\n" +"ለመጠቀም እንደሚፈልጉ ርግጠኛ ነዎት?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 +#, fuzzy +msgid "This shortcut is already being used for something else." +msgstr "" +"አቋራጩ በጥቅም ላይ ውሏል!\n" +"ለመጠቀም እንደሚፈልጉ ርግጠኛ ነዎት?" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy +msgid "Window Manager Action Shortcut" +msgstr "የሸፍሲ 4 የመስኮት አስተዳዳሪ ስየማዎች" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "በስራላይ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy +msgid "Command Shortcut" +msgstr "አቋራጭ ሰይም" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "ትዕዛዝ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +#, fuzzy +msgid "Shortcut" +msgstr "አቋራጭ የለም" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy +msgid "Shortcut:" +msgstr "አቋራጭ የለም" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "የመስኮት ስራ ምናሌ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "ግራ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "ቀኝ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "ሰርዝ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "መስኮትን ፈትሽ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +#, fuzzy +msgid "Cycle windows (Reverse)" +msgstr "መስኮትን ፈትሽ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "መስኮት ዝጋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "መስኮትን አግድም አተልቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "መስኮትን ሽቅብ አተልቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "መስኮትን አተልቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "መስኮትን ደብቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +#, fuzzy +msgid "Move window" +msgstr "መስኮትን ወደላይ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +#, fuzzy +msgid "Resize window" +msgstr "መስኮትን ወደላይ መጥን" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "መስኮትን አጥላ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "መስኮትን ሰካ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "መስኮትን ከፍ አድርግ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "መስኮትን ዝቅ አድርግ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "መስኮትን ከፍ አድርግ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +#, fuzzy +msgid "Fill window" +msgstr "መስኮትን ደብቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +#, fuzzy +msgid "Fill window horizontally" +msgstr "መስኮትን አግድም አተልቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +#, fuzzy +msgid "Fill window vertically" +msgstr "መስኮትን ሽቅብ አተልቅ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "ሙሉ-ስክሪን አድርግ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "መስኮቱን ወደላይኛው የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "መስኮቱን ወደታችናው የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "መስኮቱን ወደግራ የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "መስኮቱን ወደቀኝ የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "መስኮቱን ወደቀድሞው የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "መስኮቱን ወደሚቀጥለው የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +#, fuzzy +msgid "Move window to workspace 1" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +#, fuzzy +msgid "Move window to workspace 2" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +#, fuzzy +msgid "Move window to workspace 3" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +#, fuzzy +msgid "Move window to workspace 4" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +#, fuzzy +msgid "Move window to workspace 5" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +#, fuzzy +msgid "Move window to workspace 6" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +#, fuzzy +msgid "Move window to workspace 7" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +#, fuzzy +msgid "Move window to workspace 8" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +#, fuzzy +msgid "Move window to workspace 9" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +#, fuzzy +msgid "Move window to workspace 10" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +#, fuzzy +msgid "Move window to workspace 11" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +#, fuzzy +msgid "Move window to workspace 12" +msgstr "መስኮቱን ወደ%d ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "መስኮቱን ወደግራ የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "መስኮቱን ወደታችናው የስራ ገበታ ውሰድ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "መስኮትን ወደግራ መጥን" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "መስኮትን ወደቀኝ መጥን" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "ገበታን አሳይ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "የላይኛው ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "የታችኛው ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "የግራ ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "የቀኝ ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "የቀድሞው ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "የሚቀጥለው ስራ ቦታ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +#, fuzzy +msgid "Workspace 1" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +#, fuzzy +msgid "Workspace 2" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +#, fuzzy +msgid "Workspace 3" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +#, fuzzy +msgid "Workspace 4" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +#, fuzzy +msgid "Workspace 5" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +#, fuzzy +msgid "Workspace 6" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +#, fuzzy +msgid "Workspace 7" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +#, fuzzy +msgid "Workspace 8" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +#, fuzzy +msgid "Workspace 9" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +#, fuzzy +msgid "Workspace 10" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +#, fuzzy +msgid "Workspace 11" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +#, fuzzy +msgid "Workspace 12" +msgstr "የስራ ቦታ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "የስራ ቦታ ጨምር" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +#, fuzzy +msgid "Add adjacent workspace" +msgstr "የስራ ቦታ ጨምር" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +#, fuzzy +msgid "Delete last workspace" +msgstr "የስራ ቦታ ሰርዝ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +#, fuzzy +msgid "Delete active workspace" +msgstr "የስራ ቦታ ሰርዝ" + +#: ../glade/libxfce4ui.xml.in.h:1 +#, fuzzy +msgid "Titled Dialog" +msgstr "የአርዕስት ፊደል-ቅርጽ" + +#: ../glade/libxfce4ui.xml.in.h:2 +#, fuzzy +msgid "Subtitle" +msgstr "አርዕስት" + +#: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy +msgid "Xfce 4 Widgets" +msgstr "የሸፍሲ 4 የመስኮት አስተዳዳሪ ስየማዎች" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "ማስኮት አስተዳዳሪ" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "ሲመጠን የመስኮቱ ይዘት ይታይ" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "ማስኮት አስተዳዳሪ" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "ማስኮት አስተዳዳሪ" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "ማስኮት አስተዳዳሪ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s ( %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +#, fuzzy +msgid "Translators" +msgstr "ብርሃን አሳላፊ" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "የቀድሞው ስራ ቦታ" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "ስለ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "ፈቃድ" diff -Nru libxfce4ui-4.8.1/po/ar.po libxfce4ui-4.12.1/po/ar.po --- libxfce4ui-4.8.1/po/ar.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ar.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,157 +1,760 @@ # 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. # +# Translators: +# Karim Oulad Chalha , 2013 +# محمد الحرقان , 2013 msgid "" msgstr "" -"Project-Id-Version: libxcfe4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-07 22:35+0000\n" -"PO-Revision-Date: 2010-12-28 14:57-0000\n" -"Last-Translator: كريم أولاد الشلحة \n" -"Language-Team: Arabic \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-09-30 11:17+0000\n" +"Last-Translator: mohammad alhargan \n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce/language/ar/)\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-Poedit-Country: MOROCCO\n" "Language: ar\n" -"X-Poedit-Language: Arabic\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "فشل فتح متصفح الوب لقراءة وثائق عبر النت" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "هل تريد قراءة %s دليل المتوفر على الشبكة؟" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "هل تريد قراءة دليل المتوفر على الشبكة؟" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "وثائق من النت" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "سيتم توجيهك إلى موقع الوثائق حيث يتم الحفاظ على صفحات المساعدة وترجمتها." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_قراءة عبر الشبكة" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_الذهاب دائما إلى الوثائق عبر الشبكة" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "معلومات" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "تحذير" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "خطأ" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" -msgstr "سؤال" +msgstr "السؤال" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "حدد رقم معرّف إدارة الجلسة" +msgstr "رقم معرّف إدارة الجلسة" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "معرّف" +msgstr "معرف" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "تعطيل إدارة الجلسة" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "خيارات إدارة الجلسة" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "عرض خيارات إدارة الجلسة" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "فشل الاتصال بمدير الجلسة: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "لم يرجع مدير الجلسة هوية عميل صالحة" +msgstr "مدير الجلسة لم يقم بإرجاع معرف عميل صالح" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format -msgid "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "مسار العمل \"%s\" غير موجود. ولن يستخدم عند توليد \"%s\"." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" -msgstr "هذا الاختصار يستخدم حاليا في مدير نوافذ أخر. أي واحد تريد الاستعمال؟" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "هذا الإختصار يستعمله الإجراء '%s'. أي واحد تريد الإستعمال؟" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "استعمال '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "الحفاظ على واحد أخر" +msgstr "إستعمال '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format -msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" -msgstr "هذا الاختصار يستعمل حاليا للأمر '%s'. أي واحد تريد الاستعمال؟" +msgid "Keep '%s'" +msgstr "الحفاظ على '%s'" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format -msgid "Keep '%s'" -msgstr "الحفاظ على '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" -msgstr "هذا الاختصار يستخدم حاليا من قبل مدير عمل النوافذ. أي واحد تريد الاستعمال؟" +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "هذا الإختصار يستعمله الأمر '%s'. أي واحد تريد الإستعمال؟" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "الحفاظ على مدير النوافذ نشط" +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "هذا الإختصار يستعمله الإجراء '%s'. أي إجراء تريد الإستعمال؟" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "الرجاء استعمال توليفة أخرى." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s تم تشغيله بالفعل." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "تعارض الإجراءات لي %s" +msgstr "تعارض إجراءات %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." -msgstr "هذا الاختصار يستخدم حاليا لشيئ أخر" +msgstr "هذا الإختصار تم إستعماله حاليا لشيء اخر." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "أختصار لإجراءات مدير النوافذ" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "الحركة:" +msgstr "إختصار إجراء مدير النوافذ" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "إجراء" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "اختصار الأمر" +msgstr "إختصار الامر" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "الأمر:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "أمر" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "الاختصار" +msgstr "إختصار" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "اضغط الآن على مفاتيح لوحة المفاتيح الذي تريد استخدامه لتشغيل %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "الاختصار:" +msgstr "إختصار:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "لم يتم الضغط على اي مفتاح, المضي." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "لا يمكن انتزاع لوحة المفاتيح" +msgstr "لا يمكن مسك لوحة المفاتيح." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "عنوان فرعي" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "قائمة عمليات النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "أعلى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "أسفل" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "يسار" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "يمين" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "إلغاء" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "دوِّر النوافذ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "دوران النوافذ (عكسي)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "بدل نوافذ نفس التطبيق" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "إستبدل التطبيق" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "أغلق النّافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "كبر النافذة أفقيا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "كبر النافذة عموديا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "كبر النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "أخفي النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "حرك النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "حجم النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "ظلل النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "ألصق النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "ارفع النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "اخفض النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "رفع أو خفظ النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "ملء النافذة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "ملء النافذة أفقيا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "ملء النافذة عموديا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "تبديل للأعلى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "بدّل ملء الشاشة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "انقل النافذة لمساحة العمل العليا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "حرك النافذة إلى مساحة عمل السفلة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "حرك النافذة إلى مساحة عمل اليسرى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "حرك النافذة إلى مساحة عمل اليمنى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "حرك النافذة إلى مساحة عمل السابقة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "حرك النافذة إلى مساحة عمل التالية" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "حرك النافذة إلى مساحة عمل 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "حرك النافذة إلى مساحة عمل 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "حرك النافذة إلى مساحة عمل 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "حرك النافذة إلى مساحة عمل 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "حرك النافذة إلى مساحة عمل 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "حرك النافذة إلى مساحة عمل 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "حرك النافذة إلى مساحة عمل 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "حرك النافذة إلى مساحة عمل 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "حرك النافذة إلى مساحة عمل 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "حرك النافذة إلى مساحة عمل 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "حرك النافذة إلى مساحة عمل 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "حرك النافذة إلى مساحة عمل 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "بلاط النافذة إلى الأعلى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "بلاط النافذة إلى الأسفل" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "بلاط النافذة إلى اليسار" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "بلاط النافذة إلى اليمين" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "أظهر سطح المكتب" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "مساحة العمل العليا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "مساحة عمل السفلة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "مساحة عمل اليسرى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "مساحة عمل اليمنى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "مساحة عمل السابقة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "مساحة عمل التالية" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "مساحة عمل 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "مساحة عمل 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "مساحة عمل 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "مساحة عمل 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "مساحة عمل 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "مساحة عمل 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "مساحة عمل 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "مساحة عمل 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "مساحة عمل 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "مساحة عمل 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "مساحة عمل 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "مساحة عمل 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "إضافة مساحة عمل" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "إضافة مساحة عمل متاخمة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "حذف مساحة العمل الأخيرة" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "حذف مساحة العمل الحالية" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "حوار معنون" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "عنوان ثانوي" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "قطع Xfce 4" +msgstr "قطع إكسفس 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "معلومات الإصدار" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "مدير النوافذ" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "يعالج وضع النوافذ في الشاشة." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "شريط" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "مطلق البرامج, أزرار النافذة، قائمة التطبيقات, مبدل مساحات العمل وأكثر." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "مدير سطح المكتب" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "حدد لون الخلفية او صورة مع قائمة تطبيقات إختيارية او أيقونات لتطبيقات و مطلقات المصغرة, أخهزة ومجلدات." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "مدير الملفات " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "مدير ملفات حديث لـسطح مكتب يونكس/لينكس, يهدف ليكون سهل الإستعمال وسريع." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "مدير الجلسة" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "يستعيد جلستك عند بدء التشغيل ويسمح لك بإيقاف الكمبيوتر من إكسفس." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "إعدادات النظام" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "تكوين النظام للسيطرة على جوانب مختلفة من سطح المكتب مثل إعدادات المظهر ، العرض ، لوحة المفاتيح والفأرة." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "مكتشف التطبيقات" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "عرض التطبيقات المثبتة في نظامك في الأصناف, لتتمكن من إجادهم و إطلاقهم." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "إعدادات خفية" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-based إعداد نظام التخزين." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "إكسفس هو مجموعة من البرامج التي توفر معا كامل مميزات بيئة سطح المكتب. البرامج التالية هي جزء من لب الإكسفس:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "إكسفس هي أيضا توفير منصة تطوير العديد من المكتبات، التي تساعد المبرمجين على إنشاء التطبيقات التي تتناسب بشكل جيد مع بيئة سطح المكتب." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "محتويات الإكسفس تحت رخص مجانية أو مفتوحة المصدر ; رخصة جنو العمومية أو BSDL لتطبيقات و LGPL أو BSDL للمكتبات. أنظر في الثوتيق, شيفرة المصدر أو موقع إكسفس (http://www.xfce.org) للمزيد من المعلومات." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "شكرا لإهتمامك بإكسفس." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "فريق تطوير إكسفس" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "إذا كنت تعرف أي شيء مفقود في القائمة; لا تتردد و قم بالإبلاغ عنه في ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "شكرا لكل من ساهم في جعل هذا البرنامج متوفرا!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "حقوق نسخ إكسفس 4 محفوظة لـ Olivier Fourdan (fourdan@xfce.org). حقوق النشر وتاليف مختلف مكونات محفوظة لمؤلفيها." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "حزم libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs و exo تم توزيعها تحت رخصة جنو العمومية للمكتبات كما نشرت من قبل منظمة البرمجيات الحرة; إما الإصدار 2 للرخصة, أو (حسب إختياركم) أي إصدار أحدث." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "الحزم تونار, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 تم توزيعها تحت رخصة جنو العمومية كما نشرت من قبل منظمة البرمجيات الحرة; إما الإصدار 2 من الرخصة, او (حسب إختياركم) أي إصدار أحدث." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "أكتب '%s --help' لمعلومات الإستعمال." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "غير قادر على بدء جتك+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "فريق تطوير إكسفس. كل الحقوق محفوظة." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "لُطقًا أبلغ عن العلل إلى <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "لائحة المترجمون من %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "tqg jpldg hg;hî," + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "إصدار %s, موزع من طرف %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "إصدار %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "مطورو اللب" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "المساهمون النشطون" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "صيانة الخوادم من طرف" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "إشراف على الأشياء الجيدة" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "إشراف على الترجمات" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "المترجمون" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "مساهمون سابقون" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "حول إكسفس" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "معلمومات حول بيئة سطح المكتب إكسفس" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "حول بيئة سطح المكتب إكسفس" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "حول" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "شكر وتقدير" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "رخصة الجنو العمومية" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "رخصة الجنو العمومية للمكتبات" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "حقوق النسخ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "رخصة" diff -Nru libxfce4ui-4.8.1/po/ast.po libxfce4ui-4.12.1/po/ast.po --- libxfce4ui-4.8.1/po/ast.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ast.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,917 +1,765 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# enolp , 2015 +# Ḷḷumex03 , 2014 +# Ḷḷumex03 , 2014 msgid "" msgstr "" -"Project-Id-Version: xfce4-session\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-08-31 15:34+0100\n" -"Last-Translator: astur \n" -"Language-Team: Asturian \n" -"Language: ast\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-23 00:03+0000\n" +"Last-Translator: enolp \n" +"Language-Team: Asturian (http://www.transifex.com/projects/p/libxfce4ui/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ast\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Fallu al abrir el restolador pa la documentación en llinia" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "¿Quies lleer el manual %s en llinia?" -#: ../libxfce4ui/xfce-dialogs.c:69 -#, fuzzy +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "¿Quies lleer el manual en llinia?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentación en llinia" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Redireicionarásete al sitiu web de documentación u tán calteníes y tornaes les páxines d'ayuda." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Llee_r en llinia" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Dir siempres a la documentación en llinia direutamente" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Información" +msgstr "Información" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" -msgstr "" +msgstr "Avisu" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" -msgstr "" +msgstr "Fallu" -#: ../libxfce4ui/xfce-dialogs.c:187 -#, fuzzy +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" -msgstr "Sesión" +msgstr "Entruga" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "" +msgstr "ID de veceru del alministrador de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1401 -#, fuzzy +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "PID" +msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 -#, fuzzy +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Escoyer nome sesión" +msgstr "Deshabilitar alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1412 -#, fuzzy +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Configuración de sesión" +msgstr "Opciones d'alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1413 -#, fuzzy +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Entamando proxy de xestión de sesiones" +msgstr "Amosar opciones d'alministración de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1589 -#, fuzzy, c-format +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Fallu al recibir rempuesta del xestor de sesión" +msgstr "Fallu al coneutar al xestor de sesión: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "" +msgstr "El xestor de sesión nun devolvió una ID de veceru válida" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "El direutoriu de trabayu \"%s\" nun esiste. Nun s'usará cuando apaeza \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Esti accesu direutu yá ta usándose pa la aición '%s\". ¿Qué aición quies usar?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "" +msgstr "Usar '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Caltener '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" +msgstr "Esti accesu direutu yá ta usándose pal comandu '%s\". ¿Qué aición quies usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Esti accesu direutu yá ta usándose pola aición '%s\". ¿Qué aición quies usar?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Por favor, usa otra combinación de tecles." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s yá dispara esta aición." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "" +msgstr "Aiciones en conflictu pa %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "" +msgstr "Esti accesu direutu yá ta usándose por daqué más." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -#, fuzzy -msgid "Action:" -msgstr "Descripción:" +msgstr "Accesu direutu d'aición del xestor de ventanes" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "aición" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "" +msgstr "Accesu direutu de comandu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comandu:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comandu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "" +msgstr "Accesu direutu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Encaboxar" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Primi agora les tecles del tecláu que quies usar pa disparar el %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "" +msgstr "Accesu direutu:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Entá nun se primieron tecles, procede." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "" +msgstr "Nun pudo coyese'l tecláu." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menú d'operaciones de ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Arriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Abaxo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Encaboxar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Esbillar ventanes cíclicamente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Esbillar ventanes cíclicamente (al revés)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Cambiar ventana pa la mesma aplicación" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Cambiar d'aplicación" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zarrar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar ventana horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar ventana verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Anubrir ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mover ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Endolcar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Apegar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Elevar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Baxar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Elevar o baxar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Ocupar tola ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Ocupar la ventana horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Ocupar la ventana verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Amosar enriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Pantalla completa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mover ventana a la estaya de trabayu superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mover ventana a la estaya de trabayu inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mover ventana a la estaya de trabayu esquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mover ventana a la estaya de trabayu drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mover ventana a la estaya de trabayu anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mover ventana a la estaya de trabayu siguiente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mover ventana a la estaya de trabayu 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mover ventana a la estaya de trabayu 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mover ventana a la estaya de trabayu 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mover ventana a la estaya de trabayu 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mover ventana a la estaya de trabayu 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mover ventana a la estaya de trabayu 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mover ventana a la estaya de trabayu 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mover ventana a la estaya de trabayu 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mover ventana a la estaya de trabayu 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mover ventana a la estaya de trabayu 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mover ventana a la estaya de trabayu 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mover ventana a la estaya de trabayu 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Mosaicu de ventanes hacia arriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Mosaicu de ventanes hacia abajo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Mosaicu de ventanes a la izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Mosaicu de ventanes a la drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Amosar escritoriu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Estaya de trabayu superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Estaya de trabayu inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Estaya de trabayu esquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Estaya de trabayu drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Estaya de trabayu anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Estaya de trabayu siguiente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Estaya de trabayu 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Estaya de trabayu 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Estaya de trabayu 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Estaya de trabayu 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Estaya de trabayu 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Estaya de trabayu 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Estaya de trabayu 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Estaya de trabayu 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Estaya de trabayu 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Estaya de trabayu 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Estaya de trabayu 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Estaya de trabayu 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Amestar estaya de trabayu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Amestar estaya de trabayu cercana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Desaniciar la cabera estaya de trabayu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Desaniciar la estaya de trabayu activa" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "" +msgid "Titled Dialog" +msgstr "Diálogu tituláu" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" +msgid "Subtitle" +msgstr "Sotítulu" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "" - -#, fuzzy -#~ msgid "%s" -#~ msgstr "Zarrar sesión de %s" - -#~ msgid "No description given" -#~ msgstr "Nun se dio nenguna descripción" - -#~ msgid "Choose theme file to install..." -#~ msgstr "Escueya'l ficheru de tema a instalar..." - -#~ msgid "Unable to install splash theme from file \"%s\"" -#~ msgstr "" -#~ "Imposible instalar el tema de pantalla d'aniciu dende'l ficheru \"%s\"." - -#~ msgid "Theme File Error" -#~ msgstr "Error nel ficheru tema" - -#~ msgid "Please check that the file is a valid splash theme archive." -#~ msgstr "" -#~ "Por favor, compruebe que'l ficheru ye un ficheru de tema de pantalla " -#~ "d'aniciu válidu." - -#~ msgid "Unable to remove splash theme \"%s\" from directory %s." -#~ msgstr "" -#~ "Nun se pue desaniciar el tema de pantalla d'aniciu \"%s\" del direutoriu " -#~ "%s." - -#~ msgid "Choose theme filename..." -#~ msgstr "Escueya'l nome de ficheru de tema..." - -#~ msgid "_Install new theme" -#~ msgstr "_Instalar tema nuevu" - -#~ msgid "_Remove theme" -#~ msgstr "Desanicia_r tema" - -#~ msgid "_Export theme" -#~ msgstr "_Esportar tema" - -#~ msgid "Balou theme" -#~ msgstr "Tema Balou" - -#~ msgid "Configure Balou..." -#~ msgstr "Configurar Balou..." - -#~ msgid "Balou" -#~ msgstr "Balou" - -#~ msgid "Balou Splash Engine" -#~ msgstr "Motor de pantalla d'aniciu Balou" - -#~ msgid "Mice" -#~ msgstr "Mice" - -#~ msgid "Mice Splash Engine" -#~ msgstr "Motor de pantalla d'aniciu Mice" - -#~ msgid "Configure Simple..." -#~ msgstr "Configurar Simple..." - -#~ msgid "Font" -#~ msgstr "Fonte" - -#~ msgid "Colors" -#~ msgstr "Colores" - -#~ msgid "Background color:" -#~ msgstr "Color de fondu:" - -#~ msgid "Text color:" -#~ msgstr "Color de testu:" - -#~ msgid "Image" -#~ msgstr "Imaxen" - -#~ msgid "Use custom image" -#~ msgstr "Usar una imaxen personalizada" - -#~ msgid "Choose image..." -#~ msgstr "Escoyer imaxen..." - -#~ msgid "Images" -#~ msgstr "Imáxenes" - -#~ msgid "All files" -#~ msgstr "Tolos ficheros" - -#~ msgid "Simple" -#~ msgstr "Simple" - -#~ msgid "Simple Splash Engine" -#~ msgstr "Motor de pantalla d'aniciu Simple" - -#~ msgid "Loc_k screen" -#~ msgstr "B_loquiar pantalla" - -#~ msgid "_Suspend" -#~ msgstr "_Suspender" - -#~ msgid "_Hibernate" -#~ msgstr "_Iverrnar" - -#~ msgid "_Reboot" -#~ msgstr "_Reaniciar" - -#~ msgid "Shut _down" -#~ msgstr "Ap_agar" - -#~ msgid "_Log out" -#~ msgstr "Zarrar s_esión" - -#~ msgid "Are you sure you want to log out?" -#~ msgstr "¿Daveres que quies desconeutate?" - -#~ msgid "You will be logged out in %u seconds." -#~ msgstr "Desconeutarásete en %u segundos." - -#~ msgid "Failed to log out." -#~ msgstr "Fallu al desconeutar." - -#~ msgid "Are you sure you want to shut down?" -#~ msgstr "¿Daveres que quies apagar?" - -#~ msgid "Your system will shut down in %u seconds." -#~ msgstr "El to sistema apagaráse en %u segundos." - -#~ msgid "Failed to shut down." -#~ msgstr "Fallu al apagar." - -#~ msgid "Are you sure you want to reboot?" -#~ msgstr "¿Daveres que quies reaniciar?" - -#~ msgid "Your system will reboot in %u seconds." -#~ msgstr "El to sistema reaniciaráse en %u segundos." - -#~ msgid "Failed to reboot." -#~ msgstr "Falló al reaniciar." - -#~ msgid "Failed to suspend" -#~ msgstr "Fallu al suspender" - -#~ msgid "Failed to hibernate" -#~ msgstr "Fallu al ivernar" - -#~ msgid "Close Session" -#~ msgstr "Zarrar sesión" - -#~ msgid "Session Error" -#~ msgstr "Error de sesión" - -#~ msgid "Settings manager socket" -#~ msgstr "Socket del alministrador de configuración" - -#~ msgid "SOCKET ID" -#~ msgstr "ID de SOCKET" - -#~ msgid "Version information" -#~ msgstr "Información de version" - -#~ msgid "Type '%s --help' for usage." -#~ msgstr "Escriba '%s --help' pa ver opciones d'usu." - -#~ msgid "The Xfce development team. All rights reserved." -#~ msgstr "L'equipu de desendolque de Xfce. Tolos drechos reservaos." - -#~ msgid "Please report bugs to <%s>." -#~ msgstr "Por favor, informe de fallos a <%s>." - -#~ msgid "Unable to contact settings server" -#~ msgstr "Imposible contautar col sirvidor de configuración" - -#~ msgid "Internal Error" -#~ msgstr "Error internu" - -#~ msgid "Unable to create user interface from embedded definition data" -#~ msgstr "" -#~ "Imposible crear interfaz d'usuariu a partir de los datos de definición " -#~ "incluyíos" - -#~ msgid "This is likely a problem with your Xfce installation" -#~ msgstr "Quiciabes esto ye un problema cola so instalación de Xfce" - -#~ msgid "_Application Autostart" -#~ msgstr "_Autoarranque d'aplicaciones" - -#~ msgid "If running" -#~ msgstr "Si ta n'execución" - -#~ msgid "Always" -#~ msgstr "Siempres" - -#~ msgid "Immediately" -#~ msgstr "Darréu" - -#~ msgid "Never" -#~ msgstr "Enxamás" - -#~ msgid "Session Save Error" -#~ msgstr "Error al guardar sesión" - -#~ msgid "Unable to save the session" -#~ msgstr "Imposible guardar la sesión" - -#~ msgid "Are you sure you want to terminate \"%s\"?" -#~ msgstr "¿Daveres que quies acabar \"%s\"?" - -#~ msgid "Terminate \"%s\"" -#~ msgstr "Acabar \"%s\"" - -#~ msgid "Terminate Program" -#~ msgstr "Acabar programa" - -#~ msgid "" -#~ "The application will lose any unsaved state and will not be restarted in " -#~ "your next session." -#~ msgstr "" -#~ "L'aplicación perderá cualesquier estáu nun guardáu y nun se reaniciará na " -#~ "so siguiente sesión." - -#~ msgid "Unable to terminate program." -#~ msgstr "Imposible acabar programa." - -#~ msgid "(Unknown program)" -#~ msgstr "(Programa desconocíu)" - -#~ msgid "Priority" -#~ msgstr "Prioridá" - -#~ msgid "Program" -#~ msgstr "Programa" - -#~ msgid "Restart Style" -#~ msgstr "Estilu de reaniciu" - -#~ msgid "None" -#~ msgstr "Dengún" +msgstr "Widgets Xfce 4" -#~ msgid "Add application" -#~ msgstr "Amestar aplicación" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Información de versión" -#~ msgid "Name:" -#~ msgstr "Nome:" +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Xestor de ventanes" -#~ msgid "Select a command" -#~ msgstr "Seleicione un comandu" +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Remana l'asitiamientu de ventanes na pantalla." -#~ msgid "Failed to unlink %s: %s" -#~ msgstr "Nun pudo desenllazase %s: %s" +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" -#~ msgid "Failed to create file %s" -#~ msgstr "Nun pudo crease'l ficheru %s" - -#~ msgid "Failed to write file %s" -#~ msgstr "Nun pudo escribise nel ficheru %s" - -#~ msgid "Failed to open %s for writing" -#~ msgstr "Nun pudo abrise %s pa escritura" - -#~ msgid "" -#~ "Below is the list of applications that will be started automatically when " -#~ "you login to your Xfce desktop, in addition to the applications that were " -#~ "saved when you logged out last time:" -#~ msgstr "" -#~ "La siguiente ye una llista d'aplicaciones qu'aniciarán automáticamente " -#~ "cuando entame sesión nel escritoriu Xfce, arriendes de les aplicaciones " -#~ "que se guardaron la postrer vegada que zarró sesión:" - -#~ msgid "Loading desktop settings" -#~ msgstr "Cargando configuración d'escritoriu" - -#~ msgid "Verifying DNS settings" -#~ msgstr "Verificando configuración de DNS" - -#~ msgid "Loading session data" -#~ msgstr "Cargando información de sesión" - -#~ msgid "Xfce Session Manager" -#~ msgstr "Xestor de sesión de Xfce" - -#~ msgid "Log Out" -#~ msgstr "Colar" - -#~ msgid "Restart" -#~ msgstr "Reaniciar" - -#~ msgid "Shut Down" -#~ msgstr "Apagar" - -#~ msgid "Suspend" -#~ msgstr "Suspender" - -#~ msgid "Hibernate" -#~ msgstr "Hibernar" - -#~ msgid "_Save session for future logins" -#~ msgstr "_Guardar sesión pa futuros entamos de sesión" - -#~ msgid "Please enter your password:" -#~ msgstr "Por favor meta la so contraseña:" - -#~ msgid "An error occurred" -#~ msgstr "Hebo un error" - -#~ msgid "" -#~ "Either the password you entered is invalid, or the system administrator " -#~ "disallows shutting down this computer with your user account." -#~ msgstr "" -#~ "La clave metida ye inválida o l'alministrador del sistema deshabilitó la " -#~ "capacidá d'apagar l'equipu cola so cuenta usuariu." - -#~ msgid "Shutdown Failed" -#~ msgstr "Fallu al apagar" - -#~ msgid "Unable to perform shutdown" -#~ msgstr "Imposible apagar" - -#~ msgid "Last accessed: %s" -#~ msgstr "Caberu accesu: %s" - -#~ msgid "" -#~ "Choose the session you want to restore. You can simply double-click the " -#~ "session name to restore it." -#~ msgstr "" -#~ "Escueya la sesión a restaurar. Simplemente faga doble clic sobre'l nome " -#~ "de sesión pa restaurala." - -#~ msgid "Log out" -#~ msgstr "Zarrar sesión" - -#~ msgid "Cancel the login attempt and return to the login screen." -#~ msgstr "" -#~ "Encaboxar l'intentu d'accesu al entamu y tornar a la pantalla d'accesu." - -#~ msgid "New session" -#~ msgstr "Nueva sesión" - -#~ msgid "Create a new session." -#~ msgstr "Crear una nueva sesión" - -#~ msgid "The client doesn't have any properties set yet" -#~ msgstr "El veceru entá nun tien denguna propiedá" - -#~ msgid "Starting The Gnome Keyring Daemon" -#~ msgstr "Entamando GNOME Keyring Daemon" - -#~ msgid "Starting Gnome Assistive Technologies" -#~ msgstr "Entamando teunoloxíes d'accesibilidá de GNOME" - -#~ msgid "Starting KDE services" -#~ msgstr "Entamando servicios de KDE" - -#~ msgid "(Unknown)" -#~ msgstr "(Desconocíu)" - -#~ msgid "" -#~ "Could not look up internet address for %s.\n" -#~ "This will prevent Xfce from operating correctly.\n" -#~ "It may be possible to correct the problem by adding\n" -#~ "%s to the file /etc/hosts on your system." -#~ msgstr "" -#~ "Nun pue atopase la direición IP pa %s.\n" -#~ "Esto puede impedir el correutu funcionamiento de Xfce.\n" -#~ "Puede igualo amestado %s al conteníu del \n" -#~ "ficheru /etc/hosts nel so sistema." - -#~ msgid "Continue anyway" -#~ msgstr "Continuar de toes formes" - -#~ msgid "Try again" -#~ msgstr "Intentar otra vuelta" - -#~ msgid "" -#~ "Unable to determine failsafe session name. Possible causes: xfconfd " -#~ "isn't running (D-Bus setup problem); environment variable " -#~ "$XDG_CONFIG_DIRS is set incorrectly (must include \"%s\"), or xfce4-" -#~ "session is installed incorrectly." -#~ msgstr "" -#~ "Imposible determinar el nome de sesión a preba de fallos. Posibles " -#~ "causes: xfconf nun ta executándose (problema de configuración de D-Bus); " -#~ "la variable d'entornu $XDG_CONFIG_DIRS ta configurada incorreutamente " -#~ "(tien d'incluyir \"%s\"), o xfce4-session atópase instaláu " -#~ "incorreutamente." - -#~ msgid "" -#~ "The specified failsafe session (\"%s\") is not marked as a failsafe " -#~ "session." -#~ msgstr "" -#~ "La sesión a preba de fallos (\"%s\") nun ta conseñada como una sesión a " -#~ "preba de fallos." - -#~ msgid "The list of applications in the failsafe session is empty." -#~ msgstr "La llista d'aplicaciones na sesión a preba de fallos ta erma." - -#~ msgid "Session Manager Error" -#~ msgstr "Error de Xestor de sesión" - -#~ msgid "Unable to load a failsafe session" -#~ msgstr "Imposible cargar una sesión a preba fallos" - -#~ msgid "Failed to suspend session" -#~ msgstr "Fallu al suspender la sesión" - -#~ msgid "Failed to hibernate session" -#~ msgstr "Fallu al hibernar la sesión" - -#~ msgid "Can only terminate clients when in the idle state" -#~ msgstr "Namái pueden terminase veceros cuando tan n'estáu inactivu" - -#~ msgid "Session manager must be in idle state when requesting a checkpoint" -#~ msgstr "" -#~ "El xestor de sesión tien de tar n'estáu inactivu al solicitar un puntu de " -#~ "comprobación" - -#~ msgid "Session manager must be in idle state when requesting a shutdown" -#~ msgstr "" -#~ "El xestor de sesión tien de tar n'estáu inactivu al solicitar l'apagáu" - -#~ msgid "Invalid shutdown type \"%u\"" -#~ msgstr "Tipu d'apagáu \"%u\" nun válidu" - -#~ msgid "Invalid shutdown type" -#~ msgstr "Tipu d'apagáu non válidu" - -#~ msgid "No HAL method for command %d" -#~ msgstr "Ensin métodu HAL pal comandu %d" - -#~ msgid "" -#~ "Program \"sudo\" was not found. You will not be able to shutdown your " -#~ "system from within Xfce." -#~ msgstr "" -#~ "Nun s'atopó'l programa \"sudo\". Nun va ser dable apagar el sistema dende " -#~ "Xfce." - -#~ msgid "Unable to create parent pipe: %s" -#~ msgstr "Nun pudo crease tubería pá: %s" - -#~ msgid "Unable to create child pipe: %s" -#~ msgstr "Nun pudo crease la tubería fíu: %s" - -#~ msgid "Unable to fork sudo helper: %s" -#~ msgstr "Imposible entamar l'aplicación auxiliar pa sudo: %s" - -#~ msgid "Unable to read response from sudo helper: %s" -#~ msgstr "Imposible lleer rempuesta de l'aplicación auxiliar pa sudo: %s" - -#~ msgid "Unknown error" -#~ msgstr "Error desconocíu" - -#~ msgid "Unable to open parent pipe: %s" -#~ msgstr "Nun pudo abrise la tubería pá: %s" - -#~ msgid "Unable to open child pipe: %s" -#~ msgstr "Nun pudo abrise la tubería fíu: %s" - -#~ msgid "Got unexpected reply from sudo shutdown helper" -#~ msgstr "" -#~ "Recibióse una rempuesta inesperada de l'aplicación auxiliar d'apagáu per " -#~ "aciu de sudo" - -#~ msgid "" -#~ "Suspend and Hibernate are only supported through HAL, which is unavailable" -#~ msgstr "" -#~ "Namái se soporten suspender ya hibernar a traviés d'HAL, que nun ta " -#~ "disponible" - -#~ msgid "Error sending command to shutdown helper: %s" -#~ msgstr "Fallu al unviar el comandu a l'aplicación auxiliar d'apagáu: %s" - -#~ msgid "Error receiving response from shutdown helper: %s" -#~ msgstr "Fallu al recibir la rempuesta de l'aplicación auxiliar d'apagáu: %s" - -#~ msgid "Shutdown command failed" -#~ msgstr "Falló'l comandu d'apagáu" - -#~ msgid "Choose session" -#~ msgstr "Escoyer sesión" - -#~ msgid "Choose a name for the new session:" -#~ msgstr "Escoyer un nome pa la sesión" - -#~ msgid "Starting the Volume Controller" -#~ msgstr "Entamando controlador de volume" - -#~ msgid "Starting the Panel" -#~ msgstr "Entamando panel" - -#~ msgid "Starting the Desktop Manager" -#~ msgstr "Entamando xestor d'escritoriu" - -#~ msgid "Starting the Taskbar" -#~ msgstr "Entamando barra Xeres" - -#~ msgid "Starting the Window Manager" -#~ msgstr "Entamando xestor de ventanes" - -#~ msgid "Starting the Gnome Terminal Emulator" -#~ msgstr "Entamando emulador de terminal de GNOME" - -#~ msgid "Starting the KDE Advanced Text Editor" -#~ msgstr "Entamando editor avanzáu de testu de KDE" - -#~ msgid "Starting the KDE Clipboard Manager" -#~ msgstr "Entamando xestor de cartafueyu de KDE" - -#~ msgid "Starting the KDE Mail Reader" -#~ msgstr "Entamando llector de correos de KDE" - -#~ msgid "Starting the KDE News Reader" -#~ msgstr "Entamando llector de noticies de KDE" - -#~ msgid "Starting the Konqueror" -#~ msgstr "Entamando Konqueror" - -#~ msgid "Starting the KDE Terminal Emulator" -#~ msgstr "Entamando emulador de terminal de KDE" - -#~ msgid "Starting the Beep Media Player" -#~ msgstr "Entamando Beep Media Player" - -#~ msgid "Starting The Gimp" -#~ msgstr "Entamando Gimp" - -#~ msgid "Starting the VI Improved Editor" -#~ msgstr "Entamando VI Improved Editor" - -#~ msgid "Starting the X-Chat IRC Client" -#~ msgstr "Entamando veceru d'IRC X-Chat" - -#~ msgid "Starting the X Multimedia System" -#~ msgstr "Entamando sistema multimedia de X" - -#~ msgid "Starting the X Terminal Emulator" -#~ msgstr "Entamando emulador de terminal de X" - -#~ msgid "Starting %s" -#~ msgstr "Entamando %s" - -#~ msgid "" -#~ "The location and the format of the autostart directory has changed.\n" -#~ "The new location is\n" -#~ "\n" -#~ " %s\n" -#~ "\n" -#~ "where you can place .desktop files to, that describe the applications\n" -#~ "to start when you login to your Xfce desktop. The files in your old\n" -#~ "autostart directory have been successfully migrated to the new\n" -#~ "location.\n" -#~ "You should delete this directory now.\n" -#~ msgstr "" -#~ "Camudóse l'asitiamientu y el formatu del direutoriu d'autoarranque.\n" -#~ "El nuevu asitiamientu ye\n" -#~ "\n" -#~ " %s\n" -#~ "\n" -#~ "na que pue collocar los ficheros .desktop que describen les\n" -#~ "aplicaciones a entamar cuando escomencipie la so sesión de Xfce. Migrose\n" -#~ "con éxitu los ficheros del direutoriu d'autoarranque antiguu al nuevu " -#~ "asitiamientu.\n" -#~ "Agora tien de desaniciar esti direutoriu.\n" - -#~ msgid "Performing Autostart..." -#~ msgstr "Faciendo autoarranque..." - -#~ msgid "Tips and Tricks" -#~ msgstr "Conseyos y trucos" - -#~ msgid "Fortunes" -#~ msgstr "Fortunes" - -#~ msgid "Could not load tips database (%s)." -#~ msgstr "Nun pudo cargase la base de datos de tips (%s)." - -#~ msgid "Invalid output of fortune." -#~ msgstr "La salida de «fortune» nun ye válida." - -#~ msgid "Executing fortune failed (%s)" -#~ msgstr "Error al executar «fortune»: «%s»" - -#~ msgid "Error while loading tips." -#~ msgstr "Fallu cargando tips." - -#~ msgid "Display tips on _startup" -#~ msgstr "Amosar con_seyos al entamu" - -#~ msgid "Next" -#~ msgstr "Siguiente" - -#~ msgid "Logout Error" -#~ msgstr "Fallu de zarru de sesión" - -#~ msgid "Unable to contact D-Bus session bus." -#~ msgstr "Imposible contautar col bus de sesión D-Bus." - -#~ msgid "Failed to create new D-Bus message" -#~ msgstr "Fallu al crear un nuevu mensaxe de D-Bus" - -#~ msgid "Received error while trying to log out" -#~ msgstr "Recibióse un error al intentar zarrar la sesión" - -#~ msgid "Session Menu" -#~ msgstr "Menú de sesión" - -#~ msgid "" -#~ "Shows a menu with options to lock the screen, suspend, shutdown, or log " -#~ "out" -#~ msgstr "" -#~ "Amuesa un menú con opciones pa bloquiar pantalla, suspender, ivernar o " -#~ "desconeutar." - -#~ msgid "Customize desktop startup and splash screen" -#~ msgstr "Personalice la pantalla d'entamu de sesión del escritoriu" - -#~ msgid "Session and Startup" -#~ msgstr "Sesión y entamu" - -#~ msgid "Author:" -#~ msgstr "Autor:" - -#~ msgid "Compatibility" -#~ msgstr "Compatibilidá" - -#~ msgid "Description:" -#~ msgstr "Descripción:" - -#~ msgid "Homepage:" -#~ msgstr "Sitiu web:" - -#~ msgid "Logout Settings" -#~ msgstr "Configuración d'acabu sesión" - -#~ msgid "Security" -#~ msgstr "Seguridá" - -#~ msgid "Session Chooser" -#~ msgstr "Seleutor de sesión" - -#~ msgid "Version:" -#~ msgstr "Versión:" - -#~ msgid "Ad_vanced" -#~ msgstr "A_vanzáu" - -#~ msgid "Always save the session when logging out" -#~ msgstr "Guardar siempres la sesión automáticamente al colar" - -#~ msgid "Automatically save session on _logout" -#~ msgstr "Guardar sesión automáticamente al _colar" - -#~ msgid "Con_figure" -#~ msgstr "Con_figurar" - -#~ msgid "Demonstrates the selected splash screen" -#~ msgstr "Facer una amuesa de la pantalla d'entamu sesión seleicionada" - -#~ msgid "Display the session chooser every time Xfce starts" -#~ msgstr "Amosar el seleutor de sesión ca vegada que s'anicia Xfce" - -#~ msgid "Launch GN_OME services on startup" -#~ msgstr "Arrancar servicios de GN_OME al entamu" - -#~ msgid "Launch _KDE services on startup" -#~ msgstr "Arrancar servicios de _KDE al entamu" - -#~ msgid "Manage _remote applications" -#~ msgstr "Xestionar aplicaciones _remotes" - -#~ msgid "" -#~ "Manage remote applications over the network (this may be a security risk)" -#~ msgstr "" -#~ "Xestionar aplicaciones remotes a traviés de la rede (esto pue representar " -#~ "un riesgu de seguridá)" - -#~ msgid "Opens the configuration panel for the selected splash screen" -#~ msgstr "Abre'l panel de configuración pa la pantalla d'entamu seleicionada" - -#~ msgid "Prompt for confirmation when logging out" -#~ msgstr "Entrugar al zarrar sesión" - -#~ msgid "Quit the program, and remove it from the session" -#~ msgstr "Colar del programa y desanicialu de la sesión" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Llanzadores de programes, botones de ventana, menú d'aplicaciones, cambiador d'estayes de trabayu y más." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Xestor d'escritoriu" -#~ msgid "S_plash" -#~ msgstr "_Pantalla d'entamu" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Afita la color de fondu o imaxe con menús o iconos p'aplicaciones minimizaes o llanzadores, preseos y cartafueyos opcionales." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Xestor de ficheros" -#~ msgid "Save Sessio_n" -#~ msgstr "Guardar sesió_n" +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un xestor de ficheros modernu pal escritoriu Unix/Linux, col oxetivu de ser fácil d'usar y rápidu." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Xestor de sesión" -#~ msgid "Saving Session" -#~ msgstr "Guardando sesión" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura la to sesión nel aniciu y permítete apagar l'ordenador dende Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Configurando'l sistema" -#~ msgid "" -#~ "Start GNOME services, such as gnome-keyring and the GNOME accessibility " -#~ "framework" -#~ msgstr "" -#~ "Entamar los servicios de GNOME, como gnome-keyring y l'entornu " -#~ "d'accesibilidá de GNOME" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistema de configuración pa controlar dellos aspeutos del to escritoriu como los axustes d'aspeutu, pantalla, tecláu y mur." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Guetador d'aplicaciones" -#~ msgid "Start KDE services, such as \"kdeinit,\" DCOP, and ARTS" -#~ msgstr "Entamar los servicios de KDE, como \"kdeinit,\" DCOP y ARTS" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Amuesa les aplicaciones instalaes nel to sistema n'estayes, asina que pues alcontrales y llanzales aína" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Degorriu d'axustes" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema d'almacenamientu basáu na configuración D-Bus." -#~ msgid "" -#~ "These applications are a part of the currently-running session, and can " -#~ "be saved when you log out. Changes below will only take effect when the " -#~ "session is saved." -#~ msgstr "" -#~ "Estes aplicaciones son parte la sesión anguaño n'execución y pueden " -#~ "guardase cuando vusté se desconeute. Los cambeos d'abaxo namái tendrán " -#~ "efeutu cuando guarde la sesión." +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce ye una coleición de programes que xuntos apurren un entornu d'escritoriu completu dafechu. Los siguientes programes son parte del nucleu Xfce:" -#~ msgid "" -#~ "Your session is being saved. If you do not wish to wait, you may close " -#~ "this window." -#~ msgstr "" -#~ "Ta guardándose la so sesión. Si nun quier esperar, puede zarrar esta " -#~ "ventana." +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce ye tamién una plataforma de desendolcu qu'apurre abondes biblioteques, qu'ayuden a los programadores a crear aplicaciones qu'encaxen bien nel entornu d'escritoriu." -#~ msgid "_Display chooser on login" -#~ msgstr "_Amosar seleutor de sesión al entamu" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Los componentes de Xfce tán llicenciaos baxo llicencies llibres o de códigu abiertu; GPL o BSDL p'aplicaciones y LGPL o BSDL pa llibreríes. Écha-y un güeyu a la documentación, el códigu fonte y el sitiu web Xfce (http://www.xfce.org) pa más información." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Gracies pol to interés en Xfce" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "L'equipu de desendolcu Xfce" -#~ msgid "_General" -#~ msgstr "_Xeneral" +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Si sabes de daquien que nun tea nesti llistáu; nun dubies y fai un reporte en ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "¡Gracies a tolos qu'ayudaron a facer esti software disponible!" -#~ msgid "_Prompt on logout" -#~ msgstr "_Entrugar al colar" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 tien copyright d'Oliver Fourdan (fourdan@xfce.org). Los distintos componentes tienen copyright de los sos respeutivos autores." -#~ msgid "_Quit Program" -#~ msgstr "_Zarrar programa" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Los paquetes libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs y exo tán distribuyíos baxo los términos de la GNU General Public License asoleyaos pola Free Software Foundation; siendo la versión 2 de la llicencia, o (na to opción) cualaquier versión siguiente." -#~ msgid "_Session" -#~ msgstr "_Sesión" +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Los paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop y xfwm4 tán distribuyíos baxo los términos de la GNU General Public License asoleyaos pola Free Software Foundation; siendo la versión 2 de la llicencia, o (na to opción) cualaquier versión siguiente." -#~ msgid "_Test" -#~ msgstr "_Preba" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Escribi '%s --help' pa la información d'usu." -#~ msgid "label" -#~ msgstr "etiqueta" +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Nun pue aniciase GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "L'equipu de desendolque de Xfce. Tolos drechos reservaos." -#~ msgid "Tips and tricks" -#~ msgstr "Conseyos y trucos" +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Por favor, informa de fallos a <%s>." -#~ msgid "xfce4-tips" -#~ msgstr "conseyos de xfce4" +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Llista de tornadores de %s" -#~ msgid "Unexpected error from HAL" -#~ msgstr "Error inesperáu d'HAL" +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Fallu al cargar la interfaz" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versión %s, distribuyíu por %s" -#~ msgid "gtk-close" -#~ msgstr "gtk-close" +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versión %s" -#~ msgid "gtk-help" -#~ msgstr "gtk-help" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Desendolcadores principales" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Collaboradores activos" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Sirvidores calteníos por" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervisión de Goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervisores de traducción" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Tornadores" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Collaboradores anteriores" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Tocante Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Información tocante al entornu d'escritoriu Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Tocante al entornu d'escritoriu Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Tocante" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Créitos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Llicencia" diff -Nru libxfce4ui-4.8.1/po/bg.po libxfce4ui-4.12.1/po/bg.po --- libxfce4ui-4.8.1/po/bg.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/bg.po 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,781 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Kiril Kirilov , 2012 +# Kiril Kirilov , 2015 +# Lyubomir Vasilev, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 07:33+0000\n" +"Last-Translator: Kiril Kirilov \n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/libxfce4ui/language/bg/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Не може да бъде отворен браузър с който да бъде прегледана документацията онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Искате ли да прочетете %s ръководство онлайн?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Искате ли да прочетете ръководството онлайн?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Онлайн-документация" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Вие ще бъдете препратен към сайта с документацията, където помощтните страници се превеждат и поддържат." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Прочитане онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "Винаги отивай директно в онлайн докумeнтацията" + +#: ../libxfce4ui/xfce-dialogs.c:334 +msgid "Information" +msgstr "Информация" + +#: ../libxfce4ui/xfce-dialogs.c:377 +msgid "Warning" +msgstr "Внимание" + +#: ../libxfce4ui/xfce-dialogs.c:421 +msgid "Error" +msgstr "Грешка" + +#: ../libxfce4ui/xfce-dialogs.c:494 +msgid "Question" +msgstr "Въпрос" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "ID клиент на мениджъра на сесиите" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "Изключване на управлението на сесиите" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "Възможности за управление на сесиите" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "Показване на възможностите за управление на сесиите" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Не може да се осъществи връзка с мениджъра на сесиите: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Мениджърът на сесиите не е предоставил валиден id на клиента" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:409 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Работната директория „%s“ не съществува. Тя няма да бъде използвана когато размножавате „%s“." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Тази клавишна комбинация вече е използвана за '%s' действие. Кое действие желаете да използвате?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Използване на '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Запазване на '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Тази клавишна комбинация вече е използвана за командата '%s'. Кое действие желаете да използвате?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Тази клавишна комбинация вече е използвана за действието '%s'. Кое действие желаете да използвате?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Моля, използвайте друга клавишна комбинация." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s вече се използва за това действие." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Конфликт с действие за %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 +msgid "This shortcut is already being used for something else." +msgstr "Тази клавишна комбинация вече е зададена за друго действие." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "Клавишни комбинации за действия с мениджъра на прозорците" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "действие" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "Клавишна комбинация за команда" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "команда" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Клавишна комбинация" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "Отказ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Натиснете клавишната комбинация, която искате да използвате за %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 +msgid "Shortcut:" +msgstr "Клавишна комбинация:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Все още няма натиснати клавиши, продължете." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 +msgid "Could not grab the keyboard." +msgstr "Не може да бъде прихваната клавиатурата." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Меню за действията с прозорци" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Нагоре" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Надолу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Наляво" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Надясно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Отмяна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Превключване на прозорците" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Превключване на прозорците (в обратна посока)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Превключване на прозорец за една и съща програма" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Превключване на програма" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Затваряне на прозорец" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Максимизиране на прозореца по хоризонтала" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Максимизиране на прозореца по вертикала" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Максимизиране на прозореца" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Скриване на прозореца" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Преместване на прозореца" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Преоразмеряване на прозореца" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Сянка под заглавието" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Прилепване на прозореца" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Издигане на прозореца на преден план" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Сваляне на прозореца на заден план" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Издигане и сваляне на прозорец" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Разтягане на прозорец" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Разтягане на прозореца по хоризонтала" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Разтягане на прозореца по вертикала" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Превключвател отгоре" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Режим на цял екран" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Преместване на прозореца на горното работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Преместване на прозореца на долното работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Преместване на прозореца на лявото работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Преместване на прозореца на дясното работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Преместване на прозореца на предишното работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Преместване на прозореца на следващото работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Преместване на прозореца на работно място 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Преместване на прозореца на работно място 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Преместване на прозореца на работно място 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Преместване на прозореца на работно място 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Преместване на прозореца на работно място 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Преместване на прозореца на работно място 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Преместване на прозореца на работно място 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Преместване на прозореца на работно място 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Преместване на прозореца на работно място 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Преместване на прозореца на работно място 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Преместване на прозореца на работно място 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Преместване на прозореца на работно място 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Разположи на прозореца отгоре" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Разположи прозореца отдолу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Разположи прозореца отляво" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Разположи прозореца отдясно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Подреждане на прозорците в горният ляв ъгъл" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Подреждане на прозорците в горният десен ъгъл" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Подреждане на прозорците в долният ляв ъгъл" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Подреждане на прозорците в долният десен ъгъл" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Показване на работният плот" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Горно работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Долно работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Ляво работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Дясно работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Предишно работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Следващо работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Работно място 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Работно място 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Работно място 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Работно място 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Работно място 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Работно място 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Работно място 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Работно място 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Работно място 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Работно място 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Работно място 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Работно място 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Добавяне на работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Добавяне на съседно работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Премахване на предишното работно място" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Премахване на активното работно място" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Диалог на заглавието" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Подзаглавие" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Джаджи за Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Информация за версията" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Мениджър на прозорците" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Управлява разположението на прозорците на екрана." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Панел" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Стартери на програми, бутони на прозорци, меню на програмите, превключвател на работните места и други." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Мениджър на работният плот" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Задаване на фонов цвят или изображение с допълнително меню на програмите или икони за минимизираните програми или стартери, устройства и папки." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Файлов мениджър " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Съвременен файлов мениджър за Unix/Linux, стремящ се да бъде бърз и лесен за ползване." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Мениджър на сесиите" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Възстановява вашата сесия при стартиране и позволява да изключвате компютъра от Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Настройки на системата" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Конфигуриране на системата за контрол над различни аспекти на работният плот, като външен вид, екран, клавиатура и настройка на мишката." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Търсене на програми" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Показва инсталираните на вашата система програми по категории, така, че да можете бързо да ги откриете и стартирате." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Диспечер на настройките" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Основана на D-Bus система за съхраняване на конфигурацията." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce е набор от програми, които осигуряват напълно функционална работна среда. Следните програми са ядрото на Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce е също и платформа, съдържаща няколко библиотеки, които помагат на програмистите за създаване на програми, които са добре интегрирани в графичната среда." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Компонентите на Xfce се разпространяват под свободен лиценз GPL за програмите LGPL или BSDL за библиотеките. Подробности, можете да намерите в документацията, в изходният код и на уеб сайт (http://www.xfce.org) за повече информация." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Благодарим ви за проявеният интерес към Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Екипът по разработка на Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Ако разберете за нещо, което липсва от този списък, моля, уведомете ни на ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Благодарим ви за помощта при осигуряването на програмното обезпечение!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Авторските права на Xfce 4 принадлежат на Olivier Fourdan (fourdan@xfce.org). Авторските права на другите компоненти принадлежат на техните автори." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Програмното обезпечение на libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs и exo се разпространяват под условията GNU Library General Public License версии 2 или по- нова." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Програмното обезпечение за thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop и xfwm4 се разпространява под условията GNU General Public License версии 2 или по- нова." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Напишете '%s --help' за да получите потребителска информация." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Не може да бъде инициализирана GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Екипът по разработката на Xfce. Всички права са запазени." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Моля, докладвайте за грешки на <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Списък на преводачите от %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Не може да бъде зареден интерфейс" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Версия %s разпространявана от %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Версия %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Основни разработчици" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Активни участници" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Поддържащи сървъри:" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Надзор над екстрите" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Отговорници за превода" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Преводачи" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Предишни участници" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Относно Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Информация за графична среда Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Относно графична среда Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Относно" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Благодарности" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Авторски права" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Лиценз" diff -Nru libxfce4ui-4.8.1/po/bn.po libxfce4ui-4.12.1/po/bn.po --- libxfce4ui-4.8.1/po/bn.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/bn.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,169 +1,760 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Israt Jahan , 2010. -# +# +# Translators: +# Israt Jahan , 2010 +# Sadia Afroz , 2010 msgid "" msgstr "" -"Project-Id-Version: bn\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-03-31 12:14+0600\n" -"Last-Translator: Israt Jahan \n" -"Language-Team: Bengali \n" -"Language: bn\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-11-19 11:04+0000\n" +"Last-Translator: Nick \n" +"Language-Team: Bengali (http://www.transifex.com/projects/p/xfce/language/bn/)\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" +"Language: bn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" -msgstr "তথ্য" +msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" -msgstr "সতর্কবানী" +msgstr "সতর্কীকরণ" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "ত্রুটি" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "প্রশ্ন" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "সেশন ব্যবস্থাপনা ক্লায়েন্ট আইডি" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "আইডি" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "সেশন ব্যবস্থাপনা নিষ্ক্রিয় করা হবে" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "সেশন ব্যবস্থাপনা অপশন" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "সেশন ব্যবস্থাপনা অপশন প্রদর্শন" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "সেশন ব্যবস্থাপকের সাথে সংযুক্ত হতে ব্যর্থ: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "সেশন ব্যবস্থাপন একটি কার্যকর ক্লায়েন্ট আইডি ফেরত দেয়নি" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "\"%s\" ডিরেক্টরিটি নেই। \"%s\" স্পনিং এর সময় এটি ব্যবহার করা হবে না।" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" msgstr "" -"এই শর্টকাটটি ইতোমধ্যেই অন্য উইণ্ডো ম্যানেজার অ্যাকশনে ব্যবহার করা হয়েছে। আপনি কোন " -"অ্যাকশনটি ব্যবহার করতে চান?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' ব্যবহার করুন" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "অপরটি রাখুন" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "'%s' রাখুন" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"এই শর্টকাটটি ইতোমধ্যেই অন্য কমান্ডে \"%s\" ব্যবহার করা হয়েছে। আপনি কোন অ্যাকশনটি " -"ব্যবহার করতে চান?" +msgstr "এই শর্টকাটটি ইতোমধ্যেই অন্য কমান্ডে \"%s\" ব্যবহার করা হয়েছে। আপনি কোন অ্যাকশনটি ব্যবহার করতে চান?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "'%s' রাখুন" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -"এই শর্টকাটটি ইতোমধ্যেই অন্য উইণ্ডো ম্যানেজার অ্যাকশনে ব্যবহার করা হয়েছে। আপনি কোন " -"অ্যাকশনটি ব্যবহার করতে চান?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "উইন্ডো ম্যানেজার অ্যাকশন বজায় রাখুন" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s এর জন্য অ্যাকশনের মাঝে দ্বন্দ হচ্ছে" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "এই শর্টকাটটি ইতোমধ্যেই অন্যকিছুর জন্য ব্যবহার করা হয়েছে।" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "উইন্ডো ম্যানেজার অ্যাকশন শর্টকাট" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "কাজ:" +msgstr "" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "কমান্ড শর্টকাট" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "কমান্ড:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "শর্টকাট" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "শর্টকাট:" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "কীবোর্ড টেনে আনতে পারেনি।" +msgstr "" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "উপশিরোনাম" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "উইন্ডো অপারেশন মেনু" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "উপরে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "নিম্নে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "বাম" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "ডান" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "বাতিল" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "উইন্ডোসমূহ বৃত্তাকার করা হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "উইন্ডোসমূহ বৃত্তাকার করা হবে (বিপরীত দিকে)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "অনুরূপ অ্যাপ্লিকেশনের জন্য উইন্ডো পরিবর্তন" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "অ্যাপ্লিকেশন পরিবর্তন" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "উইন্ডো বন্ধ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "অনুভূমিকভাবে উইন্ডোর পূর্ণবিস্তার" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "উল্লম্বভাবে উইন্ডোর পূর্ণবিস্তার" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "উইন্ডো পূর্ণবিস্তার" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "উইন্ডো আড়াল" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "উইন্ডো সরানো" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "উইন্ডোর আকার পরিবর্তন" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "আবছা উইন্ডো" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "স্টিক উইন্ডো" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "উইন্ডো উঠানো" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "নিম্নতর উইন্ডো" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "উইন্ডো ভরাট" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "অনুভূমিকভাবে উইন্ডো ভরাট" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "উল্লম্বভাবে উইন্ডো ভরাট" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "উপরে টগল" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "পূর্ণপর্দা টগল" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "উপরের কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "নিচের কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "বাম কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "ডান কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "পূর্ববর্তী কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "পরবর্তী কর্মপরিসরে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "কর্মপরিসর ১-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "কর্মপরিসর ২-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "কর্মপরিসর ৩-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "কর্মপরিসর ৪-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "কর্মপরিসর ৫-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "কর্মপরিসর ৬-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "কর্মপরিসর ৭-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "কর্মপরিসর ৮-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "কর্মপরিসর ৯-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "কর্মপরিসর ১০-এ উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "কর্মপরিসর ১১-তে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "কর্মপরিসর ১২-তে উইন্ডো সরানো হবে" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "ডেস্কটপ প্রদর্শন" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "উপরের কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "নিচের কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "বাম কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "ডান কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "পূর্ববর্তী কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "পরবর্তী কর্মপরিসর" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "কর্মপরিসর ১" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "কর্মপরিসর ২" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "কর্মপরিসর ৩" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "কর্মপরিসর ৪" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "কর্মপরিসর ৫" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "কর্মপরিসর ৬" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "কর্মপরিসর ৭" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "কর্মপরিসর ৮" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "কর্মপরিসর ৯" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "কর্মপরিসর ১০" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "কর্মপরিসর ১১" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "কর্মপরিসর ১২" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "কর্মপরিসর যোগ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "সংলগ্ন কর্মপরিসর যোগ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "সর্বশেষ কর্মপরিসর মুছে ফেলুন" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "সক্রিয় কর্মপরিসর মুছে ফেলুন" + +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "শিরোনামকৃত ডায়ালগ" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce ৪ উইজেডটস" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "সংস্করণ তথ্যাবলী" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "উইন্ডো ব্যবস্থাপক" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" diff -Nru libxfce4ui-4.8.1/po/ca.po libxfce4ui-4.12.1/po/ca.po --- libxfce4ui-4.8.1/po/ca.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ca.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,204 +1,760 @@ -# Catalan translations for libxfce package. -# Copyright (C) 2008 THE libxfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce package. -# Carles Muñoz Gorriz , 2008-2010. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# carlesmu , 2013 +# carlesmu , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce 4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-04-11 15:55+0100\n" -"Last-Translator: Carles Muñoz Gorriz \n" -"Language-Team: Catalan\n" -"Language: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-07-27 14:25+0000\n" +"Last-Translator: carlesmu \n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Catalan\n" -"X-Poedit-SourceCharset: utf-8\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "No s'ha pogut obrir el navegador web per veure la documentació en línia" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Voleu llegir el manual %s en línia?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Voleu llegir el manual en línia?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Documentació en línia" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Sereu redirigit a la lloc web de documentació on es mantenen i tradueixen les pàgines d'ajuda." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Llegir en línia" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Anar sempre a la documentació en línia directament" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Informació" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Advertència" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Error" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Pregunta" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID del client de gestió de sessions" +msgstr "ID del client de gestió de sessió" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Deshabilita la gestió de sessions" +msgstr "Deshabilita la gestió de sessió" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Opcions de gestió de sessions" +msgstr "Opcions de gestió de sessió" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Mostra les opcions de gestió de sessions" +msgstr "Mostra les opcions de gestió de sessió" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "No es pot connectar al gestor de sessions: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "El gestor de sessions no ha tornat una ID vàlida de client" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"El directori de treball «%s» no existeix. No s'utilitzarà al generar «%s»." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Ja s'està emprant aquesta drecera per una altre acció del gestor de " -"finestres. Quina acció voleu emprar?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "El directori de treball «%s» no existeix. No s'utilitzarà al generar «%s»." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Aquesta drecera ja s'està emprant per l'acció «%s». Quina acció voleu emprar?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Empra «%s»" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Manté l'altre" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Manté «%s»" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Ja s'està emprant aquesta drecera per l'ordre «%s». Quina acció voleu emprar?" +msgstr "Aquesta drecera ja s'està emprant per l'ordre «%s». Quina acció voleu emprar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Manté «%s»" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Ja s'està emprant aquesta drecera per una acció del gestor de finestres. " -"Quina acció voleu emprar?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Aquesta drecera ja s'està emprant per l'acció «%s». Quina acció voleu emprar?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Empreu una altra combinació de tecles." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Manté l'acció del gestor de finestres" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "«%s» ja llança aquesta acció." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Conflicte d'accions per a «%s»" +msgstr "Conflicte d'accions per %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." -msgstr "Ja s'està emprant aquesta acció per alguna altre cosa." +msgstr "Aquesta drecera ja s'empra per alguna altra cosa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Drecera d'acció del gestor de finestres" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Acció:" +msgstr "Gestor de Dreceres" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "acció" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Drecera d'ordre" +msgstr "Ordre de drecera" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Ordre:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "drecera" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Drecera" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Ja podeu pitjar les tecles del teclat que voleu emparellar: %s «%s»." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" msgstr "Drecera:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "No s'ha pitjat cap tecla, continua." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "No s'ha pogut capturar el teclat." +msgstr "No s'ha pogut obtenir el teclat." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtítol" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menú d’operacions de finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Amunt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Avall" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Esquerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Dreta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Canceŀla" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Cicla les finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Cicla les finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Canvia la finestra de la mateixa aplicació" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Canvia d'aplicació" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Tanca la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximitza la finestra horitzontalment" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximitza la finestra verticalment" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximitza la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Amaga la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mou la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensiona la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrotlla la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Finestra omnipresent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Eleva la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Abaixa la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Eleva o abaixa la finestra única" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Emplena la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Emplena la finestra horitzontalment" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Emplena la finestra verticalment" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Commuta amunt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Commuta a pantalla sencera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mou la finestra a l'espai de treball superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mou la finestra a l'espai de treball esquerra inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mou la finestra a l'espai de treball esquerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mou la finestra a l'espai de treball dret" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mou la finestra a l'espai de treball anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mou la finestra a l'espai de treball següent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mou la finestra a l'espai de treball 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mou la finestra a l'espai de treball 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mou la finestra a l'espai de treball 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mou la finestra a l'espai de treball 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mou la finestra a l'espai de treball 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mou la finestra a l'espai de treball 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mou la finestra a l'espai de treball 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mou la finestra a l'espai de treball 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mou la finestra a l'espai de treball 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mou la finestra a l'espai de treball 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mou la finestra a l'espai de treball 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mou la finestra a l'espai de treball 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Situa la finestra al centre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Ajusta la finestra a baix" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Ajusta la finestra a l'esquerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Ajusta la finestra a la dreta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Mostrar l'escriptori" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Espai de treball superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Espai de treball inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Espai de treball esquerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Espai de treball dret" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Espai de treball anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Espai de treball següent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Espai de treball 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Espai de treball 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Espai de treball 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Espai de treball 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Espai de treball 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Espai de treball 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Espai de treball 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Espai de treball 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Espai de treball 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Espai de treball 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Espai de treball 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Espai de treball 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Afegeix espai de treball" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Afegeix espai de treball adjacent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Esborra el darrer espai de treball" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Esborra l'espai de treball actiu" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Diàleg amb títol" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtítol" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Giny Xfce 4" +msgstr "Ginys de Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informació de la versió" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestor de finestres" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gestiona l'ubicació de finestres a la pantalla." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Quadre" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Llançadors de programes, finestres de botons, menú d'aplicacions, canviador d'espai de treball i molt més." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestor d'escriptori" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Fixa el color o la imatge de fons i opcionalment, menús d'aplicacions o icones per aplicacions minimitzades o llançadors, dispositius i carpetes." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gestor de fitxers" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un gestor de fitxers modern per escriptoris Unix/Linux, enfocat en la facilitat d'ús i en la velocitat." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gestor de sessió" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura la vostra sessió a l'inici i us permet apagar l'aparell des de Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Sistema de paràmetres" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistema de configuració que controla diversos aspectes de la configuració de l'aparença de l'escriptori, la pantalla, el teclat i el ratolí." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Cercador d'aplicacions" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Mostra les aplicacions instaŀlades en el vostre sistema ordenades per categories, així podeu trobar-les i llançar-les ràpidament." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Dimoni d'ajustaments" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema d'emmagatzematge de configuracions basat en D-Bus." -#~ msgid "File is not a valid .desktop file" -#~ msgstr "El fitxer no és un fitxer «.desktop» vàlid" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce és una coŀlecció de programes que conjuntament ofereixen un entorn d'escriptori ple de funcionalitats. Els següents programes formen part del nucli de Xfce:" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Versió «%s» del fitxer d'escriptori (desktop) no reconeguda" +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce també és una plataforma de desenvolupament i ofereix varies llibreries que ajuden als programadors a crear aplicacions que s'adaptin bé amb l'entorn d'escriptori." -#~ msgid "Starting %s" -#~ msgstr "S'està iniciant «%s»" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Els components de Xfce tenen llicències lliures o obertes; GPL o BSDL per les aplicacions i LGPL o BSDL per les llibreries. Per més informació mireu la documentació, el codi fon o la pàgina web de Xfce (http://www.xfce.org/)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Gràcies pel vostre interès en Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "L'Equip de desenvolupament de Xfce" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "L'aplicació no accepta documents a la línia d'ordres" +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Si sabeu d'algú que hagés d'estar en aquesta llista; no dubteu en reportar aquest error a ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Gràcies a tots que heu ajudat a fer aquest programari una realitat." -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Opció d'execució %d no reconeguda" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 és copyright d'Olivier Fourdan . Els diferents components el copyright el tenen els seus respectius autors." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "No es pot passar les URIs de documents a una entrada d'escriptori " -#~ "«Type=Link»" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Els paquets libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs i exo es distribueixen sota els termes de la llicència GNU Librarry General Public License, tal com l'ha publicada la Free Software Foundation; ja sigui la versió 2 de la llicència o, segons el vostre criteri, qualsevol versió posterior." -#~ msgid "Not a launchable item" -#~ msgstr "L'element no és executable" +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Els paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop i xfwm4 es distribueixen sota els termes de la llicència GNU General Public License, tal com l'ha publicada la Free Software Foundation; ja sigui la versió 2 de la llicència o, segons el vostre criteri, qualsevol versió posterior." -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Indiqueu el fitxer amb la configuració desada" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Feu «%s --help» per veure l'ús." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "No s'ha pogut iniciar GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "L'equip de desenvolupament de Xfce. Tots els drets reservats." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Envieu els errors a <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Llista de traductors de %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "No s'ha pogut carregar la interfície" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versió %s, distribuïda per %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versió %s" -#~ msgid "FILE" -#~ msgstr "FITXER" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Desenvolupadors principals" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Coŀlaboradors actius" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servidor mantingut per" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervisors de les extensions" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervisors de traduccions" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Traductors" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Antics coŀlaboradors" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Quant a Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informació sobre l'entorn d'escriptori Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Quant a l'entorn d'escriptori Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Quant a" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Crèdits" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Llicència" diff -Nru libxfce4ui-4.8.1/po/cs.po libxfce4ui-4.12.1/po/cs.po --- libxfce4ui-4.8.1/po/cs.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/cs.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,202 +1,780 @@ -# Czech translations for libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Miro Hrončok , 2008. -# Michal Várady , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Alois Nešpor , 2013 +# Michal Várady , 2014-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-12-07 02:13+0100\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 13:05+0000\n" "Last-Translator: Michal Várady \n" -"Language-Team: Czech\n" -"Language: \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/libxfce4ui/language/cs/)\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" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Otevření online dokumentace ve webovém prohlížeči se nezdařilo" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Chcete si přečíst příručku pro %s online?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Chcete si přečíst příručku online?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentace online" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Budete přesměrování na webovou stránku dokumentace, kde se stránky nápovědy udržují a překládají." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Číst _online" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Vždy automaticky přejít na dokumentaci online" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informace" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Varování" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Chyba" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" -msgstr "Dotaz" +msgstr "Otázka" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Identifikátor klienta správy relace" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Zakázat správcu relací" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Možnosti správy relace" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Zobrazit možnosti správy relace" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nepodařilo se připojit se ke správci relace: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Správce relace nevrátil platný identifikátor klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "Pracovní adresář \"%s\" neexistuje. Při spuštění \"%s\" nebude použit." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Tuto klávesovou zkratku již používá jiná akce správce oken. Kterou akci " -"chcete použít?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Tuto klávesovou zkratku již používá akce %s. Kterou akci chcete použít?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Použít %s" +msgstr "Použít '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Ponechat jinou" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Ponechat '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Tuto klávesovou zkratku již používá příkaz %s. Kterou akci chcete použít?" +msgstr "Tuto klávesovou zkratku již používá příkaz %s. Kterou akci chcete použít?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Ponechat %s" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Tuto klávesovou zkratku již používá akce správce oken. Kterou akci chcete " -"použít?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Tuto klávesovou zkratku již používá akce %s. Kterou akci chcete použít?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Prosím použijte jinou kombinaci kláves" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Ponechat akci správce oken" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s již spouští tuto akci." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt mezi akcemi pro %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Tato klávesová zkratka se již používá na jiném místě." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Klávesová zkratka akce správce oken" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Akce:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "akce" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Klávesová zkratka příkazu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Příkaz:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "příkaz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Klávesová zkratka" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Zrušit" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Nyní stiskněte klávesu, kterou chcete použít ke spuštění %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Klávesová zkratka:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nejsou stisknuty žádné klávesy " + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Nelze zachytávat vstup z klávesnice." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Podtitulek" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Nabídka možností okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Nahoru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Dolů" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Doleva" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Doprava" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Zrušit" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Procházet okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Procházet okna (v opačném směru)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Přepnout okno stejné aplikace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Přepnout aplikaci" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zavřít okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximalizovat okno ve vodorovném směru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximalizovat okno ve svislém směru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximalizovat okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Skrýt okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Přesunout okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Změnit velikost okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Zarolovat okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Přilepit okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Přenést okno do popředí" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Přenést okno do pozadí" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Přenést okno do popředí nebo do pozadí" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Vyplnit okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Vyplnit okno ve vodorovném směru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Vyplnit okno ve svislém směru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Přepnout nahoru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Přepnout do režimu celé obrazovky" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Přesunout okno na vrchní pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Přesunout okno na spodní pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Přesunout okno na levou pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Přesunout okno na pravou pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Přesunout okno na předchozí pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Přesunout okno na další pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Přesunout okno na pracovní plochu 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Přesunout okno na pracovní plochu 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Přesunout okno na pracovní plochu 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Přesunout okno na pracovní plochu 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Přesunout okno na pracovní plochu 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Přesunout okno na pracovní plochu 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Přesunout okno na pracovní plochu 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Přesunout okno na pracovní plochu 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Přesunout okno na pracovní plochu 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Přesunout okno na pracovní plochu 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Přesunout okno na pracovní plochu 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Přesunout okno na pracovní plochu 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Umístit okno nahoru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Umístit okno dolů" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Umístit okno doleva" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Umístit okno doprava" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Umístit okno nahoru doleva" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Umístit okno nahoru doprava" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Umístit okno dolů doleva" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Umístit okno dolů doprava" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Zobrazit pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Vrchní pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Spodní pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Levá pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Pravá pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Předchozí pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Další pracovní plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Pracovní plocha 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Pracovní plocha 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Pracovní plocha 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Pracovní plocha 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Pracovní plocha 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Pracovní plocha 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Pracovní plocha 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Pracovní plocha 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Pracovní plocha 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Pracovní plocha 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Pracovní plocha 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Pracovní plocha 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Přidat pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Přidat sousední pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Smazat poslední pracovní plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Smazat aktivní pracovní plochu" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Dialogové okno s titulkem" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Podtitulek" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Prvky dialogů pro prostředí Xfce 4" +msgstr "Xfce4 widgety" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informace o verzi" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Soubor není platným souborem typu .desktop" +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Správce oken" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Nerozpoznaný soubor plochy verze %s" +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Spravuje umístění oken na obrazovce." -#~ msgid "Starting %s" -#~ msgstr "Spouštění %s" +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Aplikace nepříjímá dokumenty na příkazovém řádku" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Spouštěče programů, tlačítka oken, nabídky aplikací, přepínač pracovních ploch a další." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Správce plochy" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Nerozpoznaný parametr spuštění: %d" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Nastavuje barvu nebo obrázek pozadí s volitelnou nabídkou aplikací, ikonami minimalizovaných aplikací, spouštěči, zařízeními a složkami." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Správce souborů" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Identifikátor dokumentu URI nelze předat položce plochy 'Type=Link' " +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Moderní správce souborů pro prostředí Unix/Linux, zaměřený na jednoduchost a rychlost." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Správce relace" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Obnovuje relaci při spuštění a umožňuje vypnout počítač z prostředí Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Nastavení systému" -#~ msgid "Not a launchable item" -#~ msgstr "Nespustitelná položka" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Systém konfigurace pro ovládání různých vlastností prostředí, jakými jsou například nastavení vzhledu, displeje, klávesnice a myši." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Vyhledávač aplikací" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Zobrazuje aplikace nainstalované v systému dle kategorií tak, abyste je mohli snadno najít a spustit." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Démon nastavení" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Úložný systém konfigurace založený na sběrnici D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Prostředí Xfce je sbírkou programů, které dohromady poskytují plnohodnostné pracovní prostředí. Součástí jádra prostředí Xfce jsou tyto programy:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Prostředí Xfce je také vývojovou platformou poskytující mnoho knihoven, které programátorům pomáhají vytvářet aplikace, které skvěle zapadnou do pracovního prostředí." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponenty prostředí Xfce jsou licencovány pod otevřenými nebo svobodnými licencemi; GPL nebo BSDL pro aplikace a LGPL nebo BSDL pro knihovny. Více informací získáte nahlédnutím do dokumentace, zdrojového kódu nebo webových stránek Xfce (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Děkujeme za váíš zájem o prostředí Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Tým vývojářů prostředí Xfce." -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Zadejte soubor obsahující uloženou konfiguraci" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Pokud víte o někom, kdo na tomto seznamu chybí, neváhejte a vyplňte hlášení o chybě na stránce ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Díky všem, kteří se podíleli na zpřístupnění tohoto softwaru." + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Vlastníkem autorských práv Xfce 4 je Olivier Fourdan (fourdan@xfce.org). Různé komponenty jsou chráněny autorskými právy příslušných autorů." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Balíčky libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs a exo jsou distribuovány pod podmínkami licence GNU Library General Public License publikované organizací Free Software Foundation; ve verzi 2 této licence, nebo (dle vašeho výběru) pozdější." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Balíčky thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop a xfwm4 jsou distribudovány pod podmínkami licence GNU General Public License publikované organizací Free Software Foundation; ve verzi 2 této licence, nebo (dle vašeho výběru) pozdější." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Informace o použití získáte příkazem '%s --help'" + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Nelze inicializovat GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Vývojářský tým prostředí Xfce. Všechna práva vyhrazena." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Prosíme, abyste chyby nahlásili na adresu <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Seznam překladatelů z %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Načtení rozhraní se nezdařilo." + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Verze %s, distribuována od %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Verze %s" -#~ msgid "FILE" -#~ msgstr "SOUBOR" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Klíčoví vývojáři" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Aktivní přispěvatelé" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Servery spravuje" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Vedoucí doplňků Goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Vedoucí překladů" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Překladatelé" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Dřívější přispěvatelé" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "O prostředí Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informace o pracovním prostředí Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "O pracovním prostředí Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "O pracovním prostředí" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Vytvořili" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Autorská práva" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licence" diff -Nru libxfce4ui-4.8.1/po/da.po libxfce4ui-4.12.1/po/da.po --- libxfce4ui-4.8.1/po/da.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/da.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,206 +1,766 @@ -# Danish translations for libxfce package. -# Copyright (C) 2008 THE libxfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce package. -# Ole Guldberg , 2008. -# Per Kongstad , 2009. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Aputsiaĸ Niels Janussen , 2013,2015 +# Erik Schmidt , 2012 +# Ole Guldberg , 2008 +# Per Kongstad , 2009 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui 1.4.7.0\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-10-18 21:21+0100\n" -"Last-Translator: Per Kongstad \n" -"Language-Team: Danish \n" -"Language: da\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-19 03:15+0000\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" +"Language-Team: Danish (http://www.transifex.com/projects/p/libxfce4ui/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Danish\n" -"X-Poedit-Country: DENMARK\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Kunne ikke åbne netlæser for dokumentation på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Vil du læse %smanual på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Vil du læse manualen på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentation på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Du vil blive omstillet til dokumentationssiden på nettet, hvor hjælpesiderne bliver vedligeholdt og oversat." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Læs på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Gå altid direkte til dokumentationen på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Advarsel" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Fejl" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Spørgsmål" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Klientid fra sessionshåndtering" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "Id" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Slå sessionshåndtering fra" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Tilvalg for sessionshåndtering:" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Vis tilvalg for sessionshåndtering" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Kunne ikke forbinde til sessionshåndteringen: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessionshåndtering returnerede ikke et gyldigt klientid" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Arbejdsmappen \"%s\" findes ikke. Den vil ikke blive brugt ved klagørelsen af" +"Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Denne genvej bruges allerede til en anden vinduehåndteringshandling. Hvilken " -"handling vil du bruge?" +msgstr "Arbejdsmappen \"%s\" findes ikke. Den vil ikke blive brugt ved klagørelsen af\"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Denne genvej bruges allerede til handlingen \"%s\". Hvilken handling vil du bruge?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Brug '%s\"" +msgstr "Brug '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Behold den anden" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Behold '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Denne genvej bruges allerede til kommandoen '%s'. Hvilken handling vil du " -"bruge?" +msgstr "Denne genvej bruges allerede til kommandoen '%s'. Hvilken handling vil du bruge?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Behold '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Denne genvej bruges allerede til en anden vinduehåndteringshandling. Hvilken " -"handling vil du bruge?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Denne genvej bruges allerede til handlingen \"%s\". Hvilken handling vil du bruge?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Brug en anden tastekombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Behold vindueshåndteringshandlingen" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s bruges allerede til denne handling." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Modstridende handlinger til %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Denne genvej bruges allerede til noget andet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Genvej til vindueshåndteringshandling" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Handling:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "handling" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Kommandogenvej" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Kommando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Genvej" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Annullér" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Tryk dernæst på de tastaturtaster du ønsker at anvende til at udløse %s \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Genvej:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Ingen taster trykket endnu, fortsæt." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Kunne ikke gribe tastaturet" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Undertitel" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Vindue funktionsmenu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Op" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Ned" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Venstre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Højre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Annuller" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Gennemløb vinduer" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Gennemløb vinduer (omvendt)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Skift vindue til samme program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Skift program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Luk vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimer vindue horisontalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimer vindue vertikalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimer vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Skjul vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Flyt vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Ændr vinduets størrelse" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Skygge vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Klæb vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Flyt vindue frem" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Flyt vindue tilbage" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Rul vindue ud eller sammen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Udfyld vindue" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Udfyld vinduet horisontalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fyld vinduet vertikalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Aktiver over" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Aktiver fuldskærm" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Flyt vindue til øvre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Fylt vindue til nedre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Flyt vindue til venstre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Flyt vindue til højre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Flyt vindue til foregående arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Flyt vindue til næste arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Flyt vindue til arbejdsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Flyt vindue til arbejdsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Flyt vindue til arbejdsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Flyt vindue til arbejdsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Flyt vindue til arbejdsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Flyt vindue til arbejdsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Flyt vindue til arbejdsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Flyt vindue til arbejdsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Flyt vindue til arbejdsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Flyt vindue til arbejdsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Flyt vindue til arbejdsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Flyt vindue til arbejdsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Flyt vindue til toppen som flise" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Flyt vindue til bunden som flise" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Flyt vindue til venstre som flise" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Flyt vindue til højre som flise" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Vis skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Øvre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Nedre arbejdområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Venstre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Højre arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Foregående arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Næste arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Arbejdsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Arbejdsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Arbejdsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Arbejdsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Arbejdsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Arbejdsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Arbejdsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Arbejdsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Arbejdsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Arbejdsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Arbejdsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Arbejdsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Tilføj arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Tilføj tilstødende arbejdsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Slet sidste arbejdområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Slet aktivt arbejdsområde" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Dialogtitel" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Undertitel" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Kontroller til Xfce 4" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versionsinformation" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Vindueshåndtering" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Håndterer placeringen af vinduer på skærmen." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programstartere, vinduesknapper, programmenuer, arbejdspladsskiftere og mere." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Skrivebordshåndtering" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Indstiller baggrunds-farven eller -billedet med tilvalg af program-menu eller -ikoner for minimerede programmer eller opstartere, enheder og mapper." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Filhåndtering" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "En moderne filhåndtering til Unix/Linux-skrivebordet, med målet at være nemt at bruge og hurtig." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Sessionshåndtering" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Gendanner din session ved opstart og tillader dig at slukke din computer fra Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Systemindstilling" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Instillingssystem for at håndtere forskellige dele af skrivebordet som fremkost-, visning-, tastatur- og museindstillinger." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Programfinder" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Viser programmerne som er installeret i kategorier, så du hurtigt kan finde og starte dem." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Indstillingstjeneste" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus baseret konfiguration af lagersystem." -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Filen er ikke en gyldig .skrivebordsfil" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce er en samling af programmer der sammen tilbyder et fuldt udstyret skrivebordsmiljø. De følgende programmer er en del af kernen i Xfce:" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Ukendt skrivebordsfilsversion '%s'" +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce er også en udviklingsplatform som tilbyder adskillige biblioteker, der hjælper programmører med at skabe programmer som passer til skrivebordsmiljøet." -#~ msgid "Starting %s" -#~ msgstr "Starter %s" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponenterne i Xfce er licenseret under frie eller åbne kilde licenser; GPL eller BSDL for programmer og LGPL eller BSDL for biblioteker. Se i dokumentationen, kildekoden eller på Xfce hjemmeside (http://www.xfce.org) for mere information." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Tak for din interesse for Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Udviklingsholdet bag Xfce" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Programmet anerkender ikke dokumenter på kommandolinje" +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Hvis du har kendskab til nogle der mangler på denne liste, bedes du rapportere en fejl på ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Vi takker alle som har hjulpet til med at gøre dette programmel tilgængeligt!" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Ukendt opstartstilvalg: %d" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 er copyright Olivier Fourdan (fourdan@xfce.org). De forskellige komponenter er copyright til de enkelte forfattere." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Kan ikke videregive URI'er for dokumenter til en 'type=henvisning' " -#~ "skrivebordspost" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs og exo pakkerne er distribueret under betingelserne i GNU Library General Public License som publiceres af Free Software Foundation; enten version 2 af licensen eller (efter dit valg) enhver senere version." -#~ msgid "Not a launchable item" -#~ msgstr "Ikke et opstartselement" +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Pakkerne thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop og xfwm4 er distribueret under betingelserne i GNU Library General Public License som publiceres af Free Software Foundation; enten version 2 af licensen eller (efter dit valg) enhver senere version." -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Angiv filen som indeholder gemte indstilling" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Indtast \"%s --help\" for brugsvejledning." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Kunne ikke klargøre GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Udviklingholdet Xfce. Alle rettigheder forbeholdes." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Venligst rapportér fejl til <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Liste over oversættere %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Kunne ikke indlæse grænseflade" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distribueret af %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Version %s" -#~ msgid "FILE" -#~ msgstr "FIL" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Kerneudviklere" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktive udviklere" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servers vedligeholdt af" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies vedledning" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Oversættelse vejledning" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Oversættere" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Tidligere bidragydere" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Om Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informationer omkring skrivebordsmiljøet Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Om skrivebordsmiljøet Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Om" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Anerkendelser" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licens" diff -Nru libxfce4ui-4.8.1/po/de.po libxfce4ui-4.12.1/po/de.po --- libxfce4ui-4.8.1/po/de.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/de.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,174 +1,781 @@ -# German translations for libxfce4ui package -# German messages for libxfce4ui. -# Copyright (C) 2008 THE libxfce4ui'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Fabian Nowak , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Georg Eckert , 2013,2015 +# Harald Judt , 2013 +# Tobias Bannert , 2014-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui 4.5.0svn-r27345\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-01-13 02:07+0100\n" -"Last-Translator: Christoph Wickert \n" -"Language-Team: German\n" -"Language: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-09 13:48+0000\n" +"Last-Translator: Tobias Bannert \n" +"Language-Team: German (http://www.transifex.com/projects/p/libxfce4ui/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: German\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Der Internetnavigator zum Lesen des Internethandbuchs konnte nicht geöffnet werden" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Möchten Sie das %s-Handbuch im Internet lesen?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Möchten Sie das Handbuch im Internet lesen?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Internetdokumentation" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Sie werden zur Internetseite mit den Handbüchern weitergeleitet. Dort finden Sie aktuelle und übersetzte Hilfeseiten vor." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Im Internet lesen" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Immer direkt zu den Internethandbüchern gehen" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" -msgstr "Warnung" +msgstr "Achtung" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Fehler" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Frage" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID für die Sitzungsverwaltung" +msgstr "Kennung der Sitzungsverwaltung" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "ID" +msgstr "Kennung" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Sitzungsverwaltung deaktivieren" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Optionen der Sitzungsverwaltung" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Optionen der Sitzungsverwaltung anzeigen" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Verbindung zur Sitzungsverwaltung fehlgeschlagen: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Die Sitzungsverwaltung hat keinen gültige ID geliefert" +msgstr "Die Sitzungsverwaltung hat keine gültige Kennung geliefert" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Das Arbeitsverzeichnis »%s« ist nicht vorhanden: Es wird beim Starten von " -"»%s« nicht verwendet." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Dieses Tastenkürzel wird bereits von einer Aktion der Fensterverwaltung " -"verwendet. Welche Aktion möchten Sie verwenden?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Das Arbeitsverzeichnis »%s« ist nicht vorhanden: Es wird beim Starten von »%s« nicht verwendet." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Dieses Tastenkürzel wird bereits für die Aktion »%s« verwendet. Welche Aktion möchten Sie verwenden?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "»%s« nutzen" +msgstr "»%s« benutzen" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Die andere beibehalten" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "»%s« beibehalten" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Dieses Tastenkürzel wird bereits für den Befehl »%s« verwendet. Welche " -"Aktion möchten Sie verwenden?" +msgstr "Dieses Tastenkürzel wird bereits für den Befehl »%s« verwendet. Welche Aktion möchten Sie verwenden?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "»%s« beibehalten" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Dieses Tastenkürzel wird bereits von einer anderen Aktion der " -"Fensterverwaltung verwendet. Welche Aktion möchten Sie verwenden?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Dieses Tastenkürzel wird bereits von der Aktion »%s« verwendet. Welche Aktion möchten Sie verwenden?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Bitte verwenden Sie eine andere Tastenkombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Die Aktion der Fensterverwaltung beibehalten" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Diese Aktion wird bereits durch %s aufgerufen." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt bei Aktionen für »%s«" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Das Tastenkürzel wird bereits für etwas anderes verwendet." +msgstr "Dieses Tastenkürzel wird bereits für eine andere Aktion verwendet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Tastenkürzel für die Aktion der Fensterverwaltung" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Aktion:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "Aktion" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Tastenkürzel für Befehl" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Befehl:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "Befehl" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Abbrechen" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Bitte jetzt die Tastenkombination drücken, die Sie benutzen möchten, um den %s »%s« auszulösen." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Tastenkürzel:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Noch keine Tasten gedrückt, bitte fortfahren." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Tastatur konnte nicht erfasst werden." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Untertitel" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menü für Fensteraktionen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Hoch" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Runter" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Links" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Rechts" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Abbrechen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Fenster durchwechseln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Fenster durchwechseln (Rückwärts)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Fenster für dieselbe Anwendung wechseln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Anwendung wechseln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Fenster schließen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Fenster horizontal vergrößern" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Fenster senkrecht vergrößern" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Fenster vergrößern" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Fenster verstecken" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Fenster verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Fenstergröße ändern" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Fenster einrollen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Fenster anheften" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Fenster hervorheben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Fenster herabsetzen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Fenster hervorheben oder absenken" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fenster füllen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fenster horizontal füllen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fenster senkrecht füllen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Nach vorne bringen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Vollbildmodus" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Fenster auf die obere Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Fenster auf die untere Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Fenster auf die linke Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Fenster auf die rechte Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Fenster auf die vorige Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Fenster auf die nächste Arbeitsfläche verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Fenster auf Arbeitsfläche 1 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Fenster auf Arbeitsfläche 2 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Fenster auf Arbeitsfläche 3 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Fenster auf Arbeitsfläche 4 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Fenster auf Arbeitsfläche 5 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Fenster auf Arbeitsfläche 6 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Fenster auf Arbeitsfläche 7 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Fenster auf Arbeitsfläche 8 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Fenster auf Arbeitsfläche 9 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Fenster auf Arbeitsfläche 10 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Fenster auf Arbeitsfläche 11 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Fenster auf Arbeitsfläche 12 verschieben" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Fenster nach oben kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Fenster nach unten kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Fenster nach links kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Fenster nach rechts kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Fenster nach links oben kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Fenster nach rechts oben kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Fenster nach links unten kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Fenster nach rechts unten kacheln" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Schreibtisch anzeigen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Obere Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Untere Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Linke Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Rechte Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Vorherige Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Nächste Arbeitsfläche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Arbeitsfläche 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Arbeitsfläche 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Arbeitsfläche 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Arbeitsfläche 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Arbeitsfläche 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Arbeitsfläche 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Arbeitsfläche 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Arbeitsfläche 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Arbeitsfläche 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Arbeitsfläche 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Arbeitsfläche 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Arbeitsfläche 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Arbeitsfläche hinzufügen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Anliegende Arbeitsfläche hinzufügen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Letzte Arbeitsfläche löschen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Aktive Arbeitsfläche löschen" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Dialog mit Titel" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Untertitel" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 Widgets" +msgstr "Xfce-4-Elemente" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versionsinformation" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Fensterverwaltung" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Regelt die Platzierung der Fenster auf dem Bildschirm." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Leiste" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programmstarter, Fensterknöpfe, Anwendungsmenü, Arbeitsflächenumschalter und mehr." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Schreibtischverwaltung" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Stellt die Hintergrundfarbe oder das Hintergrundbild mit einem optionalen Anwendungsmenü oder Symbolen für verkleinerte Anwendungen oder Startern, Geräten und Ordnern ein." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Dateiverwaltung" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Eine moderne Dateiverwaltung für die Unix/Linux-Arbeitsumgebung, ausgerichtet auf einfache Bedienung und Geschwindigkeit." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Sitzungsverwaltung" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Stellt Ihre Sitzung beim Start wieder her und erlaubt es Ihnen, den Rechner aus Xfce herunter zu fahren." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Systemeinstellungen" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Einstellungssystem zum Einstellen verschiedener Aspekte des Schreibtisches, wie das Aussehen, die Anzeige-, Tastatur- und Mauseinstellungen." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Anwendungsfinder" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Zeigt die auf ihrem System installierten Anwendungen in Kategorien an, so dass Sie diese schnell finden und starten können." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Einstellungsdienst" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-basiertes Einstellungssystem" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce ist eine Sammlung von Programmen, die zusammen eine voll funktionsfähige Arbeitsumgebung zur Verfügung stellen. Die folgenden Programme sind Teil des Xfce-Kerns:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce ist auch eine Entwicklungsplattform, die verschiedene Bibliotheken zur Verfügung stellt, die es Programmierern ermöglichen, Anwendungen zu erstellen, die gut in die Arbeitsumgebung passen." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce-Komponenten sind lizenziert unter freien Lizenzen oder Lizenzen für quelloffene Programme: GPL oder BSDL für Anwendungen und LGPL oder BSDL für Bibliotheken. Weitere Informationen finden Sie in der Dokumentation, dem Quellcode oder auf der Xfce-Internetseite (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Danke für Ihr Interesse an Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Die Xfce-Entwicklungsmannschaft" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Sollten Sie jemanden auf dieser Liste vermissen, zögern Sie nicht, unter einen Fehlerbericht zu erstellen." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Danke an alle, die geholfen haben, diese Anwendung verfügbar zu machen!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Das Urheberrecht von Xfce 4 liegt bei Olivier Fourdan (fourdan@xfce.org). Die verschiedenen Komponenten sind durch ihre jeweiligen Autoren urheberrechtlich geschützt." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Die Pakete libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs und exo werden verbreitet unter den Bestimmungen der GNU Library General Public License, wie sie von der Free Software Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz oder einer späteren Ihrer Wahl." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Die Pakete thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop und xfwm4 werden verbreitet unter den Bestimmungen der GNU General Public License, wie sie von der Free Software Foundation veröffentlicht wurde; entweder in Version 2 der Lizenz oder einer späteren Ihrer Wahl." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "»%s --help« eingeben, um weitere Informationen zu erhalten." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "GTK+ konnte nicht initialisiert werden." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Die Xfce-Entwicklungsmannschaft. Alle Rechte vorbehalten." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Probleme bitte unter <%s> melden." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Übersetzerliste von %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Schnittstelle konnte nicht geladen werden" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, verbreitet von %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Kernentwickler" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Aktive Mitwirkende" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Server gewartet von" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Koordination der Goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Koordination der Übersetzungen" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Übersetzer" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Frühere Mitwirkende" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Über Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informationen über die Xfce-Arbeitsumgebung" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Über die Xfce-Arbeitsumgebung" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Über" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Mitwirkende" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Urheberrecht" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lizenz" diff -Nru libxfce4ui-4.8.1/po/el.po libxfce4ui-4.12.1/po/el.po --- libxfce4ui-4.8.1/po/el.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/el.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,204 +1,761 @@ -# Greek translation for libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce package. -# Evaggelos Balaskas , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Efstathios Iosifidis , 2014 +# Efstathios Iosifidis , 2012 +# ebal , 2009 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui git VERSION\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-08-30 20:14+0200\n" -"Last-Translator: Evaggelos Balaskas \n" -"Language-Team: Greek \n" -"Language: el\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2014-12-26 19:57+0000\n" +"Last-Translator: Efstathios Iosifidis \n" +"Language-Team: Greek (http://www.transifex.com/projects/p/libxfce4ui/language/el/)\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" +"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Αποτυχία ανοίγματος περιηγητή για προβολή τεκμηρίωσης στο διαδίκτυο" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Θέλετε να διαβάσετε το εγχειρίδιο %s στο διαδίκτυο;" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Θέλετε να διαβάσετε το εγχειρίδιο στο διαδίκτυο;" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Τεκμηρίωση στο Διαδίκτυο" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Θα μετακινηθείτε στην ιστοσελίδα τεκμηρίωσης όπου οι σελίδες βοήθειας συντηρούνται και μεταφράζονται." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Ανάγνωση στο διαδίκτυο" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Πάντα μετακίνηση στην τεκμηρίωση στο διαδίκτυο" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" -msgstr "Πληροφορία" +msgstr "Πληροφορίες" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Προειδοποίηση" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Σφάλμα" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Ερώτηση" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID πελάτη του διαχειριστή συνεδρίας" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Απενεργοποίηση του διαχειριστή συνεδρίας" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Επιλογές του διαχειριστή συνεδρίας" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Εμφάνιση των επιλογών του διαχειριστή συνεδρίας" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Αποτυχία σύνδεσης με τον διαχειριστή συνεδρίας: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Ο διαχειριστής συνεδρίας επέστρεψε μη έγκυρο id πελάτη" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Ο κατάλογος εργασίας \"%s\" δεν υπάρχει. Δε θα χρησιμοποιηθεί κατά τη " -"δημιουργία του \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Αυτή η συντόμευση χρησιμοποιείται ήδη για άλλη δράση του διαχειριστή " -"παραθύρων. Ποια δράση θέλετε να χρησιμοποιήσετε;" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Ο κατάλογος εργασίας \"%s\" δεν υπάρχει. Δε θα χρησιμοποιηθεί κατά τη δημιουργία του \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια θέλετε να χρησιμοποιήσετε;" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Χρήση '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Διατήρηση της άλλης" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Διατήρηση του '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Αυτή η συντόμευση χρησιμοποιείται ήδη για την εντολή '%s'. Ποια δράση θέλετε " -"να χρησιμοποιήσετε;" +msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την εντολή '%s'. Ποια δράση θέλετε να χρησιμοποιήσετε;" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Διατήρηση του '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Αυτή η συντόμευση χρησιμοποιείται ήδη για δράση του διαχειριστή παραθύρων. " -"Ποια δράση θέλετε να χρησιμοποιήσετε;" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για την ενέργεια '%s'. Ποια ενέργεια θέλετε να χρησιμοποιήσετε;" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Παρακαλώ χρησιμοποιήστε άλλο συνδυασμό πλήκτρων." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Διατήρηση της δράσης του διαχειριστή παραθύρων" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Συγκρουόμενες δράσεις για το %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Αυτή η συντόμευση χρησιμοποιείται ήδη για κάτι άλλο." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Συντόμευση δράσης διαχειριστή παραθύρων" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Δράση:" +msgstr "" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "ενέργεια" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Συντόμευση εντολής" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Εντολή:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "εντολή" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Συντόμευση" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" msgstr "Συντόμευση:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "Δεν είναι δυνατή η δέσμευση του πληκτρολογίου." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Υπότιτλος" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Λειτουργίες παραθύρων" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Πάνω" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Κάτω" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Αριστερά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Δεξιά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Άκυρο" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Εναλλαγή παραθύρων" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Εναλλαγή παραθύρων (Αντίστροφα)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Εναλλαγή παραθύρου για την ίδια εφαρμογή" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Εναλλαγή εφαρμογής" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Κλείσιμο παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Μεγιστοποίηση ενός παραθύρου οριζόντια" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Μεγιστοποίηση ενός παραθύρου κάθετα" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Μεγιστοποίηση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Απόκρυψη παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Μετακίνηση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Αλλαγή μεγέθους παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Σκίαση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Επικόλληση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Ανύψωση παραθύρου " + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Χαμήλωση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Ανύψωση ή κατέβασμα παραθύρου " + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Μεγιστοποίηση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Οριζόντια μεγιστοποίηση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Κάθετη μεγιστοποίηση παραθύρου" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Εναλλαγή με το παραπάνω" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Σε πλήρη οθόνη" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Μετακίνηση παραθύρου στον πάνω χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Μετακίνηση παραθύρου στον κάτω χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας αριστερά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας δεξιά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Μετακίνηση παραθύρου στον προηγούμενο χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Μετακίνηση παραθύρου στον επόμενο χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας στην κορυφή" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Μετακίνηση παραθύρου στον κάτω χώρο εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας αριστερά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Μετακίνηση παραθύρου στο χώρο εργασίας δεξιά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Εμφάνιση επιφάνειας εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Πάνω χώρος εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Κάτω χώρος εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Χώρος εργασίας αριστερά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Χώρος εργασίας δεξιά" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Προηγούμενος χώρος εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Επόμενος χώρος εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Χώρος εργασίας 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Χώρος εργασίας 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Χώρος εργασίας 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Χώρος εργασίας 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Χώρος εργασίας 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Χώρος εργασίας 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Χώρος εργασίας 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Χώρος εργασίας 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Χώρος εργασίας 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Χώρος εργασίας 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Χώρος εργασίας 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Χώρος εργασίας 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Προσθήκη χώρου εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Προσθήκη γειτονικού χώρου εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Διαγραφή του τελευταίου χώρου εργασίας" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Διαγραφή ενεργού χώρου εργασίας" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Διάλογος με τίτλο" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Υπότιτλος" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce4 Widgets" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Πληροφορίες έκδοσης" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Διαχειριστής παραθύρων" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Χειρισμός μετακίνησης παραθύρων στην οθόνη." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Πίνακας" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Εκκινητές προγραμμάτων, κουμπιά παραθύρων, μενού εφαρμογών, εναλλαγή χώρου εργασίας και άλλα." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Διαχειριστής Επιφάνειας Εεργασίας" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Ορίζει το χρώμα φόντου ή την εικόνα με προαιρετικό μενού εφαρμογών ή εικονιδίων για τις ελαχιστοποιημένες εφαρμογές ή εκκινητές, συσκευές και φακέλους." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Διαχειριστής αρχείων" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Ένας σύγχρονος διαχειριστής αρχείων για το Unix/Linux, που στοχεύει στην ευκολία χρήσης και στην ταχύτητα." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Διαχειριστής Συνεδρίας" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Επαναφορά της συνεδρίας σας στην εκκίνηση που σας επιτρέπει να τερματίσετε τον υπολογιστή σας από το Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Ρύθμιση Συστήματος" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Σύστημα ρυθμίσεων για έλεγχο διαφόρων πτυχών της επιφάνειας εργασίας όπως ρυθμίσεις εμφάνισης, οθόνης, πληκτρολογίου και ποντικιού." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Εύρεση Εφαρμογών" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Εμφάνιση εγκατεστημένων εφαρμογών στο σύστημά σας σε κατηγορίες, ώστε να μπορείτε να τις βρείτε και να τις εκκινήσετε ταχύτατα." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Υπηρεσία Ρυθμίσεων" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Ρυθμίσεις συστήματος αποθηκευτικού χώρου βασισμένου σε D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Το Xfce είναι μια συλλογή από προγράμματα που μαζί προσφέρουν ένα πλήρες λειτουργικό περιβάλλον εργασίας. Τα παρακάτω προγράμματα είναι μέρος του πυρήνα Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Το Xfce είναι επίσης μια πλατφόρμα ανάπτυξης παρέχοντας πληθώρα βιβλιοθηκών, που βοηθούν τους προγραμματιστές να δημιουργήσουν εφαρμογές που ταιριάζουν στο περιβάλλον εργασίας." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Τα συστατικά του Xfce είναι υπό ελεύθερες ή ανοικτού κώδικα άδειες χρήσης, GPL ή BSDL για εφαρμογές και LGPL ή BSDL για βιβλιοθήκες. Για περισσότερες πληροφορίες ανατρέξτε στην τεκμηρίωση, τον πηγαίο κώδικα ή την ιστοσελίδα του Xfce (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Ευχαριστούμε που ενδιαφέρεστε για το Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Η Ομάδα Ανάπτυξης του Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Εάν βλέπετε να λείπει κάποιος από την λίστα, μην διστάσετε να αναφέρετε σφάλμα στο ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Ευχαριστούμε όλους όσους βοήθησαν ώστε να είναι διαθέσιμο το λογισμικό αυτό!" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Το αρχείο δεν είναι ένα έγκυρο αρχείο .desktop" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Η πνευματική ιδιοκτησία του Xfce 4 ανήκει στον Olivier Fourdan (fourdan@xfce.org). Τα διάφορα συστατικά είναι πνευματική ιδιοκτησία των αντίστοιχων συγγραφέων τους." -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Άγνωστη έκδοση του αρχείου επιφάνειας '%s'" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Τα πακέτα libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs και exo διανέμονται υπό τους όρους GNU Library General Public License όπως δημοσιεύονται από το Ίδρυμα Ελεύθερου Λογισμικού, είτε στην έκδοση 2 της άδειας, είτε (κατ'επιλογή) σε τελευταία έκδοση." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Τα πακέτα thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 διανέμονται υπό τους όρους GNU Library General Public License όπως δημοσιεύονται από το Ίδρυμα Ελεύθερου Λογισμικού, είτε στην έκδοση 2 της άδειας, είτε (κατ'επιλογή) σε τελευταία έκδοση." -#~ msgid "Starting %s" -#~ msgstr "Εκκινείται %s " +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Για πληροφορίες χρήσης πληκτρολογήστε '%s --help'." -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Η εφαρμογή δεν δέχεται έγγραφα στην γραμμή εντολών" +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Αδυναμία αρχικοποίησης GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Η ομάδα ανάπτυξης Xfce. Όλα τα δικαιώματα είναι κατοχυρωμένα." -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Άγνωστη επιλογή εκτέλεσης: %d" +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Παρακαλώ αναφέρετε σφάλματα στο <%s>." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Δεν μπορούν να περαστούν σε μία εισαγωγή επιφάνειας εργασίας URI εγγράφων " -#~ "στο 'Τύπος=Σύνδεση'" +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Λίστα μεταφραστών από %s." -#~ msgid "Not a launchable item" -#~ msgstr "Το αντικείμενο δεν εκτελείτε" +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Αποτυχία φόρτωσης διεπαφής" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Έκδοση %s, διανομή από %s" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Προσδιορίζει το αρχείο που περιέχει τις αποθηκευμένες ρυθμίσεις" +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Έκδοση %s" -#~ msgid "FILE" -#~ msgstr "Αρχείο" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Βασικοί προγραμματιστές" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Ενεργοί συνεισφέροντες" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Οι εξυπηρετητές συντηρούνται από" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Συντονισμός Goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Συντονισμός μεταφράσεων" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Μεταφραστές" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Προηγούμενοι συνεισφέροντες" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Περί Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Πληροφορίες σχετικά με το περιβάλλον εργασίας Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Περί του περιβάλλοντος εργασίας Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Περί" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Συντελεστές" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Πνευματικά δικαιώματα" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Άδεια" diff -Nru libxfce4ui-4.8.1/po/en_AU.po libxfce4ui-4.12.1/po/en_AU.po --- libxfce4ui-4.8.1/po/en_AU.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/en_AU.po 2015-02-18 16:12:39.000000000 +0000 @@ -0,0 +1,759 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Michael Findlay , 2013-2014 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2014-09-05 03:00+0000\n" +"Last-Translator: Michael Findlay \n" +"Language-Team: English (Australia) (http://www.transifex.com/projects/p/libxfce4ui/language/en_AU/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_AU\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Failed to open web browser for online documentation" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Do you want to read the %s manual online?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Do you want to read the manual online?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Online Documentation" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "You will be redirected to the documentation website where the help pages are maintained and translated." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Read Online" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Always go directly to the online documentation" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "Information" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "Warning" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "Error" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "Question" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "Session management client ID" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "Disable session management" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "Session management options" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "Show session management options" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Failed to connect to the session manager: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Session manager did not return a valid client id" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "This shortcut is already being used for the action '%s'. Which action do you want to use?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Use '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Keep '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "This shortcut is already being used for the command '%s'. Which action do you want to use?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "This shortcut is already being used by the action '%s'. Which action do you want to use?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Please use another key combination." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s already triggers this action." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Conflicting actions for %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 +msgid "This shortcut is already being used for something else." +msgstr "This shortcut is already being used for something else." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "Window Manager Action Shortcut" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "action" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "Command Shortcut" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "command" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Shortcut" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Press now the keyboard keys you want to use to trigger the %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +msgid "Shortcut:" +msgstr "Shortcut:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "No keys pressed yet, proceed." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "Could not grab the keyboard." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Window operations menu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Up" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Down" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Left" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Right" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancel" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Cycle windows" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Cycle windows (Reverse)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Switch window for same application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Switch application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Close window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximise window horizontally" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximise window vertically" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximise window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Hide window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Move window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Resize window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Shade window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Stick window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Raise window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Lower window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Raise or lower window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fill window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fill window horizontally" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fill window vertically" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Toggle above" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Toggle fullscreen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Move window to upper workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Move window to bottom workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Move window to left workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Move window to right workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Move window to previous workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Move window to next workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Move window to workspace 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Move window to workspace 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Move window to workspace 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Move window to workspace 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Move window to workspace 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Move window to workspace 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Move window to workspace 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Move window to workspace 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Move window to workspace 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Move window to workspace 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Move window to workspace 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Move window to workspace 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Tile window to the top" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Tile window to the bottom" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Tile window to the left" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Tile window to the right" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Show desktop" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Upper workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Bottom workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Left workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Right workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Previous workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Next workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Workspace 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Workspace 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Workspace 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Workspace 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Workspace 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Workspace 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Workspace 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Workspace 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Workspace 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Workspace 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Workspace 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Workspace 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Add workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Add adjacent workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Delete last workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Delete active workspace" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Titled Dialogue" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtitle" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Xfce 4 Widgets" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Version information" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Window Manager" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Handles the placement of windows on the screen." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Program launchers, window buttons, applications menu, workspace switcher and more." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Desktop Manager" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Sets the background colour or image with optional application menu or icons for minimised applications or launchers, devices and folders." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "File Manager " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use and fast." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Session Manager" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restores your session on startup and allows you to shutdown the computer from Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Setting System" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Configuration system to control various aspects of the desktop like appearance, display, keyboard and mouse settings." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Application Finder" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Shows the applications installed on your system in categories, so you can quickly find and launch them." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Settings Daemon" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-based configuration storage system." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce is a collection of programs that together provide a full-featured desktop environment. The following programs are part of the Xfce core:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce is also a development platform providing several libraries, that help programmers create applications that fit in well with the desktop environment." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (http://www.xfce.org) for more information." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Thank you for your interest in Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "The Xfce Development Team" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "If you know of anyone missing from this list; don't hesitate and file a bug on ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Thanks to all who helped making this software available!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different components are copyrighted by their respective authors." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are distributed under the terms of the GNU Library General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed under the terms of the GNU General Public Licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Type '%s --help' for usage information." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Unable to initialise GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "The Xfce development team. All rights reserved." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Please report bugs to <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Translators list from %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Failed to load interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distributed by %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Core developers" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Active contributors" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servers maintained by" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies supervision" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Translations supervision" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Translators" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Previous contributors" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "About Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Information about the Xfce Desktop Environment" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "About the Xfce Desktop Environment" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "About" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Credits" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licence" diff -Nru libxfce4ui-4.8.1/po/en_GB.po libxfce4ui-4.12.1/po/en_GB.po --- libxfce4ui-4.8.1/po/en_GB.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/en_GB.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,173 +1,759 @@ # 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. -# +# +# Translators: +# Noskcaj , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-12-13 18:24+1100\n" -"Last-Translator: Jeff Bailes \n" -"Language-Team: English/GB\n" -"Language: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-07-27 05:37+0000\n" +"Last-Translator: Noskcaj \n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/xfce/language/en_GB/)\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-Poedit-Language: English\n" -"X-Poedit-Country: UNITED KINGDOM\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Failed to open web browser for online documentation" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Do you want to read the %s manual online?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Do you want to read the manual online?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Online Documentation" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "You will be redirected to the documentation website where the help pages are maintained and translated." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Read Online" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Always go directly to the online documentation" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Warning" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Error" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Question" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Session management client ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Disable session management" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Session management options" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Show session management options" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Failed to connect to the session manager: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Session manager did not return a valid client id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "This shortcut is already being used for the action '%s'. Which action do you want to use?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Use '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Keep the other one" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Keep '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"This shortcut is already being used for the command '%s'. Which action do " -"you want to use?" +msgstr "This shortcut is already being used for the command '%s'. Which action do you want to use?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Keep '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "This shortcut is already being used by the action '%s'. Which action do you want to use?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Please use another key combination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Keep the window manager action" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s already triggers this action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Conflicting actions for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "This shortcut is already being used for something else." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Window Manager Action Shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Action:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "action" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Command Shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Command:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "command" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Press now the keyboard keys you want to use to trigger the %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "Shortcut:" +msgstr "No shortcut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "No keys pressed yet, proceed." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "Could not grab the keyboard." +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Window operations menu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Up" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Down" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Left" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Right" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancel" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Cycle windows" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Cycle windows (Reverse)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Switch window for same application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Switch application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Close window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximise window horizontally" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximise window vertically" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximise window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Hide window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Move window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Resize window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Shade window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Stick window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Raise window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Lower window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Raise or lower window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fill window" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fill window horizontally" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fill window vertically" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Toggle above" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Toggle fullscreen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Move window to upper workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Move window to bottom workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Move window to left workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Move window to right workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Move window to previous workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Move window to next workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Move window to workspace 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Move window to workspace 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Move window to workspace 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Move window to workspace 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Move window to workspace 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Move window to workspace 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Move window to workspace 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Move window to workspace 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Move window to workspace 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Move window to workspace 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Move window to workspace 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Move window to workspace 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Tile window to the top" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Tile window to the bottom" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Tile window to the left" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Tile window to the right" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Show desktop" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Upper workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Bottom workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Left workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Right workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Previous workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Next workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Workspace 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Workspace 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Workspace 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Workspace 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Workspace 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Workspace 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Workspace 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Workspace 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Workspace 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Workspace 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Workspace 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Workspace 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Add workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Add adjacent workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Delete last workspace" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Delete active workspace" + #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtitle" +msgid "Titled Dialog" +msgstr "Titled Dialog" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Titled Dialogue" +msgid "Subtitle" +msgstr "Subtitle" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgets" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Version information" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Window Manager" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Handles the placement of windows on the screen." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Program launchers, window buttons, applications menu, workspace switcher and more." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Desktop Manager" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Sets the background colour or image with optional application menu or icons for minimised applications or launchers, devices and folders." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "File Manager " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use and fast." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Session Manager" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restores your session on startup and allows you to shutdown the computer from Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Setting System" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Configuration system to control various aspects of the desktop like appearance, display, keyboard and mouse settings." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Application Finder" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Shows the applications installed on your system in categories, so you can quickly find and launch them." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Settings Daemon" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-based configuration storage system." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce is a collection of programs that together provide a full-featured desktop environment. The following programs are part of the Xfce core:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce is also a development platform providing several libraries, that help programmers create applications that fit in well with the desktop environment." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce components are licensed under free or open source licences; GPL or BSDL for applications and LGPL or BSDL for libraries. Look at the documentation, the source code or the Xfce website (http://www.xfce.org) for more information." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Thank you for your interest in Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "The Xfce Development Team" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "If you know of anyone missing from this list; don't hesitate and file a bug on ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Thanks to all who helped making this software available!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different components are copyrighted by their respective authors." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are distributed under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Type '%s --help' for usage information." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Unable to initialise GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "The Xfce development team. All rights reserved." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Please report bugs to <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Translators list from %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Failed to load interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distributed by %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Core developers" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Active contributors" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servers maintained by" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies supervision" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Translations supervision" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Translators" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Previous contributors" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "About Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Information about the Xfce Desktop Environment" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "About the Xfce Desktop Environment" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "About" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Credits" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licence" diff -Nru libxfce4ui-4.8.1/po/es.po libxfce4ui-4.12.1/po/es.po --- libxfce4ui-4.8.1/po/es.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/es.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,178 +1,782 @@ -# Spanish/ES translation of the libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui's COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Abel Martín , 2008-2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Adolfo Jayme Barrientos, 2014 +# Manolo Díaz , 2015 +# mc , 2013 +# Pablo Roberto Francisco Lezaeta Reyes , 2013-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-12-18 18:54+0100\n" -"Last-Translator: Abel Martín Ruiz \n" -"Language-Team: Spanish/ES \n" -"Language: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-09 01:47+0000\n" +"Last-Translator: Pablo Roberto Francisco Lezaeta Reyes \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/libxfce4ui/language/es/)\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" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "No se pudo abrir el navegador web para la documentación en línea" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "¿Quiere leer el manual en línea de %s?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "¿Quiere leer el manual en línea?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentación en línea" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Será redireccionado al sitio web de la documentación donde las páginas de ayuda son mantenidas y traducidas." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Leer en línea" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Siempre ir directamente a la documentación en línea" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Información" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Atención" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Error" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Pregunta" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID del cliente de gestión de sesión" +msgstr "Identificador del cliente de gestión de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "ID" +msgstr "Id." -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Desactivar la gestión de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opciones del administrador de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Mostrar las opciones del administrador de sesión" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Falló la conexión al gestor de sesión: %s" +msgstr "No se pudo conectar al gestor de sesión: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "El gestor de sesión no devolvió un identificador de cliente válido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"El directorio de trabajo \"%s\" no existe. No se usará al expandir \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Este atajo ya está siendo usado para otra acción del getstor de ventanas. " -"¿Qué acción desea usar?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "La carpeta de trabajo «%s» no existe. Esta no se utilizará para ejecutar «%s»." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Esta combinación ya está siendo usado para la acción. «%s». ¿Qué acción desea usar?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Usar '%s'" +msgstr "Usar «%s»" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Mantener la otra." +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Mantener «%s»" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Este atajo ya está siendo usado para el comando '%s'. ¿Qué acción desea usar?" +msgstr "Esta combinación ya está asignada a la orden «%s». ¿Qué acción quiere usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Mantener '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Este atajo ya está siendo usado por una acción del gestor de ventanas. ¿Qué " -"acción desea usar?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Esta combinación ya está asignada a la acción «%s». ¿Qué acción quiere usar?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Utilice otra combinación de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Mantener la acción del gestor de ventanas" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s ya ejecuta esta acción." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Acciones en conflicto para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Este atajo ya está siendo usado para otra cosa." +msgstr "Esta combinación ya está asignada a otra opción." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Atajo de acción del gestor de ventanas" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Acción:" +msgstr "Combinación de acción del gestor de ventanas" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "Acción" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Atajo de comando" +msgstr "Órdenes de la combinación" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "orden" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Atajo" +msgstr "Combinación" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Cancelar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Presione la/s lecla/s que desea asignar para ejecutar %s «%s»." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Atajo:" +msgstr "Combinación:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "No hay teclas presionadas, proceder." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "No se pudo capturar el teclado." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtítulo" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menú de operaciones de ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Arriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Abajo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Seleccionar ventanas cíclicamente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Seleccionar ventanas cíclicamente (inversamente)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Cambiar la ventana para la misma aplicación" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Cambiar aplicación" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Cerrar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar ventana horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar ventana verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ocultar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mover ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrollar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Pegar ventana a todos los escritorios" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Elevar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Bajar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Elevar o bajar ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Ocupar toda la ventana" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Ocupar la ventana horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Ocupar la ventana verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Mostrar encima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Pantalla completa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mover ventana al área de trabajo superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mover ventana al área de trabajo inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mover ventana al área de trabajo izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mover ventana al área de trabajo derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mover ventana al área de trabajo anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mover ventana al área de trabajo siguiente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mover ventana al área de trabajo 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mover ventana al área de trabajo 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mover ventana al área de trabajo 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mover ventana al área de trabajo 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mover ventana al área de trabajo 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mover ventana al área de trabajo 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mover ventana al área de trabajo 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mover ventana al área de trabajo 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mover ventana al área de trabajo 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mover ventana al área de trabajo 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mover ventana al área de trabajo 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mover ventana al área de trabajo 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Mosaico de ventanas en la parte superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Mosaico de ventanas en la parte inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Mosaico de ventanas en la parte izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Mosaico de ventanas en la parte derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Mosaico de ventana en la parte superior izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Mosaico de ventana en la parte superior derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Mosaico de ventana en la parte inferior izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Mosaico de ventana en la parte inferior derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Mostrar escritorio" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Área de trabajo superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Área de trabajo inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Área de trabajo izquierda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Área de trabajo derecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Área de trabajo anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Área de trabajo siguiente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Área de trabajo 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Área de trabajo 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Área de trabajo 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Área de trabajo 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Área de trabajo 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Área de trabajo 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Área de trabajo 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Área de trabajo 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Área de trabajo 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Área de trabajo 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Área de trabajo 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Área de trabajo 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Añadir área de trabajo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Añadir área de trabajo adyacente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Borrar última área de trabajo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Borrar área de trabajo activa" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Diálogo con título" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtítulo" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Widgets de Xfce 4" +msgstr "Miniaplicaciones de Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Información de versión" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestor de ventanas" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gestiona la posición de las ventanas en la pantalla." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Lanzadores de programas, botones de ventanas, menús de aplicaciones, cambiador de áreas de trabajo y más." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestor de escritorio" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Establece el color de fondo o imagen con menú de aplicación opcional o iconos para aplicaciones minimizadas o lanzadores, dispositivos y carpetas." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Administrador de archivos" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un administrador de archivos para el escritorio Unix o Linux moderno, que aspira a ser fácil y rápido de usar." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Administrador de sesión" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura su sesión al inicio y le permite apagar el computador desde Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Sistema de configuración" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistema de configuración para controlar varios aspectos del escritorio, como la apariencia, pantalla, teclado y ratón." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Buscador de aplicaciones" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Muestra las aplicaciones instaladas en su sistema en categorías, para que pueda encontrarlas y abrirlas rápidamente." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Demonio de configuración" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema de almacenamiento de configuración basado en D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce es una colección de programas que juntos proporcionan un completo entorno de escritorio. Los siguientes programas son parte del núcleo de Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce también es una plataforma de desarrollo proporcionando varias librerías, que ayudan a los programadores a crear aplicaciones que encajen bien con el entorno de escritorio." -#~ msgid "Starting %s" -#~ msgstr "Iniciando %s" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Los componentes de Xfce están licenciados bajo licencias de código abierto o libres; GPL o BSDL para las aplicaciones y LGPL o BSDL para las librerías. Mire la documentación, el código fuente o el sitio web de Xfce (http://www.xfce.org) para más información." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Gracias por su interés en Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "El equipo de desarrollo de Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Si sabe de alguien ausente en esta lista; no dude reportarlo en ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Gracias a todos quienes ayudaron a que este software esté disponible." + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 esta registrado a nombre de Olivier Fourdan (fourdan@xfce.org). Los diferentes componentes están registrados por sus respectivos autores." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Los paquetes libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs y exo son distribuidos bajo los términos de la Licencia Pública General de GNU tal y como es publicada por la Free Software Foundation, tanto la versión 2 de la Licencia o (bajo su decisión) cualquier versión posterior." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Los paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop y xfwm4 son distribuidos bajo los términos de la Licencia Pública General de GNU tal y como es publicada por la Free Software Foundation, tanto la versión 2 de la Licencia o (bajo su decisión) cualquier versión posterior." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Escriba «%s --help» para información de uso." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "No se pudo inicializar GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Por favor, informe de errores a <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Lista de traductores de %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "No se pudo cargar la interfaz" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versión %s, distribuida por %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Versión %s" -#~ msgid "FILE" -#~ msgstr "ARCHIVO" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Desarrolladores principales" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Colaboradores activos" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Servidores mantenidos por" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Supervisión de Goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Supervisión de traducciones" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Traductores" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Colaboradores anteriores" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Acerca de Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Información sobre el Entorno de escritorio Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Acerca del Entorno de escritorio Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Acerca de" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Créditos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Derechos de autor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licencia" diff -Nru libxfce4ui-4.8.1/po/eu.po libxfce4ui-4.12.1/po/eu.po --- libxfce4ui-4.8.1/po/eu.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/eu.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,203 +1,759 @@ -# translation of libxfce4ui.po to Euskara +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Piarres Beobide , 2008, 2009. +# +# Translators: +# Piarres Beobide , 2008-2009,2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-10-21 13:56+0200\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-07-04 08:13+0000\n" "Last-Translator: Piarres Beobide \n" -"Language-Team: Basque \n" -"Language: eu\n" +"Language-Team: Basque (http://www.transifex.com/projects/p/xfce/language/eu/)\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 1.0\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Huts sareko dokumentaziorako nabigatzailea irekitzean" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s manuala saretik irakurri nahi duzu?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Manuala saretik irakurri nahi duzu?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Sareko dokumentazioa" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Laguntza orrialdeak itzultzen eta mantentzen diren dokumentazio webgunera birbidaliko zaizu." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "I_rakurri sarean" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Beti jo_an zuzenean sareko dokumentaziora" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Argibideak" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Abisua" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Errorea" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Galdera" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Saio kudeaketa bezero IDa" +msgstr "Saio kudeatzaile bezero ID-a" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "IDa" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Desgaitu saio kudeaketa" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Saio kudeaketa aukerak" +msgstr "Saio kudeaketa aukerak " -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Ikusi saio-kudeaketa aukerak" +msgstr "Ikusi saio kudeaketa aukeraj" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Huts saio-kudeatzailearekin konektatzerakoan: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Saio kudeatzaileak ez du ID erabilgarri bat erantzun" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "\"%s\" lan direktorioa ez dago. Berau \"%s\" sortzean erabiliko da." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Lasterbide hau dagoeneko leiho-kudeatzailearen beste ekintza batek " -"erabiltzen du. Zein ekintza erabili nahi duzu?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Erabili '%s' " -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Mantendu bestea" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Mantendu '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Lasterbide hau dagoeneko '%s' komandoak erabiltzen du. Zein ekintza erabili " -"nahi duzu?" +msgstr "Lasterbide hau dagoeneko '%s' komandoarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Mantendu '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Lasterbide hau dagoeneko leiho-kudeatzailearen beste ekintza batek " -"erabiltzen du. Zein ekintza erabili nahi duzu?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Lasterbide hau dagoeneko '%s' ekintzarentzat ezarririk dago. Zein ekintza erabiltzea nahi duzu?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Mesedez erabili beste tekla konbinazio bat" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Mantendu leiho-kudeatzaile ekintza" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s-ek dagoeneko ekintza hau abiarazten du." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Gatazka sortzen duten ekintzak %s-rentzat" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Lasterbide hau dagoeneko beste zerbaitek erabiltzen du." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Leiho-kudeatzaile ekintza lasterbidea" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Ekintza:" +msgstr "Leiho kudeatzaile ekintza laster-tekla" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "ekintza" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Komando lasterbidea:" +msgstr "Komando laster-tekla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Komandoa:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "Komandoa" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Lasterbidea" +msgstr "Laster-tekla" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Sakatu orain %s '%s' abiaraztea nahi dituzun teklak." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "Lasterbidea:" +msgstr "Laster-tekla:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Ez duzu teklarik sakatu, egin." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "Ezin da teklatua kapturatu." +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Leiho ekintza menua" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Gora" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Behera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Ezkerra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Eskuina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Utzi" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Leiho ziklikoak" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Leiho ziklikoak (Alderantziz)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Aldatu leihoa aplikazio berarentzat" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Aldatu aplikazioa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Itxi leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Handitu leihoa alboetaraka" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Handitu leihoa goraka" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Handitu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ezkutatu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mugitu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Leiho tamaina aldatu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Bildu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Itsatsi leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Goratu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Atzeratu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Goratu edo beheratu leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Bete leihoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Bete leihoa horizontalean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Bete leihoa bertikalean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Txandakatu gainean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Txandakatu pantaila-osoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mugitu leihoa goiko idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mugitu leihoa beheko idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mugitu leihoa ezkerreko idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mugitu leihoa eskuineko idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mugitu leihoa aurreko idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mugitu leihoa hurrengo idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mugitu leihoa 1 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mugitu leihoa 2 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mugitu leihoa 3 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mugitu leihoa 4 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mugitu leihoa 5 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mugitu leihoa 6 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mugitu leihoa 7 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mugitu leihoa 8 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mugitu leihoa 9 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mugitu leihoa 10 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mugitu leihoa 11 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mugitu leihoa 12 idazmahaiera" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Mosaikoa leihoa goian" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Mosaikoa leihoa behean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Mosaikoa leihoa ezkerrean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Mosaikoa leihoa eskuinean" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Ikusi idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Goiko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Beheko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Ezkerreko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Eskuineko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Aurreko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Hurrengo idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "1 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "2 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "3 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "4 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "5 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "6 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "7 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "8 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "9 Idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "10 Idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "11 idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "12 Idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Gehitu idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Gehitu ondoko idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Ezabatu azken idazmahaia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Ezabatu idazmahai aktiboa" + #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Azpititulua" +msgid "Titled Dialog" +msgstr "Titulu elkarrizketa" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Elkarrizketa-koadroa" +msgid "Subtitle" +msgstr "Azpititulua" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 trepetak" +msgstr "Xfce 4 Widgets" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Bertsio argibideak" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Leiho kudeatzailea" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Pantailan leihoen kokapena kudeatzen du." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panela" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programa abiarazle, leiho botoiak, aplikazio menua, lan-eremu aldatzailea eta gehiago." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Mahaigain kudeatzailea" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Atzealdeko kolore edo irudia ezartzen du aukerako aplikazio menuarekin edo ikonoekin txikituriko aplikazioak edo abiarazleentzat, gailu eta karpetak." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Fitxategi kudeatzailea" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Fitxategi kudeatzaile modernoa Unix/Linux mahaigainerako, erabilerraza eta azkarra izateko egindakoa." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Saio kudeatzailea" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Abioan zure saioa berreskuratzen du eta ordenagailua Xfce-tik itzaltzeko aukera ematen du." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Ezarpen sistema" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Itxura, pantaila, teklatua, sagua bezalako ezarpenak bezalako zenbait atal kudeatzen dituen konfigurazio sistema." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Aplikazio bilatzailea" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Ikusi zure sisteman instalaturiko aplikazioa ataletan, horrela erraz bilatu eta abiarazi ditzazun." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Ezarpena deabrua" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-en oinarritutako konfigurazio biltegiratze sistema" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Fitxategia ez da baliozko .desktop fitxategi bat" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce elkarrekin ezaugarriz osaturiko mahaigain ingurune bat eskaintzen duten programa bilduma bat da. Hurrengo programak dira Xfce muinaren zati:" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Ezagutzen ez den idazmahai '%s' bertsioa" +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce ere zenbait liburutegiz hornitzen duen garapen plataforma bat da, honek garatzaileei mahaigain ingurunearentzat aplikazioak egiten laguntzen die." -#~ msgid "Starting %s" -#~ msgstr "%s hasieratzen" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce osagaiak lizentzia libre edo kode irekikoan zabaltzen dira; GPL edo BSDL aplikazioentzat eta LGPL eta BSDL liburutegientzat. Begiratu dokumentazioa, iturburu kodea edo Xfce webgunean (http://www.xfce.org) argibide gehiagorako." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Milesker Xfce-en interesatzeagatik" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce garapen taldea" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Aplikazioak ez du dokumenturik onartzen komando-lerroan" +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Zerrenda honetan faltan den norbaiten berri baduzu, mesedez esaguzu programa errore baten bidez -en." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Milesker software hau eskuragarri egiten lagundu duten guztiei." -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Abiarazte aukera ezezaguna: %d" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 Olivier Fourdan (fourdan@xfce.org)-en copyright du. Osagai ezberdinek bere egileen copyrighta dute." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Ezin da dokumentuaren URIak 'Type=Link' moduko idazmahai sarrerara " -#~ "bihurtu" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs eta exo paketeak Free Software Foundation-ek kaleratutako GNU liburutegi lizentzia publiko orokorraren terminoetan banatzen dira; edo lizentziaren bigarren bertsioan edo (zure aukeran) edozein beranduagokoan." -#~ msgid "Not a launchable item" -#~ msgstr "Ez da elementu abiarazgarria" +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop eta xfwm4 paketeak Free Software Foundation-ek kaleratutako GNU lizentzia publiko orokorraren terminoetan banatzen dira; edo lizentziaren bigarren bertsioan edo (zure aukeran) edozein beranduagokoan." -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Zehaztu gordetako konfigurazioaren fitxategia" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Idatzi \"%s --help\" erabilerarako." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Ezinda GTK+ abiarazi." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce garapen taldea. Eskubide guztiak erreserbatuta" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Mesedez eman programa-erroreen berri <%s>-n." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Itzultzaile zerrenda %s-tik." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Huts interfazea kargatzean." + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "%s bertsioa, %s-k banatua" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "%s bertsioa" -#~ msgid "FILE" -#~ msgstr "Fitxategia" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Muin garatzaileak" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Laguntzaile aktiboak" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Zerbitzari mantenua: " + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodie gainbegiratzea" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Itzulpen gainbegiratzea" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Piarres Beobide " + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Aurreko idazmahaia" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce-ri buruz" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce mahaigain inguruneari buruzko argibideak" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xvfce mahaigain ingururenari buruz" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Honi buruz" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Kredituak" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lizentzia" diff -Nru libxfce4ui-4.8.1/po/fi.po libxfce4ui-4.12.1/po/fi.po --- libxfce4ui-4.8.1/po/fi.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/fi.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,170 +1,765 @@ -# Finnish translations for libxfce4ui package. -# Copyright (C) 2008 The Xfce Development Team. -# This file is distributed under the same license as the libxfce4ui package. -# Jari Rahkonen , 2008-2010. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jiri Grönroos , 2013 +# Lasse Liehu , 2015 +# Pasi Lallinaho , 2014-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-03-15 14:52+0200\n" -"Last-Translator: Jari Rahkonen \n" -"Language-Team: Finnish\n" -"Language: \n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-25 22:49+0000\n" +"Last-Translator: Pasi Lallinaho \n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/libxfce4ui/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Verkkodokumentaation avaaminen selaimella epäonnistui" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Avataanko ohjelmiston %s käyttöohje verkossa?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Haluatko lukea käyttöohjetta verkossa?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Ohjeet verkossa" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Sinut ohjataan verkkosivuille, joilla ylläpidetään käyttöohjeita ja niiden käännöksiä." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Lue verkossa" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Avaa aina ohjesivut verkosta" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Tietoa" +msgstr "Tietoja" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Varoitus" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Virhe" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Kysymys" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Istunnonhallinta-asiakkaan tunniste" +msgstr "Istunnonhallinnan asiakasohjeman ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "Tunniste" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Älä käytä istunnonhallintaa" +msgstr "Kytke istunnonhallinta pois päältä" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Istunnonhallinnan asetukset" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Näytä istunnonhallinnan asetukset" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Istunnonhallintaan yhdistäminen epäonnistui: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Istunnonhallinta ei palauttanut kelvollista asiakastunnistetta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Työkansiota \"%s\" ei ole olemassa. Sitä ei käytetä, kun prosessi \"%s\" " -"luodaan." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Pikanäppäin on jo liitetty toiseen ikkunamanagerin toimintoon. Kumpaa " -"käytetään?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Työkansiota \"%s\" ei ole olemassa. Sitä ei käytetä, kun prosessi \"%s\" luodaan." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Tätä pikanäppäintä käytetään jo toiminnolle '%s'. Kumpaa toimintoa haluat käyttää?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Valitse \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Säilytä toinen" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Säilytä \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Pikanäppäin on jo liitetty komentoon \"%s\". Kumpaa toimintoa käytetään?" +msgstr "Pikanäppäin on jo liitetty komentoon \"%s\". Kumpaa toimintoa käytetään?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Säilytä \"%s\"" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Pikanäppäin on jo liitetty ikkunamanagerin toimintoon. Kumpaa käytetään?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Toiminto '%s' käyttää jo tätä pikanäppäintä. Kumpaa toimintoa haluat käyttää?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Käytä toista näppäinyhdistelmää." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Säilytä ikkunamanagerin toiminto" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Pikänäppäin %s käynnistää jo tämän toiminnon." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Ristiriita pikanäppäimellä %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Pikanäppäin on jo liitetty toiseen toimintoon." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Ikkunamanagerin pikanäppäin" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Toiminto:" +msgstr "Ikkunointiohjelman toimintopikanäppäin" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "toiminto" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Komennon pikanäppäin" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Komento:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "komento" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Pikanäppäin" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Peruuta" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Paina nyt näppäimiä joilla haluat käynnistää toiminnon %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Pikanäppäin:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Mitään näppäimiä ei ole vielä painettu, jatka." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Näppäimistön kaappaus epäonnistui." +msgstr "Näppäimistöä ei voitu kaapata." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Alaotsake" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Ikkunan toimintovalikko" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Ylös" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Alas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Vasemmalle" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Oikealle" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Peru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Selaa ikkunoita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Selaa ikkunoita (takaperin)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Vaihda saman sovelluksen ikkunaa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Siirry toiseen sovellukseen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Sulje" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Suurenna vaakasuunnassa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Suurenna pystysuunnassa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Suurenna ikkuna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Piilota ikkuna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Siirrä ikkunaa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Muuta kokoa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Varjosta ikkuna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Kiinnitä" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Nosta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Laske" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Nosta tai laske" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Sovita ikkuna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Täytä vaakasuunnassa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Täytä pystysuunnassa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Aina päällimmäisenä" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Kokoruututila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Siirrä ikkuna ylempään työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Siirrä ikkuna alempaan työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Siirrä ikkuna vasempaan työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Siirrä ikkuna oikeaan työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Siirrä ikkuna edelliseen työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Siirrä ikkuna seuraavaan työtilaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Siirrä ikkuna työtilaan 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Siirrä ikkuna työtilaan 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Siirrä ikkuna työtilaan 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Siirrä ikkuna työtilaan 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Siirrä ikkuna työtilaan 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Siirrä ikkuna työtilaan 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Siirrä ikkuna työtilaan 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Siirrä ikkuna työtilaan 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Siirrä ikkuna työtilaan 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Siirrä ikkuna työtilaan 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Siirrä ikkuna työtilaan 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Siirrä ikkuna työtilaan 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Järjestä yläreunaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Järjestä alareunaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Järjestä vasempaan reunaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Järjestä oikeaan reunaan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Näytä työpöytä" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Ylempi työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Alempi työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Vasen työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Oikea työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Edellinen työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Seuraava työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Työtila 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Työtila 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Työtila 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Työtila 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Työtila 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Työtila 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Työtila 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Työtila 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Työtila 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Työtila 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Työtila 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Työtila 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Lisää työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Lisää työtila vierelle" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Poista viimeinen työtila" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Poista nykyinen työtila" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Otsakkeellinen dialogi" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Alaotsikko" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4:n elementit" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versiotiedot" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Ikkunointiohjelma" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Hallitsee ikkunoiden sijoittelua näytöllä." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Paneeli" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Sovelluskäynnistimet, ikkunapainikkeet, sovellusvalikko, työtilanvaihtaja sekä paljon muuta." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Työpöydän hallinta" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Asettaa työpöydän taustakuvan ja näyttää halutessasi sovellusvalikon tai piennettyjen sovellusten, tiedostojen sekä laitteiden kuvakkeet ja käynnistimet." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Tiedostonhallinta" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix- ja Linux-työpöytien nykyaikainen tiedostonhallintaohjelma, tavoitteenaan helppokäyttöisyys ja nopeus." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Istunnonhallinta" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Palauttaa istunnon käynnistäessä ja mahdollistaa järjestelmän sammuttamisen Xfce:stä." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Asetusjärjestelmä" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Asetusjärjestelmä, jolla hallitaan muun muassa työpöydän ulkonäköä, näyttöasetuksia sekä näppäimistön ja hiiren asetuksia." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Sovellusten hakutyökalu" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Näyttää järjestelmäsi sovellukset luokiteltuna, jotta niiden löytäminen ja käynnistäminen on nopeaa." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Asetusdemoni" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-pohjainen asetusten tallennusjärjestelmä." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce on sovelluskokoelma, joka yhdessä muodostaa monipuolisen työpöytäjärjestelmän. Xfce:n ydin koostuu seuraavista ohjelmistoista:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce on myös kehitysalusta ja tarjoaa useita kirjastoja, jotka auttavat kehittäjiä luomaan työpöytäympäristöön hyvin istuvia sovelluksia." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce:n osat on julkaistu vapailla ja avoimen lähdekoodin lisensseillä: GPL tai BSDL sovelluksille ja LGPL tai BSDL kirjastoille. Lisätietoja löydät dokumentaatiosta, lähdekoodista tai Xfce:n kotisivuilta (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Kiitos kiinnostuksestasi Xfce:tä kohtaan." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce:n kehitystiimi" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Jos tiedät jonkun puuttuvan listalta, älä epäröi tehdä vikaraporttia osoitteessa http://bugzilla.xfce.org." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Kiitos kaikille, jotka auttoivat näiden ohjelmistojen kehitystyössä." + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4:n tekijänoikeuden omistaa Olivier Fourdan (fourdan@xfce.org). Sen osien tekijänoikeudet kuuluvat niiden kehittäjille." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Ohjelmistot libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs sekä exo on julkaistu Free Software Foundationin julkaiseman GNU LGPL-lisenssin version 2 tai halutessasi uudemman ehdoilla." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Ohjelmistot thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop sekä xfwm4 on julkaistu Free Software Foundationin julkaiseman GNU GPL-lisenssin version 2 tai halutessasi uudemman ehdoilla." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Kirjoita '%s --help' nähdäksesi käyttöohjeen." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "GTK+:n alustus epäonnistui." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce:n kehitystiimi. Kaikki oikeudet pidätetään." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Ilmoita vioista osoitteessa %s." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Kääntäjät päivämäärällä %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Käyttöliittymän lataus epäonnistui." + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versio %s, jakelu %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versio %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Ydinkehittäjät" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktiiviset kehittäjät" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Palvelinten ylläpito" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Lisäohjelmistojen ohjaus" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Käännösten ohjaus" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Kääntäjät" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Aiemmat kehittäjät" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Tietoja Xfce:stä" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Tietoja Xfce-työpöytäympäristöstä" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Tietoja Xfce-työpöytäympäristöstä" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Tietoja" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Tekijät" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Tekijänoikeus" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lisenssi" diff -Nru libxfce4ui-4.8.1/po/fr.po libxfce4ui-4.12.1/po/fr.po --- libxfce4ui-4.8.1/po/fr.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/fr.po 2015-03-08 12:34:35.000000000 +0000 @@ -1,171 +1,783 @@ -# French translation for the libxfce4ui package. -# Copyright (C) 2008 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Maximilian Schleiss , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# jc1 , 2013 +# jc1 , 2013 +# Maximilian Schleiss , 2008 +# Urien Desterres , 2014-2015 +# Yannick Le Guen , 2014-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2008-10-12 23:17+0100\n" -"Last-Translator: Maximilian Schleiss \n" -"Language-Team: French \n" -"Language: fr\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 09:18+0000\n" +"Last-Translator: Yannick Le Guen \n" +"Language-Team: French (http://www.transifex.com/projects/p/libxfce4ui/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Impossible d'ouvrir le navigateur web pour la documentation en ligne" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Souhaitez-vous consulter le manuel %s en ligne ?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Souhaitez-vous consulter le manuel en ligne ?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentation en ligne" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Vous allez être redirigé vers le site de documentation en ligne où les pages d'aide sont maintenues et traduites." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Lire en ligne" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Toujours aller directement sur la documentation en ligne" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Avertissement" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Erreur" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Question" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID client du gestionnaire de session" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Désactiver la gestion de session" +msgstr "Désactiver le gestionnaire de session" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Options du gestionnaire de session" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Afficher les options du gestionnaires de session" +msgstr "Afficher les options du gestionnaire de session" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Échec de connexion au gestionnaire de session : %s" +msgstr "Impossible de se connecter au gestionnaire de session : %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Le gestionnaire de session n'a pas retourné un id client valable" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Le dossier de travail \"%s\" n'existe pas. Il ne sera pas utilisé à la " -"réouverture de \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Ce raccourci est déjà attribué à une autre action du gestionnaire de " -"fenêtres. Quelle action voulez-vous garder ?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Le répertoire de travail « %s » n’existe pas. Il ne sera pas utilisé à la réouverture de « %s »." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-vous garder ?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Utiliser '%s'" +msgstr "Utiliser « %s »" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Garder l'autre" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Garder « %s »" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Ce raccourci est déjà attribué à la commande '%s'. Quelle action voulez-vous " -"garder ?" +msgstr "Ce raccourci est déjà utilisé pour la commande « %s ». Quelle action voulez-vous garder ?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Garder '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Ce raccourci est déjà attribué à une action du gestionnaire de fenêtres. " -"Quelle action voulez-vous garder ?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Ce raccourci est déjà utilisé pour l’action « %s ». Quelle action voulez-vous garder ?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Veuillez utiliser une autre combinaison de touches." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Garder l'action du gestionnaire de fenêtres" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s déclenche déjà cette action." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Actions en conflit pour %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Ce raccourci est déjà attribué à autre chose." +msgstr "Ce raccourci est déjà utilisé pour autre chose." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Raccourci d'une action du gestionnaire de fenêtres" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Action :" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "l’action" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Raccourci de la commande" +msgstr "Raccourci commande" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Commande :" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "la commande" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Raccourci" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Annuler" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Appuyez à présent sur ​​les touches du clavier que vous voulez utiliser pour déclencher %s « %s »." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Raccourci :" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Aucune touche enfoncée pour le moment, veuillez poursuivre." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Le clavier n'a pas été saisi." +msgstr "Impossible d'accéder au clavier." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu des opérations des fenêtres" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Haut" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Bas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Aligné à gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Aligné à droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Annuler" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Naviguer parmi les fenêtres" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Naviguer parmi les fenêtres (ordre inverse)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Basculer de fenêtre pour la même application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Basculer d'application" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Fermer la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximiser la fenêtre horizontalement" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximiser la fenêtre verticalement" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximiser la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Masquer la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Déplacer la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionner la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrouler la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Coller la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Monter la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Abaisser la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Élever ou abaisser la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Étendre la fenêtre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Étendre la fenêtre horizontalement" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Étendre la fenêtre verticalement" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Basculer au-dessus" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Basculer en plein écran" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail supérieur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail inférieur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail à gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail à droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail précédent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Déplacer la fenêtre vers l'espace de travail suivant" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Déplacer la fenêtre vers l'espace de travail 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Déplacer la fenêtre vers l'espace de travail 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Déplacer la fenêtre vers l'espace de travail 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Déplacer la fenêtre vers l'espace de travail 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Déplacer la fenêtre vers l'espace de travail 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Déplacer la fenêtre vers l'espace de travail 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Déplacer la fenêtre vers l'espace de travail 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Déplacer la fenêtre vers l'espace de travail 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Déplacer la fenêtre vers l'espace de travail 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Déplacer la fenêtre vers l'espace de travail 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Déplacer la fenêtre vers l'espace de travail 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Déplacer la fenêtre vers l'espace de travail 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Agencer la fenêtre en mosaïque vers le haut" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Agencer la fenêtre en mosaïque vers le bas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Agencer la fenêtre en mosaïque vers la gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Agencer la fenêtre en mosaïque vers la droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Agencer la fenêtre en mosaïque en haut à gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Agencer la fenêtre en mosaïque en haut à droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Agencer la fenêtre en mosaïque en bas à gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Agencer la fenêtre en mosaïque en bas à droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Afficher le bureau" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Espace de travail supérieur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Espace de travail inférieur" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Espace de travail à gauche" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Espace de travail à droite" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Espace de travail précédent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Espace de travail suivant" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Espace de travail 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Espace de travail 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Espace de travail 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Espace de travail 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Espace de travail 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Espace de travail 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Espace de travail 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Espace de travail 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Espace de travail 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Espace de travail 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Espace de travail 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Espace de travail 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Ajouter un espace de travail" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Ajouter un espace de travail adjacent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Supprimer le dernier espace de travail" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Supprimer l'espace de travail actif" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Sous-titre" +msgid "Titled Dialog" +msgstr "Dialogue intitulé" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Dialogue titré" +msgid "Subtitle" +msgstr "Sous-titre" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Widgets Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informations sur la version" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestionnaire de fenêtres" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gère le placement des fenêtres sur l'écran." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Tableau de bord" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Lanceurs de programme, boutons des fenêtres, menu des applications, changeur d'espace de travail et plus." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestionnaire du bureau" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Définit la couleur ou l’image d’arrière-plan avec un menu des applications optionnel ou des icônes pour les applications minimisées ou des lanceurs, périphériques et dossiers." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gestionnaire de fichiers " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un gestionnaire de fichier moderne pour le bureau Unix/Linux, se voulant simple d'utilisation et rapide." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gestionnaire de sessions" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaure votre session au démarrage et vous permet d'éteindre l'ordinateur depuis Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Paramètres système" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Système de configuration contrôlant différents aspects du bureau tels que l'apparence, l'écran ou les paramètres du clavier et de la souris." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Liste des applications" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Affiche les applications installées sur votre système par catégories, afin que vous puissiez rapidement les trouver et les lancer." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Démon des paramètres" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Système de stockage de configuration basé sur D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce est un ensemble de programmes qui, ensemble, fournissent un environnement de bureau complet. Les programmes suivants font partie du cœur de Xfce :" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce est également une plateforme de développement fournissant plusieurs bibliothèques qui aident les programmeurs à créer des applications qui s'intègrent parfaitement dans l'environnement de bureau." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Les composants Xfce sont placés sous des licences libres ou open source ; GPL ou BSDL pour les applications et LGPL ou BSDL pour les bibliothèques. Consultez la documentation, le code source ou le site web de Xfce (http://www.xfce.org) pour plus d'informations." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Merci pour l'intérêt porté à Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "L'équipe de développement Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Si vous connaissez quelqu'un d'absent dans cette liste, n'hésitez pas et signalez un bogue sur ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Merci à tous ceux qui ont aidé à rendre ce logiciel disponible !" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Les droits d'auteur de Xfce 4 appartiennent à Olivier Fourdan (fourdan@xfce.org). Les différents composants sont protégés par copyright par leurs auteurs respectifs." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Les paquets libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs et exo sont distribués sous les termes de la GNU Library General Public License telle que publiée par la Free Software Foundation; que ce soit en version 2, ou (à votre guise) toute version ultérieure." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Les paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 sont distribués sous les termes de la GNU General Public License telle que publiée par la Free Software Foundation; que ce soit en version 2, ou (à votre guise) toute version ultérieure." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Taper « %s --help » pour plus d'aide." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Impossible d'initialiser GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "L'équipe de développement Xfce. Tous droits réservés." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Veuillez signaler les bogues à <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Liste des traducteurs en date du %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Impossible de charger l'interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distribuée par %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Développeurs du coeur" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Contributeurs actifs" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Serveurs maintenus par" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Supervision des goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Supervision des traductions" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Traducteurs" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Contributeurs précédents" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "À propos de Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Information à propos de l'environnement de bureau Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "À propos de l’environnement de bureau Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "À propos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Crédits" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licence" diff -Nru libxfce4ui-4.8.1/po/gl.po libxfce4ui-4.12.1/po/gl.po --- libxfce4ui-4.8.1/po/gl.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/gl.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,206 +1,759 @@ -# Galician translation of libxfce4ui -# Copyright (C) 2008, 2009, 2010 Leandro Regueiro -# This file is distributed under the same license as the xfce package. -# -# Leandro Regueiro , 2008, 2009, 2010. -# -# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas -# colaborar connosco, podes atopar máis información en -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Leandro Regueiro , 2008-2010,2013 msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-10-19 18:05+0100\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-11-19 11:04+0000\n" "Last-Translator: Leandro Regueiro \n" -"Language-Team: Galician \n" -"Language: gl\n" +"Language-Team: Galician (http://www.transifex.com/projects/p/xfce/language/gl/)\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" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Produciuse un erro ao abrir o navegador web para consultar a documentación en Internet" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Desexa ler o manual de %s en Internet?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Desexa ler o manual en Internet?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Documentación en Internet" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Redirixiráselle ao sitio web de documentación no que se manteñen e traducen as páxinas de axuda." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "Le_r en Internet" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Ir _sempre directamente á documentación en Internet" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Información " -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Advertencia" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Erro" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Pregunta" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID de cliente da xestión de sesións" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Desactivar a xestión de sesións" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Opcións de xestión de sesións" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Mostrar as opcións de xestión de sesión" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Produciuse un erro ao conectar co xestor de sesións: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "O xestor de sesións non devolveu ningún id de cliente válido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"O directorio de traballo \"%s\" non existe. Non se usará ao iniciar \"%s\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "O directorio de traballo \"%s\" non existe. Non se usará ao iniciar \"%s\"." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" msgstr "" -"Este atallo xa está sendo usado por unha acción doutro xestor de xanelas. " -"Que acción desexa usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Usar '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Manter o outro" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Manter '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Este atallo xa está sendo usado pola orde '%s'. Que acción desexa usar?" +msgstr "Este atallo xa está sendo usado pola orde '%s'. Que acción desexa usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Manter '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -"Este atallo está sendo usado por unha acción do xestor de xanelas. Que " -"acción desexa usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Manter a acción do xestor de xanelas" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Accións en conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Este atallo xa está sendo usado por algo." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Atallo de acción do xestor de xanelas" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Acción:" +msgstr "" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "acción" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Atallo de orde" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Orde:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "orde" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Atallo" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" msgstr "Atallo:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "Non se puido obter o teclado." +msgstr "" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtítulo" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menú de operacións da xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Arriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Dereita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Percorrer as xanelas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Percorrer as xanelas (Ao revés)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Cambiar de xanela do mesmo aplicativo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Cambiar de aplicativo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Pechar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar a xanela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar a xanela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ocultar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mover a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Ensombrecer a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Fixar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Elevar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Baixar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Elevar ou baixar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Ampliar a xanela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Ampliar a xanela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Ampliar a xanela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Manter por enriba" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Activar a pantalla completa" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mover a xanela ao espazo de traballo superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mover a xanela ao espazo de traballo inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mover a xanela ao espazo de traballo da esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mover a xanela ao espazo de traballo da dereita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mover a xanela ao espazo de traballo anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mover a xanela ao seguinte espazo de traballo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mover a xanela ao espazo de traballo 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mover a xanela ao espazo de traballo 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mover a xanela ao espazo de traballo 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mover a xanela ao espazo de traballo 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mover a xanela ao espazo de traballo 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mover a xanela ao espazo de traballo 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mover a xanela ao espazo de traballo 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mover a xanela ao espazo de traballo 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mover a xanela ao espazo de traballo 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mover a xanela ao espazo de traballo 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mover a xanela ao espazo de traballo 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mover a xanela ao espazo de traballo 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Situar a xanela na cima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Situar a xanela no fondo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Situar a xanela cara á esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Situar a xanela cara á dereita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Mostrar o escritorio" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Espazo de traballo superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Espazo de traballo inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Espazo de traballo da esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Espazo de traballo da dereita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Espazo de traballo anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Seguinte espazo de traballo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Espazo de traballo 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Espazo de traballo 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Espazo de traballo 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Espazo de traballo 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Espazo de traballo 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Espazo de traballo 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Espazo de traballo 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Espazo de traballo 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Espazo de traballo 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Espazo de traballo 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Espazo de traballo 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Espazo de traballo 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Engadir un espazo de traballo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Engadir un espazo de traballo adxacente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Eliminar o último espazo de traballo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Eliminar o espazo de traballo activo" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Diálogo con título" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtítulo" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgets" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Información da versión" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Xestor de xanelas" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Xestor de ficheiros" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un xestor de ficheiros moderno para escritorios Unix/Linux, que intenta ser fácil de usar e rápido." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Xestor de sesións" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura a sesión durante o inicio e permítelle apagar o computador desde Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Configuración do sistema" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistema de configuración para controlar diversos aspectos do escritorio como a configuración da aparencia, da visualización, do teclado e do rato." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Buscador de aplicativos" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Mostra os aplicativos instalados no sistema mediante categorías de xeito que se fáciles de atopar e de iniciar." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Daemon de configuración" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema de almacenamento da configuración baseado en D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce é unha colección de programas que xuntos fornecen un ambiente de escritorio con moitas características. Os seguintes programas forman parte do núcleo de Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce tamén é unha plataforma de desenvolvemento que fornece varias bibliotecas que lle axudan aos programadores a crear aplicativos que se integren ben co ambiente de escritorio." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Grazas polo seu interese en Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "O equipo de desenvolvemento de Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Grazas a todos os que axudaron a facer que este software estea dispoñíbel!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 ten copyright de Olivier Fourdan (fourdan@xfce.org). Os diferentes compoñentes de teñen copyright dos seus respectivos autores." -#~ msgid "File is not a valid .desktop file" -#~ msgstr "O ficheiro non é un ficheiro .desktop válido" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Os paquetes libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs e exo distribúense baixo os termos da GNU Library General Public License tal como a publica a Free Software Foundation; xa sexa a versión 2 da Licenza, ou (se o desexa) calquera versión posterior." -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Non se recoñece a versión '%s' do ficheiro .desktop" +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Os paquetes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop e xfwm4 distribúense baixo os termos da GNU General Public License tal como a publica a Free Software Foundation; xa sexa a versión 2 da Licenza, ou (se o desexa) calquera versión posterior." -#~ msgid "Starting %s" -#~ msgstr "Iniciando %s" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "A aplicación non acepta documentos na liña de comandos" +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Non foi posíbel inicializar GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "O equipo de desenvolvemento de Xfce. Todos os dereitos reservados." -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Non se recoñece a opción de inicio: %d" +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Por favor, comunique os fallos a <%s>." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Non se poden pasar URIs de documento a unha entrada de escritorio de " -#~ "'Type=Link'" +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Lista de tradutores de %s." -#~ msgid "Not a launchable item" -#~ msgstr "Non é un elemento executable" +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Produciuse un erro ao cargar a interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versión %s, distribuída por %s" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Especifique o ficheiro que contén a configuración gardada" +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versión %s" -#~ msgid "FILE" -#~ msgstr "FICHEIRO" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Desenvolvedores principais" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Colaboradores activos" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servidores mantidos por" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervisións dos extras" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervisión da tradución" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Tradutores" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Anteriores colaboradores" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Sobre Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Información sobre o ambiente de escritorio Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Sobre o equipo de desenvolvemento de Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Sobre" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Créditos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licenza" diff -Nru libxfce4ui-4.8.1/po/he.po libxfce4ui-4.12.1/po/he.po --- libxfce4ui-4.8.1/po/he.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/he.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,162 +1,782 @@ -# Hebrew translation of the libxfce4ui package. -# This file is distributed under the same license as the libxfce4ui package. -# Hezy Amiel , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# GenghisKhan , 2014 +# GenghisKhan , 2014-2015 +# Hezy Amiel , 2010 +# Yaron Shahrabani , 2014 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: \n" -"Last-Translator: Hezy Amiel \n" -"Language-Team: Hebrew \n" -"Language: he\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 14:09+0000\n" +"Last-Translator: GenghisKhan \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/libxfce4ui/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Hebrew\n" +"Language: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "נכשל לפתוח דפדפן רשת עבור תיעוד מקוון" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "האם ברצונך לקרוא את מדריך %s אונליין?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "האם ברצונך לקרוא את המדריך אונליין?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "תיעוד מקוון" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "המערכת תפנה אותך אל אתר רשת תיעוד היכן שעמודי עזרה הינם מתוחזקים ומתורגמים." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "קרא _אונליין" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_המשך ישירות תמיד אל התיעוד המקוון" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "מידע" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" -msgstr "הזהרה" +msgstr "אזהרה" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "שגיאה" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "שאלה" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "" +msgstr "Session management client ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "זיהוי" +msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "" +msgstr "Disable session management" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "" +msgstr "Session management options" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "" +msgstr "Show session management options" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "" +msgstr "Failed to connect to the session manager: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "" +msgstr "Session manager did not return a valid client id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "קיצור דרך זה כבר מצוי בשימוש עבור הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "" +msgstr "השתמש בקיצור '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "שמור על '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" +msgstr "קיצור דרך זה כבר מצוי בשימוש עבור הפקודה '%s'. באיזו פעולה ברצונך להשתמש?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "קיצור דרך זה כבר מצוי בשימוש על ידי הפעולה '%s'. באיזו פעולה ברצונך להשתמש?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "אנא השתמש בשילוב מקשים אחר." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "‏%s כבר מעוררת את פעולה זו." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "" +msgstr "פקודות מתנגשות עבור %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "" +msgstr "קיצור דרך זה כבר מצוי בשימוש עבור משהו אחר." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "פעולה:" +msgstr "קיצור דרך פעולת מנהל חלונות" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "פעולה" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "קיצור פקודה" +msgstr "קיצור דרך פקודה" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "פקודה:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "פקודה" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "קיצור-דרך" +msgstr "קיצור דרך" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_ביטול" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "לחץ עכשיו על מקשי המקלדת שברצונך להשתמש כדי לעורר את %s '%s'." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "קיצור-דרך:" +msgstr "קיצור דרך:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "לא נלחצו מקשים עדיין, המשך." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "לא ניתן לקרוא את המקלדת" +msgstr "לא היתה אפשרות לתפוס את המקלדת." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "תפריט פעולות חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "מעלה" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "מטה" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "שמאל" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "ימין" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "ביטול" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "נתר בין חלונות" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "נתר בין חלונות (הפוך)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "החלף חלון עבור אותו יישום" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "החלף יישום" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "סגור חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "הגדל חלון אופקית" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "הגדל חלון אנכית" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "הגדל חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "הסתר חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "הזז חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "שנה גודל חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "גלול חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "הדבק חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "הרם חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "הנמך חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "הרם או הנמך חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "מלא חלון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "מלא חלון אופקית" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "מלא חלון אנכית" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "החלף מצב מעל" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "החלף מצב מסך מלא" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "העבר חלון למשטח עבודה עליון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "העבר חלון למשטח עבודה תחתון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "העבר חלון למשטח עבודה שמאלי" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "העבר חלון למשטח עבודה ימני" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "העבר חלון למשטח עבודה קודם" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "העבר חלון למשטח עבודה הבא" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "העבר חלון למשטח עבודה 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "העבר חלון למשטח עבודה 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "העבר חלון למשטח עבודה 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "העבר חלון למשטח עבודה 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "העבר חלון למשטח עבודה 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "העבר חלון למשטח עבודה 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "העבר חלון למשטח עבודה 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "העבר חלון למשטח עבודה 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "העבר חלון למשטח עבודה 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "העבר חלון למשטח עבודה 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "העבר חלון למשטח עבודה 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "העבר חלון למשטח עבודה 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "רצף חלון לשיא" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "רצף חלון לחתית" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "רצף חלון לשמאל" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "רצף חלון לימין" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "רצף חלון לשיא-שמאל" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "רצף חלון לשיא-ימין" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "רצף חלון לתחתית-שמאל" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "רצף חלון לתחתית-ימין" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "הצג שולחן עבודה" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "משטח עבודה עליון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "משטח עבודה תחתון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "משטח עבודה שמאלי" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "משטח עבודה ימני" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "משטח עבודה קודם" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "משטח עבודה הבא" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "משטח עבודה 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "משטח עבודה 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "משטח עבודה 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "משטח עבודה 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "משטח עבודה 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "משטח עבודה 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "משטח עבודה 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "משטח עבודה 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "משטח עבודה 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "משטח עבודה 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "משטח עבודה 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "משטח עבודה 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "הוסף משטח עבודה" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "הוסף משטח עבודה סמוך" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "מחק משטח עבודה אחרון" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "מחק משטח עבודה פעיל" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "כתובית" +msgid "Titled Dialog" +msgstr "דו שיח בעל כותרת" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "דיאלוג עם כותרת" +msgid "Subtitle" +msgstr "כותרת משנה" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "" +msgstr "וידג׳טים Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Version information" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "מנהל חלונות" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "מטפל במיקום של חלונות על המרקע." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "לוח" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "משגרי תוכניות, לחצני חלונות, תפריט אפליקציות, מחליף משטחי עבודה ועוד." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "מנהל שולחן עבודה" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "קובע צבעי רקע או תמונות עם תפריט אפליקציות אופציונלי או סמלים עבור אפליקציות ממוזערות או משגרים, התקנים ותיקיות." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "סייר קבצים" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "מנהל קבצים מודרני עבור שולחן עבודה Unix/Linux, אשר שואף להיות קל לשימוש ומהיר." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "מנהל הפעלה" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "משחזר את ההפעלה שלך בעת הפעלה ומתיר לך לכבות את המחשב מתוך Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "מערכת הגדרות" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "מערכת תצורה לבקרה על היבטים שונים של שולחן עבודה כגון הגדרות מראה, תצוגה, מקלדת ועכבר." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "מחפש אפליקציות" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "מציג את האפליקציות המותקנות במערכת בתוך קטגוריות, כך שתוכלו לשגר אותן בזריזות." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "שדון הגדרות" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "מערכת אחסון תצורה מבוססת D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "‏Xfce הינו אוסף של תוכניות אשר יחדיו מספקות סביבת שולחן עבודה עשירה ורב תכליתית. התוכניות הבאות הן חלק של ליבת Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "‏Xfce מהווה גם סביבת פיתוח שמספקת מספר ספריות, אשר מסייעות למתכנתים ליצור אפליקציות אשר יותאמו היטב עם סביבת שולחן עבודה זו." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "רכיבי Xfce הינם רשויים תחת רשיונות חופשיים או קוד פתוח; GPL או BSDL עבור יישומים (applications) ורשיונות LGPL או BSDL עבור ספריות (libraries). ראו את התיעוד, הקוד מקור או אתר רשת Xfce‏ (http://www.xfce.org) לשם מידע נוסף." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "תודה לכם על התעניינותכם בפרויקט Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "צוות הפיתוח של Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "אם אתם יודעים על מישהו אשר חסר מן רשימה זו; אל תהססו ומלאו באג באתר ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "תודה לכל מי אשר סייע להפוך את תכנה זו לזמינה!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "‏Xfce 4 הינו מוגן בזכויות יוצרים לטובת Olivier Fourdan ‏(fourdan@xfce.org). הרכיבים השונים מוגנים בזכויות יוצרים לטובת המחברים שלהם בהתאמה." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "החבילות libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs וגם exo הינן מופצות תחת התנאים של הרשיון GNU Library General Public License כפי שזה פורסם ע״י Free Software Foundation; בין אם בגרסה 2 של הרשיון, או (כאופציה השמורה לכם) בכל גרסה מאוחרת יותר." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "החבילות thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop וגם xfwm4 הינן מופצות תחת התנאים של הרשיון GNU General Public License כפי שזה פורסם ע״י Free Software Foundation; בין אם בגרסה 2 של הרשיון, או (כאופצייה השמורה לכם) בכל גרסה מאוחרת יותר." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Type '%s --help' for usage information." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Unable to initialize GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "The Xfce development team. All rights reserved." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Please report bugs to <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Translators list from %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Failed to load interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "גרסה %s, מופצת על ידי %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "גרסה %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "‎מפתחי ליבה" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "‎תורמים פעילים" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "‎שרתים מתוחזקים ע״י" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Goodies פיקוח" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "‎פיקוח תרגומים" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "‎מתרגמים" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "‎תורמים קודמים" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "אודות Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "מידע אודות סביבת שולחן עבודה Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "אודות סביבת שולחן עבודה Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "אודות" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "תודות" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "זכויות יוצרים" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "רשיון" diff -Nru libxfce4ui-4.8.1/po/hr.po libxfce4ui-4.12.1/po/hr.po --- libxfce4ui-4.8.1/po/hr.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/hr.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,166 +1,781 @@ # 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. -# +# +# Translators: +# Edin Veskovic , 2015 +# Edin Veskovic , 2014 +# Ivica Kolić , 2013-2015 msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-03-26 12:16+0100\n" -"Last-Translator: Petar Koretić \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 12:22+0000\n" +"Last-Translator: Edin Veskovic \n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/libxfce4ui/language/hr/)\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" +"Language: hr\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" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Neuspjelo otvaranje web preglednika za dokumentaciju na mreži" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Želite li čitati %s priručnik na mreži?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Želite li čitati priručnik na mreži?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentacija na mreži" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Biti ćete preusmjereni na web stranicu dokumentacije gdje se stranice pomoći održavaju i prevode." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Čitaj na mreži" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Uvijek idi direktno na dokumentaciju na mreži" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Informacije" +msgstr "Informacija " -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Upozorenje" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" -msgstr "Grešla" +msgstr "Greška" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Pitanje" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID klijenta upravitelja sesijom" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Onemogući upravljanje sesijom" +msgstr "Onemogućite upravljanje sesijom" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Opcije upravitelja sesijom" +msgstr "Opcije upravljanja sesijom" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Prikaži opcije upravitelja sesijom" +msgstr "Pokaži opcije upravljanja sesijam" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Nije uspjelo spajanje na upravitelja sesijom: % s" +msgstr "Nije uspjelo spajanje na upravitelja sesijom: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Upravitelj sesijom nije vratio valjan id klijenta." +msgstr "Upravitelj sesijom nije vratio valjan id klijenta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Radna mapa \\ \"% s \" ne postoji. Neće se koristiti prilikom gnježđenja \\ " -"\"% s \"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "Ova kratica je već u upotrebi. Koju radnju želite koristiti?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Radna mapa \"%s\" ne postoji. Neće se koristiti prilikom gnježđenja \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Koristi '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Zadrži onu drugu" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Zadrži '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" +msgstr "Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Zadrži '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "Ova kratica je već u upotrebi. Koju naredbu želite koristiti?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Ova radnja je već u upotrebi kod naredbe '%s'. Koju radnju želite koristiti?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Molim koristite drugu kmbinaciju tipki." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Zadržite naredbu upravitelja prozorom" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s već pokreće ovu radnju." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Radnje u konfliktu za %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Ova kratica je već u upotrebi" +msgstr "Ovaj prečac je već u upotrebi za nešto drugo." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Kratica radnje za upravitelja prozorom" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Radnja:" +msgstr "Prečac radnje upravitelja prozora" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "radnja" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Kratica za naredbu" +msgstr "Prečac naredbe" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Naredba:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "naredba" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Kratica" +msgstr "Prečac" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Otkaži" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Sada pritisnite tipke tipkovnice koje želite koristiti za pokretanje %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Kratica:" +msgstr "Prečac:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nijedne tipke još nisu pritisnute, nastavite." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Ne mogu se spojiti na tipkovnicu" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Podnapis" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Izbornik operacija prozora" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Gore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Dolje" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Lijevo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Otkaži" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Izmjenjuj prozore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Izmjenjuj prozore (obrnutim redom)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Promijeni prozor za isti program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Promijeni program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zatvori prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimiziraj prozor vodoravno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimiziraj prozor okomito" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimiziraj prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Sakrij prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Pomakni prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Promijeni veličinu prozora" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Osjenči prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Lijepi prozore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Podigni prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Spusti prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Podigni ili spusti prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Ispuni prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Ispuni prozor vodoravno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Ispuni prozor okomito" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Postavi prozor iznad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Postavi puni prozor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Pomakni prozor u gornji radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Pomakni prozor u donji radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Pomakni prozor u lijevi radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Pomakni prozor u desni radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Pomakni prozor u prethodni radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Pomakni prozor u slijedeći radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Pomakni prozor u radni prostor 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Pomakni prozor u radni prostor 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Pomakni prozor u radni prostor 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Pomakni prozor u radni prostor 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Pomakni prozor u radni prostor 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Pomakni prozor u radni prostor 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Pomakni prozor u radni prostor 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Pomakni prozor u radni prostor 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Pomakni prozor u radni prostor 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Pomakni prozor u radni prostor 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Pomakni prozor u radni prostor 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Pomakni prozor u radni prostor 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Pomakni prozor gore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Pomakni prozor dolje" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Pomakni prozor lijevo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Pomakni prozor desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Pomakni prozor gore-lijevo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Pomakni prozor gore-desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Pomakni prozor dole-lijevo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Pomakni prozor dole-desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Pokaži radnu površinu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Gornji radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Donji radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Lijevi radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Desni radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Prethodni radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Slijedeći radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Radni prostor 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Radni prostor 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Radni prostor 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Radni prostor 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Radni prostor 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Radni prostor 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Radni prostor 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Radni prostor 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Radni prostor 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Radni prostor 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Radni prostor 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Radni prostor 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Dodaj radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Dodaj susjedni radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Obriši zadnji radni prostor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Obriši aktivni radni prostor" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Dialog sa nazivom" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Podnapis" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widgeti" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informacija o verziji" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Upravitelj prozora" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Upravlja postavljanjem prozora na zaslonu." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Ploča" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Pokretači programa, dugmad prozora, izbornici programa, izmjenjivač radnih prostora i ostalo." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Upravitelj radne površine" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Postavla pozadinsku boju ili sliku s opcionalnim izbornikom aplikacija ili ikone za minimizirane aplikacije ili pokretače, uređaje i mape." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Upravitelj datoteka" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Moderni upravitelj datoteka za Unix/Linux radnu površinu, s clijem da bude brz i lagan za korištenje." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Upravitelj sesijom" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Vraća sesiju pri pokretanju i omogućava gašenje računala iz Xfcea." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Postavljanje sustava" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sustav konfiguracije za upravljanje raznim aspektima radne površine kao što su postavke izgleda, zaslona, tipkovnice i miša." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Nalaznik programa" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Prikazuje programe koje su instalirani na vašem sustavu u kategorijama, tako da ih možete brzo pronaći i pokrenuti." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Nadzornik postavka" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sustav za pohranu podešavanja zasnovan na D-Busu" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce je skup programa koji zajedno pružaju potpuno opremljeno radno okruženje. Sljedeći programi su dio Xfce jezgre:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce je također razvojna platforma koja pruža nekoliko knjižnica, koje pomažu programerima da stvaraju prgrame koje se dobro uklapaju u radno okruženje." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce komponente su licencirane pod slobodnim ili licencama otvorenoga koda; GPL ili BSDL za programe i LGPL ili BSDL za knjižnice. Pogledajte dokumentaciju, izvorni kod ili Xfce web (http://www.xfce.org) za više informacija." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Hvala na Vašem interesu za Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce razvojni tim" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Ako znate tko nedostaje sa ovoga popisa, ne oklijevajte i prijavite bug na ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Hvala svima koji su pomogli učiniti ovaj software dostupnim!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 autorsko pravo Olivier Fourdan (fourdan@xfce.org). Različiti dijelovi su autorska prava njihovih poštovanih autora." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs i exo paketi distribuiraju se pod uvjetima GNU Library General Public licence objavljene od strane Free Software Foundation; verzija 2 licence ili (po vašem izboru) neka od kasnijih verzija." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop i xfwm4 paketi distribuiraju se pod uvjetima GNU Library General Public licence objavljene od strane Free Software Foundation; verzija 2 licence ili (po vašem izboru) neka od kasnijih verzija." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Upiši '%s --help za informaciju o uporabi." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Nije moguće pokrenuti GTK +." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce razvojni tim. Sva prava pridržana." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Molimo prijavite bugove na <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Lista prevoditelja sa %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Nije uspjelo učitavanje sučelja" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Verzija %s, distribuira %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Verzija %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Temeljni razvijatelji" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Aktivni doprinositelji" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Poslužitelje održava" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Nadzor goodies dodataka" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Nadzor prijevoda" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Prevoditelji" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Prethodni doprinositelji" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "O Xfce-u" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informacije o Xfce radnom okruženju" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "O Xfce radnom okruženju" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "O programu" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Zahvale" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Autorska prava" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licenca" diff -Nru libxfce4ui-4.8.1/po/hu.po libxfce4ui-4.12.1/po/hu.po --- libxfce4ui-4.8.1/po/hu.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/hu.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,204 +1,760 @@ -# Hungarian translation of libxfce4ui -# Copyright 2009. Free Software Foundation, Inc. -# This file is distributed under the same license as the libxfce4ui package. -# -# Gabor Kelemen , 2009. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Gabor Kelemen , 2009,2011-2012 +# Sándor Zelenák , 2011 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-07-17 15:02+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" -"Language: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-07-09 22:22+0000\n" +"Last-Translator: kelemeng \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "A webböngésző megnyitása nem sikerült az online dokumentációhoz" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Szeretné elolvasni a(z) %s kézikönyvét online?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Szeretné elolvasni a kézikönyvet online?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Online dokumentáció" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Átirányításra kerül a dokumentációs weboldalra, ahol a súgóoldalak karbantartása és fordítása történik." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Online olvasás" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Közvetlenül az online _dokumentáció megnyitása mindig" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Információ" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Figyelmeztetés" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Hiba" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Kérdés" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Munkamenet-kezelési kliens azonosítója" +msgstr "Munkamenet-kezelés kliens ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "Azonosító" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "A munkamenet-kezelés letiltása" +msgstr "Munkamenet-kezelés letiltása" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Munkamenet-kezelés kapcsolói" +msgstr "Munkamenet-kezelés beállítások" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Munkamenet-kezelési kapcsolók megjelenítése" +msgstr "Munkamenet-kezelés beállításainak megjelenítése" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "A munkamenet-kezelőhöz való csatlakozás meghiúsult: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "A munkamenet-kezelő nem adott vissza érvényes kliensazonosítót" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"A munkakönyvtár („%s”) nem létezik. Nem kerül felhasználásra „%s” " -"indításakor." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Ezt a gyorsbillentyűt már használja egy másik ablakkezelő-művelet. Melyik " -"műveletet akarja használni?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "A munkakönyvtár („%s”) nem létezik. Nem kerül felhasználásra „%s” indításakor." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "„%s” használata" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "A másik megtartása" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "„%s” megtartása" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik " -"műveletet akarja használni?" +msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "„%s” megtartása" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Ezt a gyorsbillentyűt már használja egy ablakkezelő-művelet. Melyik " -"műveletet akarja használni?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Ezt a gyorsbillentyűt már használja egy másik parancs („%s”). Melyik műveletet akarja használni?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Kérem használjon más billentyűkombinációt!" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Az ablakkezelő-művelet megtartása" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s már előidézi ezt a műveletet." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Ütköző műveletek ehhez: %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Ez a gyorsbillentyű már használatban van valami másra." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Ablakkezelő-művelet gyorsbillentyűje" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Művelet:" +msgstr "Ablakkezelő-művelet gyorsbillentyű" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "műveletet" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Parancs gyorsbillentyűje" +msgstr "Parancs gyorsbillentyű" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Parancs:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "parancsot" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Gyorsbillentyű" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Most nyomja meg azt a kombinációt, amellyel el kívánja indítani a(z) „%2$s” %1$s." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" msgstr "Gyorsbillentyű:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Még nem történt billentyűlenyomás." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "A billentyűzet nem ragadható meg." +msgstr "A billentyűzet használata sikertelen." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Felirat" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Ablakműveletek menü" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Fel" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Le" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Balra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Jobbra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Mégse" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Ablakok közti lépkedés" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Ablakok közti lépkedés (fordítva)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Ugyanazon alkalmazás ablakára váltás " + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Alkalmazásváltás" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Ablak bezárása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Ablak vízszintes maximalizálása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Ablak függőleges maximalizálása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Ablak maximalizálása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ablak elrejtése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Ablak áthelyezése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Ablak átméretezése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Ablak felgördítése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Ablak mindig látható" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Ablak előtérbe hozása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Ablak háttérbe küldése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Ablak előtérbe vagy háttérbe" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Ablak kitöltése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Ablak kitöltése vízszintesen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Ablak kitöltése függőlegesen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Más ablakok elé átváltása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Teljes képernyő átváltása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Ablak áthelyezése a felső munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Ablak áthelyezése az alsó munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Ablak áthelyezése a bal munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Ablak áthelyezése a jobb munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Ablak áthelyezése az előző munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Ablak áthelyezése a következő munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Ablak áthelyezése az 1. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Ablak áthelyezése a 2. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Ablak áthelyezése a 3. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Ablak áthelyezése a 4. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Ablak áthelyezése az 5. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Ablak áthelyezése a 6. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Ablak áthelyezése a 7. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Ablak áthelyezése a 8. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Ablak áthelyezése a 9. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Ablak áthelyezése a 10. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Ablak áthelyezése a 11. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Ablak áthelyezése a 12. munkaterületre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Ablak igazítása felülre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Ablak igazítása alulra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Ablak igazítása balra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Ablak igazítása jobbra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Asztal megjelenítése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Felső munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Alsó munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Bal munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Jobb munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Előző munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Következő munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "1. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "2. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "3. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "4. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "5. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "6. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "7. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "8. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "9. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "10. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "11. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "12. munkaterület" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Munkaterület hozzáadása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Szomszédos munkaterület hozzáadása" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Utolsó munkaterület törlése" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Aktív munkaterület törlése" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Címzett ablak" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Felirat" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 felületi elemek" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Verzióinformációk" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Ablakkezelő" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Az ablakok elhelyezésének kezelése a képernyőn." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "A fájl nem egy érvényes .desktop fájl" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Parancsikonok, ablakgombok, alkalmazások menü, munkaterület-váltó stb." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Asztalkezelő" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Ismeretlen .desktop fájl verzió: „%s”" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Beállítja a háttérszínt vagy -képet egy elhagyható alkalmazásmenüvel vagy minimalizált alkalmazások, parancsikonok, eszközök és mappák ikonjaival." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Fájlkezelő" -#~ msgid "Starting %s" -#~ msgstr "%s indítása" +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Modern, egyszerűen használható és gyors fájlkezelő Unix/Linux asztali környezethez." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Munkamenet-kezelő" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Az alkalmazás nem fogad el dokumentumokat a parancssorban" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Munkamenet visszaállítása induláskor és a számítógép kikapcsolásának lehetősége Xfce környezetből." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Rendszer beállítása" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Ismeretlen indítási kapcsoló: %d" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Beállítórendszer az asztali környezet tulajdonságainak kezelésére, többek között: megjelenési, kijelző-, billentyűzet- és egérbeállítások." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Alkalmazáskereső" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Nem adhatók dokumentum-URI címek egy „Type=Link” asztali bejegyzésnek" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Telepített alkalmazások kategóriák szerinti megjelenítése a gyors keresés és futtatás érdekében." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Beállításkezelő" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus alapú konfigurációtároló rendszer." -#~ msgid "Not a launchable item" -#~ msgstr "Nem futtatható elem" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Az Xfce teljes felszereltségű asztali környezetet biztosító alkalmazások gyűjteménye. Az Xfce alaprendszert a következő programok alkotják:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Az Xfce egyben fejlesztői platform is, amely számos programkönyvtárat bocsát a programozók rendelkezésére, ezekkel segítve őket az asztali környezetbe illeszkedő alkalmazások írásában." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Az Xfce összetevői szabad és nyílt forrású licencek alatt érhetők el; ezek a GPL vagy BSDL az alkalmazások és az LGPL vagy BSDL a programkönyvtárak esetén. További információkért lásd a dokumentációt, a forráskódot vagy az Xfce weboldalát (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Köszönjük az Xfce iránti érdeklődését." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Az Xfce fejlesztői csapata" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "A mentett beállításokat tartalmazó fájl megadása" +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Ha ismer valakit, aki nincs felsorolva, ne habozzon, küldjön be egy hibajelentést a címen." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Köszönet mindazoknak, akik segítségével ez az alkalmazás elérhetővé vált." + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Az Xfce szerzői joga Olivier Fourdant (fourdan@xfce.org) illeti. A további összetevők szerzői joga azok szerzőit illeti." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "A libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs és exo csomagok a Free Software Foundation által kiadott GNU Library General Public License második (vagy bármely későbbi) változatában foglaltak alapján kerülnek terjesztésre." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "A thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop és xfwm4 csomagok a Free Software Foundation által kiadott GNU General Public License második (vagy bármely későbbi) változatában foglaltak alapján kerülnek terjesztésre." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Segítségért adja ki a „%s --help” parancsot." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "A GTK+ előkészítése sikertelen." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Az Xfce fejlesztői csapata. Minden jog fenntartva." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "A programhibák itt jelenthetők be: %s" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Fordítók listája ekkor: %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "A felület betöltése sikertelen" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "%s verzió, terjesztő: %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Verzió %s" -#~ msgid "FILE" -#~ msgstr "FÁJL" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Fő fejlesztők" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktív közreműködők" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "A kiszolgálóinkat karbantartják:" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "A Goodies csomag felügyelete" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Fordítások felügyelet" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Fordítók" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Előző munkatársak" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Az Xfce névjegye" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Információk az Xfce asztali környezetről" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Az Xfce asztali környezet névjegye" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Névjegy" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Köszönet" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licenc" diff -Nru libxfce4ui-4.8.1/po/id.po libxfce4ui-4.12.1/po/id.po --- libxfce4ui-4.8.1/po/id.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/id.po 2015-03-08 12:34:35.000000000 +0000 @@ -1,202 +1,764 @@ -# Indonesian translations for libxfce package. -# Copyright (C) 2008 THE libxfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce package. -# Andhika Padmawan , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Andhika Padmawan , 2009 +# Ardjuna , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce 4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-08-25 21:25+0700\n" -"Last-Translator: Andhika Padmawan \n" -"Language-Team: Indonesian \n" -"Language: id\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-03-05 10:18+0000\n" +"Last-Translator: Ardjuna \n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/libxfce4ui/language/id/)\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" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Gagal membuka peramban web untuk dokumentasi daring" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Anda ingin membaca manual %s secara daring?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Anda ingin membaca manual secara daring?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentasi Daring" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Anda akan diarahkan ke situs web dokumentasi yang memuat halaman bantuan." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Baca secara Daring" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Selalu pergi ke dokumentasi daring" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informasi" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Peringatan" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Galat" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Pertanyaan" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID Klien manajemen sesi" +msgstr "Identitas pengguna manajemen sesi" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Nonaktifkan manajemen sesi" +msgstr "Non-aktifkan manajemen sesi" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opsi manajemen sesi" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Tampilkan opsi manajemen sesi" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Gagal menyambung ke manajer sesi: %s" +msgstr "Gagal mengoneksi ke manajer sesi: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Manajer sesi tidak mengembalikan id klien yang sah" +msgstr "Manajer sesi tidak mengembalikan identitas klien yang sah" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Direktori kerja \"%s\" tidak ada. Direktori tidak akan digunakan ketika " -"memijahkan \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Jalan pintas ini telah digunakan untuk aksi manajer jendela lain. Aksi mana " -"yang ingin anda gunakan?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Direktori kerja \"%s\" tidak ada. Direktori tidak akan digunakan ketika memijahkan \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Pintasan ini telah digunakan untuk '%s'. Aksi mana yang ingin anda gunakan?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Gunakan '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Simpan yang lain" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Simpan '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Jalan pintas ini telah digunakan untuk perintah '%s'. Aksi mana yang ingin " -"anda gunakan?" +msgstr "Pintasan ini telah digunakan oleh'%s'. Aksi mana yang ingin anda gunakan?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Simpan '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Jalan pintas ini telah digunakan oleh sebuah aksi manajer jendela. Aksi mana " -"yang ingin anda gunakan?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Pintasan ini telah digunakan oleh '%s'. Aksi mana yang ingin anda gunakan?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Mohon gunakan kombinasi tombol lain." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Simpan aksi manajer jendela" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s telah digunakan untuk menjalankan aksi ini." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Aksi konflik untuk %s" +msgstr "Terdapat konflik pintasan untuk aksi %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Jalan pintas ini telah digunakan untuk hal yang lain." +msgstr "Pintasan ini telah digunakan untuk aksi yang lain." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Jalan Pintas Aksi Manajer Jendela" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Aksi:" +msgstr "Tombol Pintasan Manajer Jendela" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "aksi" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Jalan Pintas Perintah" +msgstr "Perintah Tombol Pintasan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Perintah:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "perintah" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Jalan Pintas" +msgstr "Pintasan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Batal" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Tekanlah tombol papan kunci yang diinginkan untuk %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Jalan Pintas:" +msgstr "Tombol pintasan:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Belum ada tombol yang ditekan." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Tak dapat menangkap papan ketik." +msgstr "Tidak mendapat masukan dari papan ketik." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subjudul" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu operasi jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Batal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Daur jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Daur jendela (Mundur)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Pindah jendela untuk aplikasi yang sama" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Pindah aplikasi" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Tutup jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimalkan jendela secara horisontal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimalkan jendela secara vertikal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimalkan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Sembunyikan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Pindah posisi jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Ubah ukuran jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Gulung jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Lekatkan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Naikkan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Turunkan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Naikkan atau turunkan jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Isi jendela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Isi jendela secara horisontal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Isi jendela secara vertikal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Ubah atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Ubah layar penuh" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Pindah jendela ke ruang kerja sebelah atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Pindah jendela ke ruang kerja sebelah bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Pindah jendela ke ruang kerja sebelah kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Pindah jendela ke ruang kerja sebelah kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Pindah jendela ke ruang kerja sebelumnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Pindah jendela ke ruang kerja selanjutnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Pindah jendela ke ruang kerja 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Pindah jendela ke ruang kerja 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Pindah jendela ke ruang kerja 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Pindah jendela ke ruang kerja 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Pindah jendela ke ruang kerja 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Pindah jendela ke ruang kerja 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Pindah jendela ke ruang kerja 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Pindah jendela ke ruang kerja 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Pindah jendela ke ruang kerja 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Pindah jendela ke ruang kerja 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Pindah jendela ke ruang kerja 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Pindah jendela ke ruang kerja 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Tempatkan jendela di atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Tempatkan jendela ke bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Tempatkan jendela di kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Tempatkan jendela ke kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Tampilkan destop" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Bagian atas ruang kerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Bagian bawah ruang kerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Bagian kiri ruang kerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Bagian kanan ruang kerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Ruang kerja sebelumnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Ruang kerja selanjutnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Ruang kerja 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Ruang kerja 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Ruang kerja 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Ruang kerja 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Ruang kerja 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Ruang kerja 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Ruang kerja 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Ruang kerja 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Ruang kerja 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Ruang kerja 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Ruang kerja 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Ruang kerja 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Tambah ruang kerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Tambah ruang kerja berdampingan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Hapus ruang kerja terakhir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Hapus ruang kerja aktif" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Dialog Berjudul" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subjudul" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Widget Xfce 4" +msgstr "Peralatan Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informasi versi" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Manajer Jendela" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Menangani penempatan jendela di layar." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Peluncur program, tombol jendela, menu aplikasi, pengganti ruang kerja dan lainnya." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Manajer Destop" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Atur warna atau gambar latar belakang dengan menu aplikasi atau ikon tambahan untuk aplikasi atau peluncur, divais dan folder yang diminimalkan." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Manajer Berkas" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Manajer berkas modern untuk destop Unix/Linux yang cepat dan mudah digunakan." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Manajer Sesi" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Mengembalikan sesi yang tersimpan saat komputer dihidupkan dan memungkinkan anda untuk mematikan komputer dari Xfce" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Sistem Pengaturan" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistem konfigurasi untuk mengontrol beragam aspek dari desktop seperti pengaturan latar, tampilan, papan ketik dan tetikus." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Pencari Aplikasi" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Tampilkan aplikasi yang terinstal di sistem anda dalam kategori, sehingga anda dapat mencarinya dan menjalankannya dengan cepat." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Daemon Pengaturan" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistem penyimpanan konfigurasi berbasis D-Bus" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce adalah koleksi program yang secara bersama-sama menyediakan lingkungan desktop yang kaya fitur. Program berikut adalah bagian dari inti Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce juga merupakan platform pengembangan yang menyediakan beberapa pustaka, yang membantu pemrogram membuat aplikasi yang sesuai dengan lingkungan destop." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponen Xfce dilisensikan di bawah lisensi bebas atau sumber terbuka; GPL atau BSDL untuk aplikasi dan LGPL atau BSDL untuk pustaka. Lihat dokumentasi, kode program atau situs web Xfce (http://www.xfce.org) untuk informasi lebih lanjut." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Terima kasih atas minat anda pada Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Tim Pengembang Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Jika anda mengetahui personel yang tidak terdaftar di sini, silahkan laporkan di ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Terima kasih pada semua pihak yang terlibat sehingga peranti lunak ini tersedia." -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Berkas bukan sebuah berkas .desktop yang valid" +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 adalah hak cipta Olivier Fourdan (fourdan@xfce.org). Komponen berbeda merupakan hak cipta masing-masing pembuatnya." -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Berkas desktop versi '%s' tak dikenal" +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Paket libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs dan exo didistribusikan di bawah lisensi GNU Library General Public License yang dipublikasikan oleh Free Software Foundation; baik versi 2 dari lisensi, atau (sesuai pilihan anda) versi manapun setelahnya." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Paket thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop dan xfwm4 didistribusikan di bawah lisensi GNU General Public License yang dipublikasikan oleh Free Software Foundation; baik versi 2 dari lisensi, atau (sesuai pilihan anda) versi manapun setelahnya." -#~ msgid "Starting %s" -#~ msgstr "Memulai %s" +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Ketik '%s --help' untuk informasi penggunaan." -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Aplikasi tidak menerima dokumen di baris perintah" +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Tak dapat menginisialisasi GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Tim pengembang Xfce. Hak cipta dilindungi undang-undang." -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Opsi jalankan tak dikenal: %d" +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Silakan laporkan awakutu ke <%s>." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Tak dapat meneruskan URI dokumen ke sebuah lema desktop 'Tipe=Tautan'" +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Para penerjemah dari %s." -#~ msgid "Not a launchable item" -#~ msgstr "Bukan sebuah item yang dapat dijalankan" +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Gagal memuat antar muka" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versi %s, didistribusikan oleh %s" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Tentukan berkas yang berisi konfigurasi tersimpan" +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versi %s" -#~ msgid "FILE" -#~ msgstr "BERKAS" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Pengembang inti" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Kontributor aktif" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Server dikelola oleh" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Pengawas goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Pengawas terjemahan" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Penerjemah" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Kontributor terdahulu" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Tentang Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informasi tentang Lingkungan Desktop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Tentang Lingkungan Destop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Info Aplikasi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Kredit" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Hak Cipta" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lisensi" diff -Nru libxfce4ui-4.8.1/po/is.po libxfce4ui-4.12.1/po/is.po --- libxfce4ui-4.8.1/po/is.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/is.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,168 +1,760 @@ -# translation of libxfce4ui.xfce-4-8.is.po to Icelandic +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Sveinn í Felli , 2010, 2011. +# +# Translators: +# Sveinn í Felli , 2010-2013 +# Sveinn í Felli , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui.xfce-4-8.is\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 21:30+0000\n" -"PO-Revision-Date: 2011-12-07 21:59+0000\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-10-15 15:31+0000\n" "Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" -"Language: is\n" +"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: KBabel 1.11.4\n" +"Language: is\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Mistókst að opna netvafra til að lesa hjálparskjöl á vefnum." + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Viltu lesa %s handbókina á netinu?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Viltu lesa handbókina á netinu?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Handbækur á netinu" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Þér verður beint á skjölunarvefinn þar sem hjálparsíðum er viðhaldið og þær þýddar." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "Lesa á _netinu" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Fara alltaf beint í handbækur/skjölun á netinu" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Upplýsingar" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Aðvörun" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Villa" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Spurning" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Biðlaraauðkenni í setustýringu" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "Auðkenni (ID)" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Afvirkja setustýringu" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Valkostir setustýringar" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Sýna valkosti setustýringar" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Mistókst að tengjast setustýringu: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Setustýringin gaf ekki gilt biðlaraauðkenni" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "Vinnumappan \"%s\" er ekki til. Hún verður ekki notuð við gerð \"%s\"." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "Þessi flýtilykill er þegar í notkun fyrir aðra gluggastjóraaðgerð. Hvora aðgerðina viltu nota?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Þessi flýtileið er þegar í notkun fyrir '%s' aðgerðina. Hvaða aðgerð viltu nota?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Nota '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Halda hinu" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Halda '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Þessi flýtileið er þegar í notkun fyrir '% s' skipunina. Hvaða aðgerð viltu " -"nota?" +msgstr "Þessi flýtileið er þegar í notkun fyrir '%s' skipunina. Hvaða aðgerð viltu nota?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Halda '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "Þessi flýtilykill er þegar í notkun fyrir gluggastjóraaðgerð. Hvora aðgerðina viltu nota?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Þessi flýtileið er þegar í notkun af '%s' aðgerðinni. Hvaða aðgerð viltu nota?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Notaðu einhverja aðra lyklasamsetningu." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Halda gluggastjóraaðgerð" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s gangsetur nú þegar þessa aðgerð." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Árekstrar milli aðgerða fyrir %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Þessi flýtileið er nú þegar í notkun fyrir eitthvað annað." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Flýtilykill fyrir gluggastjóraaðgerð" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Aðgerð:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "aðgerð" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Flýtileið Skipunar" +msgstr "Flýtilykill skipunar" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Skipun:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "skipun" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Flýtilykill" +msgstr "Flýtileið" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Ýttu núna á þá lykla lyklaborðsins sem þú vilt nota til að ræsa %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "Flýtilykill:" +msgstr "Flýtileið:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Ekki ennþá ýtt á neina lykla, halda áfram." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "Ekki var hægt að ná í lyklaborðið." +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Aðgerðavalmynd glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Upp" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Niður" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Vinstri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Hægri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Hætta við" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Fletta í gegnum glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Fletta í gegnum glugga (afturábak)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Skipta um glugga fyrir sama forrit" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Skipta um forrit" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Loka glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Hámarka glugga lárétt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Hámarka glugga lóðrétt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Hámarka glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Fela glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Flytja glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Breyta stærð á glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Skyggja glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Líma glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Lyfta glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Lækka glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Lyfta eða lækka glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fylla glugga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fylla glugga lárétt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fylla glugga lóðrétt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Víxla því að ofan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Víxla heilskjá" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Flytja glugga yfir á nvinnusvæði fyrir ofan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Flytja glugga yfir á nvinnusvæði fyrir neðan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Flytja glugga yfir á vinnusvæði til vinstri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Flytja glugga yfir á nvinnusvæði til hægri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Flytja glugga yfir á fyrra vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Flytja glugga yfir á næsta vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Flytja glugga yfir á vinnusvæði 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Flytja glugga yfir á vinnusvæði 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Flytja glugga yfir á vinnusvæði 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Flytja glugga yfir á vinnusvæði 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Flytja glugga yfir á vinnusvæði 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Flytja glugga yfir á vinnusvæði 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Flytja glugga yfir á vinnusvæði 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Flytja glugga yfir á vinnusvæði 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Flytja glugga yfir á vinnusvæði 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Flytja glugga yfir á vinnusvæði 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Flytja glugga yfir á vinnusvæði 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Flytja glugga yfir á vinnusvæði 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Stafla glugga efst" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Stafla glugga neðst" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Stafla glugga til vinstri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Stafla glugga til hægri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Sýna skjáborðið" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Vinnusvæði fyrir ofan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Vinnusvæði fyrir neðan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Vinnusvæði til vinstri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Vinnusvæði til hægri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Fyrra vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Næsta vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Vinnusvæði 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Vinnusvæði 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Vinnusvæði 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Vinnusvæði 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Vinnusvæði 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Vinnusvæði 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Vinnusvæði 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Vinnusvæði 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Vinnusvæði 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Vinnusvæði 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Vinnusvæði 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Vinnusvæði 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Bæta við vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Bæta við aðliggjandi vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Eyða síðasta vinnusvæði" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Eyða virku vinnusvæði" + #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Undirtexti" +msgid "Titled Dialog" +msgstr "Viðmótsgluggi með titli" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Titla Dálkur" +msgid "Subtitle" +msgstr "Undirtexti" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "XFCE 4 græjur" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Útgáfuupplýsingar" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gluggastjóri" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Sér um staðsetningu glugga á skjánum." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Skjástika" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Forritaræsar, gluggahnappar, forritavalmynd, vinnusvæðaskiptir og fleira." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Skjáborðsstjórnun" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Stillir bakgrunnslit eða bakgrunnsmynd ásamt forritavalmyndum eða táknmyndum fyrir minnkuð forrit, ræsa, tæki og möppur." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Skráastjórnun " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Nútímalegur skráastjóri fyrir Unix/Linux skjáborð, með áherslu á að vera einfaldur í notkun og hraðvirkur." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Setustjórnun" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Endurheimtir setuna þína í ræsingu og gerir kleift að skökkva á tölvunni beint úr XFCE." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Stilling kerfis" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Stillingakerfi til að stýra ýmsum hliðum skjáborðsins, svo sem útliti, skjám, lyklaborði og mús." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Forritaleit" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Sýna uppsett forrit í kerfinu þínu í flokkum, þannig að þú getur fundið þau og ræst hraðar." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Stillingamiðlari" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Stillingageymslukerfi byggt á D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce er safn forrita sem saman mynda samstætt skjáborðsumhverfi. Eftirfarandi forrit eru í kjarna Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce er einnig forritunarumhverfi sem býður upp á mörg aðgerðasöfn og hjálpar þannig forriturum að búa til forrit sem virka vel í skjáborðsumhverfinu." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce einingar eru gefnar út með frjálsum eða opnum notkunarleyfum; GPL eða BSDL fyrir forrit og LGPL eða BSDL fyrir aðgerðasöfn. Skoðaðu hjálparskjöl, upprunakóða eða leitaðu á Xfce vefnum (http://www.xfce.org) til að vita meira um þetta." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Takk fyrir að sýna Xfce áhuga." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce þróunarteymið" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Ef þú veist um einhvern sem vantar á þennan lista; ekki hika við að senda það sem villu á ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Þakkir til allra sem hjálpuðu með að gera þennan hugbúnað aðgengilegan!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Höfundarrétt að Xfce 4 á Olivier Fourdan (fourdan@xfce.org). Aðrir hlutar eru með höfundarrétt viðkomandi höfundar." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs og exo pökkunum er dreift samkvæmt skilmálum í almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér sýnist svo) einhverja nýrri útgáfu leyfisins." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Hugbúnaðarpökkunum thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop og xfwm4 er dreift samkvæmt skilmálum í almenna GNU GPL notkunarleyfisins eins og það er gefið út af Frjálsu hugbúnaðarstofnuninni; annaðhvort útgáfu 2 af GPL-leyfinu, eða (ef þér sýnist svo) einhverja nýrri útgáfu leyfisins." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Skrifaðu '%s --help' til að fá upplýsingar um notkun." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Tókst ekki að frumstilla GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce þróunarteymið. Allur réttur áskilinn." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Tilkynntu villur til <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Listi yfir þýðendur frá %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Tókst ekki að hlaða inn viðmóti" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Útgáfa %s, dreift af %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Útgáfa %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Aðalhönnuðir" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Virkir þáttakendur" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Umsjón með kerfum" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Umsjón með aukadóti" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Umsjón með þýðingum" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Þýðendur" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Eldri framlög" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Um Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Upplýsingar um Xfce skjáborðsumhverfið" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Um Xfce skjáborðsumhverfið" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Um hugbúnað" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Framlög" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Höfundarréttur" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Notkunarskilmálar" diff -Nru libxfce4ui-4.8.1/po/it.po libxfce4ui-4.12.1/po/it.po --- libxfce4ui-4.8.1/po/it.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/it.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,203 +1,779 @@ -# Italian translation for the libxfce4ui package. -# Copyright (C) 2008 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Cristian Marchi , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cristian Marchi , 2009,2013,2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-10-19 14:55+0100\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 14:08+0000\n" "Last-Translator: Cristian Marchi \n" -"Language-Team: Italian Translation Team \n" -"Language: \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/libxfce4ui/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Impossibile aprire il browser per la documentazione online" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Leggere il manuale di %s online?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Leggere il manuale online?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentazione online" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Si verrà reindirizzati al sito web della documentazione dove le pagine d'aiuto sono mantenute e tradotte." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Leggi online" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Vai sempre direttamente alla documentazione online" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informazione" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Avviso" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Errore" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Domanda" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID del client di gestione della sessione" +msgstr "Client ID del gestore di sessione" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Disabilita la gestione della sessione" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opzioni di gestione della sessione" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Mostra le opzioni di gestione della sessione" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Impossibile connettersi al gestore della sessione: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Il gestore della sessione non ha restituito un client ID valido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"La cartella di lavoro «%s» non esiste. Non verrà utilizzata per deporre «%s»." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Questa scorciatoia è già assegnata a un'altra azione del gestore di " -"finestre. Quale azione utilizzare?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "La cartella di lavoro «%s» non esiste. Non verrà utilizzata per deporre «%s»." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Questa scorciatoia è già assegnata al comando \"%s\". Quale azione utilizzare?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Usa '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Mantieni l'altra" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Mantieni '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Questa scorciatoia è già assegnata al comando \"%s\". Quale azione " -"utilizzare?" +msgstr "Questa scorciatoia è già assegnata al comando \"%s\". Quale azione utilizzare?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Mantieni '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Questa scorciatoia è già assegnata a un'azione del gestore di finestre. " -"Quale azione utilizzare?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Questa scorciatoia è già assegnata all'azione \"%s\". Quale azione utilizzare?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Usare un'altra combinazione di tasti." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Mantieni l'azione del gestore di finestre" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s attiva già questa azione." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Azione in conflitto per %s" +msgstr "Azioni in conflitto per %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Questa scorciatoia è già utilizzata per qualcos'altro" +msgstr "Questa scorciatoia è già utilizzata per altro." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Scorciatoia per l'azione del gestore di finestre" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Azione:" +msgstr "Scorciatoia dell'azione del gestore della finestra" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "azione" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Scorciatoia del comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Scorciatoia" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "A_nnulla" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Premere i tasti della tastiera da utilizzare per abilitare il %s \"%s\"" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Scorciatoia:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Non è stato ancora premuto alcun tasto, procedere." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Impossibile acquisire la tastiera." +msgstr "Impossibile prendere il controllo della tastiera" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Sottotitolo" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu delle operazioni della finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Su" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Giù" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Annulla" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Scorri tra le finestre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Scorri tra le finestre (all'indietro)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Scambia la finestra per la stessa applicazione" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Scambia applicazione" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Chiudi la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Massimizza la finestra orizzontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Massimizza la finestra verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Massimizza la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Nascondi la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Sposta la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Ridimensiona la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Arrotola la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Blocca la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Solleva la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Abbassa la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Solleva o abbasa la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Espandi la finestra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Massimizza la finestra orizzontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Massimizza la finestra verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Porta davanti" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Abilita a schermo intero" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Sposta la finestra nello spazio di lavoro superiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Sposta la finestra nello spazio di lavoro inferiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Sposta la finestra nello spazio di lavoro di sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Sposta la finestra nello spazio di lavoro di destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Sposta la finestra nello spazio di lavoro precedente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Sposta la finestra nello spazio di lavoro successivo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Sposta la finestra nello spazio di lavoro 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Sposta la finestra nello spazio di lavoro 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Sposta la finestra nello spazio di lavoro 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Sposta la finestra nello spazio di lavoro 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Sposta la finestra nello spazio di lavoro 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Sposta la finestra nello spazio di lavoro 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Sposta la finestra nello spazio di lavoro 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Sposta la finestra nello spazio di lavoro 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Sposta la finestra nello spazio di lavoro 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Sposta la finestra nello spazio di lavoro 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Sposta la finestra nello spazio di lavoro 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Sposta la finestra nello spazio di lavoro 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Riquadra la finestra in alto" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Riquadra la finestra in basso" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Riquadra la finestra a sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Riquadra la finestra a destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Riquadra la finestra in alto a sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Riquadra la finestra in alto a destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Riquadra la finestra in basso a sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Riquadra la finestra in basso a destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Mostra la scrivania" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Spazio di lavoro superiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Spazio di lavoro inferiore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Spazio di lavoro di sinistra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Spazio di lavoro di destra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Spazio di lavoro precedente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Spazio di lavoro successivo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Spazio di lavoro 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Spazio di lavoro 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Spazio di lavoro 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Spazio di lavoro 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Spazio di lavoro 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Spazio di lavoro 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Spazio di lavoro 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Spazio di lavoro 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Spazio di lavoro 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Spazio di lavoro 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Spazio di lavoro 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Spazio di lavoro 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Aggiungi spazio di lavoro" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Aggiungi uno spazio di lavoro adiacente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Elimina l'ultimo spazio di lavoro" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Elimina lo spazio di lavoro attivo" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Finestra titolata" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Sottotitolo" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 Widget" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informazioni di versione" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestore delle finestre" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gestisce il posizionamento delle finestre sullo schermo." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Pannello" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "IL file non è un file desktop valido" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Avviatori di programmi, pulsanti delle finestre, menu delle applicazioni, selettore degli spazi di lavoro e molto altro." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestore della scrivania" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Versione del file desktop \"%s\" sconosciuta" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Imposta il colore o l'immagine di sfondo della scrivania, fornisce un menu delle applicazioni opzionale e le icone per le applicazioni minimizzate, per gli avviatori, per i dispositivi e per le cartelle." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gestore dei file" -#~ msgid "Starting %s" -#~ msgstr "Avvio di %s in corso..." +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un moderno gestore di file per l'ambiente Unix/Linux, veloce e facile da usare." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gestore della sessione" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "L'applicazione non accetta documenti da linea di comando" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Ripristina la propria sessione all'avvio e permette di spegnere il computer da Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Impostazioni del sistema" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Opzione di lancio non riconosciuta: %d" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistema di configurazione per controllare vari aspetti dell'ambiente grafico quali l'aspetto e le impostazioni di schermo, tastiera e mouse." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Trova applicazioni" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Impossibile trasferire l'URI del documento a un elemento desktop " -#~ "\"Type=Link\"" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Mostra le applicazioni installate nel proprio sistema suddividendole per categoria in modo da poterle facilmente trovare e avviare." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Demone delle impostazioni" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema di immagazzinamento della configurazione basato su D-Bus." -#~ msgid "Not a launchable item" -#~ msgstr "Elemento non lanciabile" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce è una collezione di programmi che nella loro totalità forniscono un ambiente grafico ricco di funzionalità. I seguenti programmi fanno parte del \"cuore\" di Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce è anche una piattaforma di sviluppo che fornisce diverse librerie utili ai programmatori per creare applicazioni che si adattino all'ambiente grafico." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "I componenti di Xfce sono rilasciati con licenze a codice aperto; GPL o BSDL per le applicazioni e LGPL o BSDL per le librerie. Consultare la documentazione, il codice sorgente o il sito web di Xfce (http://www.xfce.org) per maggiori informazioni" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Grazie per esservi interessati a Xfce" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Il gruppo di sviluppo di Xfce" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Specifica il file contenente la configurazione salvata" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Se dovesse mancare qualcuno nell'elenco, segnalarlo su ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Si ringraziano tutti quelli che hanno contribuito a rendere questo programma disponibile!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce4 è copyright di Olivier Fourdan (fourdan@xfce.org). I vari componenti sono copyright dei rispettivi autori." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "I pacchetti libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs ed exo sono distribuiti nei termini della licenza GNU Library General Public License così come pubblicata dalla Free Software Foundation; sia nella versione 2 che (a propria scelta) in una versione successiva." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "I pacchetti thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop e xfwm4 sono distribuiti nei termini della licenza GNU Library General Public License così come pubblicata dalla Free Software Foundation; sia essa nella versione 2 o (a propria scelta) in una versione successiva." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Digitare \"%s --help\" per le informazioni di utilizzo." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Impossibile inizializzare GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Il team di sviluppo di Xfce. Tutti i diritti riservati." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Segnalare i problemi a <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Elenco dei traduttori da %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Impossibile caricare l'interfaccia" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versione %s, distribuita da %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Versione %s" -#~ msgid "FILE" -#~ msgstr "FILE" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Sviluppatori principali" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Collaboratori attivi" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Server mantenuto da" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Supervisione dei \"goodie\"" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Supervisione dei traduttori" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Traduttori" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Contributori precedenti" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Informazioni su Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informazioni sull'ambiente grafico Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Informazioni sull'ambiente grafico Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Informazioni" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Riconoscimenti" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licenza" diff -Nru libxfce4ui-4.8.1/po/ja.po libxfce4ui-4.12.1/po/ja.po --- libxfce4ui-4.8.1/po/ja.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ja.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,203 +1,779 @@ -# Japanese translations for libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Nobuhiro Iwamatsu , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Nobuhiro Iwamatsu , 2008 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-10-05 22:19+0900\n" -"Last-Translator: Masato Hashimoto \n" -"Language-Team: Japanese \n" -"Language: ja\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 12:50+0000\n" +"Last-Translator: Masato HASHIMOTO \n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/libxfce4ui/language/ja/)\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-Poedit-Language: Japanese\n" -"X-Poedit-Country: JAPAN\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "ウェブブラウザーでオンラインドキュメントを開くことに失敗しました" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s のマニュアルをオンラインで参照しますか?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "マニュアルをオンラインで参照しますか?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "オンラインドキュメント" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "ドキュメントウェブサイトでヘルプページがメンテナンスおよび翻訳されている場合はリダイレクトされます。" + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "オンラインで読む(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "常にオンラインドキュメントを開く(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "インフォメーション" +msgstr "情報" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "警告" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "エラー" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" -msgstr "質問" +msgstr "確認" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "セッション管理クライアント ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "セッション管理を無効にする" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "セッション管理オプション" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "セッション管理オプションを表示する" +msgstr "セッション管理オプションを表示します" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "セッションマネージャへの接続に失敗しました: %s" +msgstr "セッションマネージャーへの接続に失敗しました: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "セッションマネージャは正常なクライアント ID を返しませんでした" +msgstr "セッションマネージャーは正常なクライアント ID を返しませんでした" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"作業ディレクトリ \"%s\" が存在しません。\"%s\" 起動時にこれは使用されません。" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"このショートカットはすでに他のウィンドウマネージャあるいはユーザアクションで" -"使用されています。どちらで使いますか?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "作業ディレクトリ \"%s\" が存在しません。\"%s\" 起動時にこれは使用されません。" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "このショートカットはすでにアクション '%s' で使用されています。どちらで使いますか?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' で使う" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "他方で使う" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "'%s' で使う" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"このショートカットはすでにコマンド '%s' で使用されています。どちらで使います" -"か?" +msgstr "このショートカットはすでにコマンド '%s' で使用されています。どちらで使いますか?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "'%s' で使う" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"このショートカットはすでに他のウィンドウマネージャアクションで使用されていま" -"す。どちらで使いますか?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "このショートカットはすでにアクション '%s' で使用されています。どちらで使いますか?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "他のキーの組み合わせを使用してください。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "ウィンドウマネージャアクションで使う" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s はすでにこのアクションで使用されています。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s のアクションの衝突" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "このショートカットはすでに他で使用されています。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "ウィンドウマネージャアクションのショートカット" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "アクション:" +msgstr "ウィンドウマネージャーアクションショートカット" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "アクション" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "コマンドショートカット" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "コマンド:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "コマンド" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "ショートカット" +msgstr "ショートカットキー" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "キャンセル(_C)" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "%s '%s' の起動に使用するキーボードキーを押してください。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "ショートカット:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "キーの押下を待っています。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "キーボードを取得できませんでした。" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "サブタイトル" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "ウィンドウ操作メニュー" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "左" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "右" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "キャンセル" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "ウィンドウの切り替え" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "ウィンドウの切り替え (逆方向)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "同じアプリケーションのウィンドウの切り替え" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "アプリケーションの切り替え" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "ウィンドウを閉じる" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "ウィンドウを横に最大化" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "ウィンドウを縦に最大化" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "ウィンドウを最大化" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "ウィンドウを隠す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "ウィンドウの移動" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "ウィンドウのサイズ変更" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "ウィンドウを折り畳む" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "常に表示中のワークスペースに置く" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "ウィンドウを前面に出す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "ウィンドウを後ろへ送る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "ウィンドウを前面に出す/後ろへ送る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "ウィンドウをいっぱいに拡げる" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "ウィンドウを横いっぱいに拡げる" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "ウィンドウを縦いっぱいに拡げる" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "常に最前面化/解除の切り替え" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "全画面化/解除の切り替え" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "ウィンドウを上のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "ウィンドウを下のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "ウィンドウを左のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "ウィンドウを右のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "ウィンドウを前のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "ウィンドウを次のワークスペースに移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "ウィンドウをワークスペース 1 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "ウィンドウをワークスペース 2 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "ウィンドウをワークスペース 3 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "ウィンドウをワークスペース 4 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "ウィンドウをワークスペース 5 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "ウィンドウをワークスペース 6 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "ウィンドウをワークスペース 7 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "ウィンドウをワークスペース 8 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "ウィンドウをワークスペース 9 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "ウィンドウをワークスペース 10 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "ウィンドウをワークスペース 11 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "ウィンドウをワークスペース 12 へ移す" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "ウィンドウを画面上にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "ウィンドウを画面下にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "ウィンドウを画面左にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "ウィンドウを画面右にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "ウィンドウを画面左上にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "ウィンドウを画面右上にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "ウィンドウを画面左下にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "ウィンドウを画面右下にタイル表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "デスクトップを表示" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "上のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "下のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "左のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "右のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "前のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "次のワークスペースへ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "ワークスペース 1 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "ワークスペース 2 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "ワークスペース 3 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "ワークスペース 4 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "ワークスペース 5 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "ワークスペース 6 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "ワークスペース 7 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "ワークスペース 8 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "ワークスペース 9 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "ワークスペース 10 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "ワークスペース 11 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "ワークスペース 12 へ移る" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "ワークスペースの追加" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "隣にワークスペースを追加" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "最後のワークスペースを削除" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "現在のワークスペースを削除" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "タイトル付きダイアログ" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "副題" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 ウィジェット" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "バージョン情報" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "ウィンドウマネージャー" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "画面上のウィンドウの配置を管理します。" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "パネル" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "ファイルは正常な .desktop ファイルではありません" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "プログラムランチャー、ウィンドウボタン、アプリケーションメニュー、ワークスペーススイッチャーなどがあります。" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "デスクトップマネージャー" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "'%s' は認識できないデスクトップファイルのバージョンです" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "背景の色や画像を設定し、オプションでアプリケーションメニューの表示や、アプリケーションやランチャーを最小化したアイコン、デバイス、およびフォルダーの配置を行います。" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "ファイルマネージャー" -#~ msgid "Starting %s" -#~ msgstr "%s を起動しています" +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix/Linux デスクトップ向けのモダンなファイルマネージャーです。使いやすく、軽快に動作することを目指しています。" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "セッションマネージャー" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "アプリケーションはコマンドラインから文書を受け付けません" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "起動時にセッションを復元し、Xfce からコンピューターのシャットダウンを行えるようにします。" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "システム設定" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "認識できない起動オプションです: %d" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "デスクトップの外観、ディスプレイ、キーボード、あるいはマウスなど、様々なシステム設定を行います。" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "アプリケーションファインダー" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "デスクトップエントリ 'Type=Link' にドキュメント URI を渡すことができません" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "システムにインストールされているアプリケーションをカテゴリ別に表示し、それらをすばやく見つけて起動できます。" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "設定デーモン" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus ベースの設定格納システムです。" -#~ msgid "Not a launchable item" -#~ msgstr "起動可能なアイテムではありません" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce はデスクトップ環境に必要なすべての機能をひとまとめに提供するプログラムコレクションです。以下は Xfce のコアとなるプログラムです:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce はいくつかのライブラリを提供する開発プラットフォームでもあります。これらライブラリは、このデスクトップ環境とよく調和するアプリケーションを製作するプログラマーの役に立つでしょう。" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce を構成するプログラムはフリーまたはオープンソースライセンスの条項下での利用が認められています。各アプリケーションには GPL または BSDL が、各ライブラリには LGPL または BSDL が適用されます。詳しい情報はソースコードか Xfce ウェブサイト (http://www.xfce.org) にある文書をご覧ください。" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Xfce に関心を持っていただきありがとうございます。" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce 開発チーム" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "保存する設定に含めるファイルを指定する" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "このリストに記載ミスがある場合は、 までバグとしてお知らせください。" + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "このソフトウェアを利用できるよう協力して下さったすべての方々に感謝します。" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce の著作権は Olivier Fourdan (fourdan@xfce.org) が保有しています。各コンポーネントの著作権はそれぞれの製作者が保有しています。" + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui、libxfcegui4、libxfce4util、thunar-vfs、および exo の各パッケージは、フリーソフトウェア財団によって発行された GNU ライブラリ一般公衆使用許諾契約書 (バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件下で配布されています。" + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfce-utils、xfconf、xfdesktop、および xfwm4 の各パッケージは、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書 (バージョン2か、希望によってはそれ以降のバージョンのうちどれか) の定める条件の下で配布されています。" + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "'%s --help' と入力すると使用法が表示されます。" + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "GTK+ を初期化できません。" + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "The Xfce development team. All rights reserved." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "バグの報告は <%s> までお願いします。" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "翻訳者リストの更新日: %s" + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "インターフェイスの読込みに失敗しました" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "バージョン %s (配布: %s)" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "バージョン %s" -#~ msgid "FILE" -#~ msgstr "FILE" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "中心開発者" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "現在の協力者" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "サーバーの管理" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Goodies の監修" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "翻訳の監修" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "翻訳者" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "以前の協力者" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce について" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce デスクトップ環境に関する情報です" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce デスクトップ環境について" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Xfce について" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "クレジット" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "著作権" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "ライセンス" diff -Nru libxfce4ui-4.8.1/po/kk.po libxfce4ui-4.12.1/po/kk.po --- libxfce4ui-4.8.1/po/kk.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/kk.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,201 +1,779 @@ -# libxce4ui to kazakh. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov , 2009. -# +# +# Translators: +# Baurzhan Muftakhidinov , 2009,2015 msgid "" msgstr "" -"Project-Id-Version: trunk\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-12-05 13:35+0600\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 13:52+0000\n" "Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh \n" -"Language: kk\n" +"Language-Team: Kazakh (http://www.transifex.com/projects/p/libxfce4ui/language/kk/)\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" -"Plural-Forms: nplurals=1; plural=0\n" +"Language: kk\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Желідегі онлайн құжаттамасы үшін веб браузерді ашу сәтсіз аяқталды." + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s құжаттамасын онлайн оқуды қалайсыз ба?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Желідегі онлайн құжаттаманы оқуды қалайсыз ба?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Желідегі құжаттама" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Сіз құжаттама парақтары әзірленіп, аударылатын веб сайтына өтесіз." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Же_ліден оқу" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "Әрқ_ашан желідегі онлайн құжаттамаға өту" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Ақпарат" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Ескерту" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Қате" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Сұрақ" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Сессияны басқару клиент ID-і" +msgstr "Сессиялар басқарушысының клиент ID-і" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Сессияны басқаруды сөндіру" +msgstr "Сессияларды басқаруын сөндіру" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Сессияны басқару опциялары" +msgstr "Сессияларды басқару опциялары" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Сессияны басқару опцияларын көрсету" +msgstr "Сессияларды басқарудың опцияларын көрсету" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Сессияларды басқарушыға байланысты орнату сәтсіз аяқталды: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Сессияны басқарушысы дұрыс клиент ID-ін қайтармады" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "\"%s\" жұмыс бумасы жоқ болып тұр. Ол \"%s\" жасалғанда қолданылмайды." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Жарлық терезелер басқарушысының басқа әрекетіне орнатылып тұр. Қай әрекетті " -"қолдануды қалайсыз?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' қолдану" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "басқасын қалдыру" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "'%s' қалдыру" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды " -"қалайсыз?" +msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "'%s' қалдыру" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Жарлық терезелер басқарушысының әрекетімен қолданылуда. Қай әрекетті " -"қолдануды қалайсыз?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Жарлық қазір '%s' командасы үшін қолданылуда. Қай әрекетті қолдануды қалайсыз?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Басқа пернелер комбинациясын қолданыңыз." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Терезелер басқарушысының әрекетін қалдыру" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Бұл әрекетті %s іске қосуға бапталған." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s үшін ерегісетін әрекеттер" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Жарлық қазір басқа бір әрекет үшін орнатылып тұр." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Терезелерді басқарушы әрекеттерінің жарлықтары" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Әрекет:" +msgstr "Терезелер басқарушысы әрекетінің жарлығы" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "әрекет" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Командалық жарлық" +msgstr "Команда жарлығы" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Команда:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Жарлық" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "Ба_с тарту" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "%s '%s' жөнелту үшін қолданғыңыз келетін пернетақта пернелерін басыңыз." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Жарлық:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Пернелер әлі басылмады, жалғастыру." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Пернетақтаны басқаруды алу мүмкін емес." +msgstr "Пернетақта басқаруын алу мүмкін емес." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Екіншілік атау" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Терезе әрекеттер мәзірі" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Жоғары" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Төмен" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Сол жақ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Оң жақ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Бас тарту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Терезелерді ауыстыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Терезелерді (керісінше) ауыстыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Бір қолданба терезелерін ауыстыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Қолданбаны ауыстыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Терезені жабу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Терезені енінен максималды қылу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Терезені биіктігінен максималды қылу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Терезені максималды қылу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Терезені жасыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Терезені жылжыту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Терезе өлшемдерін өзгерту" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Терезені атау жолағына жинау" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Терезені жабыстыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Терезені көтеру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Терезені артқа апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Терезені көтеру не төмендету" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Терезені жазық қылу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Терезені енінен жазу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Терезені биіктігінен жазу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Басқа терезелердің үстінде болуды қосу/сөндіру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Толық экранға болуды қосу/сөндіру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Терезені жоғарғы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Терезені төмендегі жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Терезені сол жақтағы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Терезені оң жақтағы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Терезені алдыңғы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Терезені келесі жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Терезені 1-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Терезені 2-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Терезені 3-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Терезені 4-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Терезені 5-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Терезені 6-шы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Терезені 7-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Терезені 8-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Терезені 9-шы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Терезені 10-шы жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Терезені 11-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Терезені 12-ші жұмыс орнына апару" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Терезені үстіге толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Терезені астыға толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Терезені сол жаққа толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Терезені оң жаққа толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Терезені сол жақ жоғарыға толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Терезені оң жақ жоғарыға толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Терезені сол жақ төменге толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Терезені оң жақ төменге толтыру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Жұмыс үстелін көрсету" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Жоғарғы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Төменгі жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Сол жақтағы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Оң жақтағы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Алдыңғы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Келесі жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "1-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "2-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "3-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "4-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "5-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "6-шы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "7-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "8-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "9-шы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "10-шы жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "11-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "12-ші жұмыс орны" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Жұмыс орнын қосу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Сыбайлас жұмыс орнын қосу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Соңғы жұмыс орнын өшіру" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Белсенді тұрған жұмыс орнын жою" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Атауы бар сұхбат терезесі" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Қосымша атауы" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 виджеттері" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Нұсқа ақпараты" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Терезелер басқарушысы" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Экрандағы терезелердің орналасуын басқарады." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Панель" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Файл дұрыс .desktop файлы емес" +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Бағдарламалар жарлықтары, терезелер батырмалары, қолданбалар мәзірі, жұмыс орындар ауыстырғышы мен т.б." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Жұмыс үстел басқарушысы" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Анықталмаған desktop файлдың Нұсқасы '%s'" +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Жұмыс үстелінің фон түсін не суретін орнатады, қосымша қолданбалар мәзірін немесе қайырылған қолданбалар не жөнелткіштер, құрылғылар мен бумалар үшін таңбашаларды көрсетеді." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Файлдар басқарушысы" -#~ msgid "Starting %s" -#~ msgstr "Жіберілуде %s" +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix/Linux жұмыс үстелі үшін заманауи файлдар басқарушысы, қолдануға ыңғайлы әрі жылдам болуға тырысады." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Сессиялар басқарушысы" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Қолданба командалық жолда құжаттарды қабылдамайды" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Жүйеге кіргенде, сіздің сессияңызды қалпына келтіреді, және Xfce ішінен компьютерді сөндіруге мүмкін қылады." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Баптаулар жүйесі" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Анықталмаған жөнелту опциясы: %d" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Жұмыс үстелінің неше түрлі баптауларын басқарады, яғни сыртқы түрі, экран, пернетақта мен тышқан баптаулары сияқты." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Қолданбаларды табушы" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Құжаттардың URI-ларын 'Type=Link' desktop элементіне беру мүмкін емес" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Жүйеңізде орнатылған қолданбаларды санаттарға негіздеп көрсетеді, сіз оларды жылдам тауып, жөнелте аласыз." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Баптаулар басқарушысының қызметі" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus негізіндегі баптауларды сақтау жүйесі." -#~ msgid "Not a launchable item" -#~ msgstr "Жөнелтілетін элемент емес" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce - бұл мүмкіндіктері көп жұмыс үстел ортасын құрайтын бірнеше бағдарламалардың жинағы. Келесі бағдарламалар Xfce өзегін құрайды:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Сонымен қатар, Xfce өндіру үшін бірнеше жинақты ұсынады, олар бағдарламашыларға жұмыс үстел ортасына сай келетін бағдарламаларды жасауға көмектеседі." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce құрауыштары еркін не ашық лицензиялар аясында таратылады; қолданбалар үшін GPL не BSDL, жинақтар үшін LGPL не BSDL. Көбірек білу үшін құжаттаманы, бастапқы кодты мен Xfce веб сайтын (http://www.xfce.org) қараңыз." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Xfce-ге көрсеткен қызығыңыз үшін рахмет." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce өндіру тобы" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Сақталған баптаулары бар файлды көрсетіңіз" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Бұл тізімнен қалып қойған біреуді білсеңіз, ақаулық хабарламасын жеріне жазыңыз." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Осы бағдарламалық қамтаманы қолжетерлік қылуға көмектескен барлық адамдарға рахмет!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 құқықтарына Olivier Fourdan (fourdan@xfce.org) ие. Әр түрлі құрауыштар өз авторларының меншігі болып табылады." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs және exo дестелері Free Software Foundation жариялаған GNU Library General Public License аясында таратылады; нұсқасы 2 немесе (таңдауыңызша) одан кейін шыққан кез-келгені." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop және xfwm4 дестелері Free Software Foundation жариялаған GNU General Public License аясында таратылады; нұсқасы 2 немесе (таңдауыңызша) одан кейін шыққан кез-келгені." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Қолдану ақпаратын қарау үшін '%s --help' енгізіңіз." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "GTK+ іске қосу мүмкін емес." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Қателер жөнінде осында хабарлаңыз: <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Аудармашылар тізімі (%s орай)." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Интерфейсті жүктеу сәтсіз" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Нұсқасы %s, таратушы %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Нұсқасы %s" -#~ msgid "FILE" -#~ msgstr "ФАЙЛ" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Негізгі жасаушылар" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Белсенді қатысушылар" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Сервер үшін жауап беретін" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Goodies үшін жауап беретін" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Аудармалар үшін жауап беретін" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Аудармашылар" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Алдыңғы үлес қосушылар" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce туралы" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce жұмыс үстел ортасы туралы ақпарат" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce жұмыс үстел ортасы туралы" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Осы туралы" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Жасағандар" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Лицензиясы" diff -Nru libxfce4ui-4.8.1/po/ko.po libxfce4ui-4.12.1/po/ko.po --- libxfce4ui-4.8.1/po/ko.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ko.po 2015-03-02 20:53:37.000000000 +0000 @@ -1,159 +1,763 @@ -# Korean translations for libxfce4ui package. -# Copyright (C) 2003-2011 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Seong-ho, Cho , 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Seong-ho Cho , 2013-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui.xfce-4-8\n" -"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" -"POT-Creation-Date: 2011-09-12 16:37+0000\n" -"PO-Revision-Date: 2011-09-13 04:49+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-03-02 08:34+0000\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: Korean (http://www.transifex.com/projects/p/libxfce4ui/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Korean\n" -"X-Poedit-Country: KOREA, REPUBLIC OF\n" -"X-Poedit-SourceCharset: utf-8\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "온라인 문서에 대한 웹 브라우저를 여는데 실패했습니다" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "온라인에서 %s 도움말을 보시렵니까?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "온라인에서 도움말을 보시렵니까?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "온라인 문서" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "관리, 번역된 도움말 페이지가 있는 문서 웹사이트로 안내합니다." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "온라인 문서 읽기(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "항상 온라인 문서로 바로 이동(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "정보" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "경고" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "오류" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "질문" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "세션 관리자 클라이언트 ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "세션 관리자 비활성화" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "세션 관리자 옵션" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "세션 관리자 옵션 보이기" +msgstr "세션 관리자 옵션 보기" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "세션 관리자로 연결하는데 실패했습니다: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "세션 관리자가 유효한 클라이언트 ID를 반환하지 않았습니다" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format -msgid "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." -msgstr "작업 디렉터리 \"%s\"이(가) 존재하지 않습니다. \"%s\"이(가) 산개되면 이는 사용되지 않을 것입니다." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" -msgstr "이 바로 가기는 이미 다른 창 관리자 동작에서 사용되고 있습니다. 어떤 동작을 사용하시렵니까?" +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "작업 디렉터리 \"%s\"이(가) 존재하지 않습니다. \"%s\"이(가) 퍼지면 이를 사용하지 않습니다." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "이 바로 가기는 이미 '%s' 동작에 대해 사용하고 있습니다. 어떤 동작을 사용하시렵니까?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s'을(를) 사용합니다" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "다른 것을 유지" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format -msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" -msgstr "이 바로 가기는 이미 명령 '%s'에서 사용되고 있습니다. 어떤 동작을 사용하시렵니까?" +msgid "Keep '%s'" +msgstr "'%s'을(를) 유지합니다" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format -msgid "Keep '%s'" -msgstr "'%s'을(를) 유지합니다" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" -msgstr "이 바로 가기는 이미 창 관리자 동작에 의해 사용되고 있습니다. 어떤 동작을 사용하시렵니까?" +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "이 바로 가기는 이미 명령 '%s'에서 사용하고 있습니다. 어떤 동작을 사용하시렵니까?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "창 관리자 동작 유지" +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "이 바로 가기는 이미 '%s' 동작이 사용하고 있습니다. 어떤 동작을 사용하시렵니까?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "다른 키 조합을 사용하십시오." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "이미 이 동작에 대해 %s 키 조합을 사용합니다." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s을(를) 위한 동작이 충돌합니다" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "이 바로 가기는 이미 다른 용도로 사용되고 있습니다." +msgstr "이 바로 가기는 이미 다른 용도로 사용하고 있습니다." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "창 관리자 동작 바로 가기" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "동작:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "동작" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "명령 바로 가기" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "명령:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "명령" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "바로 가기" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "취소(_C)" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "이제 %s '%s'을(를) 사용할 키보드 키를 누르십시오." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "바로 가기:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "아직 키가 눌려지지 않았습니다. 계속 진행합니다." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "키보드 입력을 잡을 수 없습니다." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "부제" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "창 동작 메뉴" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "위" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "아래" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "왼쪽" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "오른쪽" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "취소" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "창 순환" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "창 순환(역순)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "동일 프로그램 창 전환" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "프로그램 전환" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "창 닫기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "수평 방향 창 최대화" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "수직 방향 창 최대화" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "창 최대화" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "창 숨기기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "창 크기 조절" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "창 가리기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "모든 작업 공간에서 창 보기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "창 앞으로 올리기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "창 뒤로 내리기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "창을 앞으로 올리거나 뒤로 내리기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "창 채우기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "창 수평으로 채우기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "창 수직으로 채우기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "위로 전환" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "전체 화면 전환" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "위쪽 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "아래쪽 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "왼쪽 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "오른쪽 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "이전 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "다음 작업 공간으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "작업 공간 1로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "워크스페이스 2로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "워크스페이스 3으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "워크스페이스 4로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "워크스페이스 5로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "워크스페이스 6으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "워크스페이스 7로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "워크스페이스 8로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "워크스페이스 9로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "워크스페이스 10으로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "워크스페이스 11로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "워크스페이스 12로 창 이동" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "상단에 창 바둑판 정렬" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "하단에 창 바둑판 정렬" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "왼쪽에 창 바둑판 정렬" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "오른쪽에 창 바둑판 정렬" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "데스크톱 보이기" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "상단 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "하단 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "왼쪽 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "오른쪽 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "이전 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "다음 작업 공간" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "작업 공간 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "작업 공간 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "작업 공간 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "작업 공간 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "작업 공간 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "작업 공간 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "작업 공간 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "작업 공간 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "작업 공간 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "작업 공간 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "작업 공간 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "작업 공간 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "작업 공간 추가" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "인접 작업 공간 추가" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "마지막 작업 공간 삭제" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "활성 작업 공간 삭제" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "제목이 붙은 대화상자" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "부제" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 위젯" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "버전 정보" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "창 관리자" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "화면 상 창의 위치를 다룹니다." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "패널" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "프로그램 실행 아이콘, 창 단추, 프로그램 메뉴, 작업 공간 전환기 등이 있습니다." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "데스크톱 관리자" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "추가적인 프로그램 메뉴의 배경색, 그림 또는 최소화한 프로그램 아이콘, 실행 아이콘, 장치와 폴더의 아이콘을 설정합니다." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "파일 관리자" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "사용하기 쉽고 빠른 유닉스/리눅스 데스크톱의 최신 파일 관리자입니다." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "세션 관리자 옵션" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "시작시 세션을 복구하고 Xfce에서 컴퓨터를 끌 수 있게 합니다." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "설정 시스템" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "모양새, 디스플레이, 키보드, 마우스와 같은 데스크톱의 다양한 부분을 제어하는 설정 시스템입니다." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "프로그램 찾기" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "시스템에 설치한 프로그램을 카테고리에 보여주어 빨리 찾아 실행할 수 있게 해줍니다." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "설정 데몬" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus 기반 설정 저장소 시스템입니다." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce는 완전한 기능을 갖춘 데스크톱 환경을 함께 제공하는 프로그램의 모음입니다. 다음 프로그램은 Xfce 코어의 일부입니다:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce는 프로그래머가 데스크톱 환경에 맞는 프로그램을 만들 수 있게 다양한 라이브러리를 제공하는 개발 플랫폼이기도 합니다." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce 구성 요소는 프로그램에 대해 GPL 또는 BSDL, 라이브러리에 대해 LGPL 또는 BSDL 자유 오픈소스 라이선스에 따라 계약합니다. 자세한 내용은 문서, 소스 코드 또는 Xfce 웹 사이트(http://www.xfce.org)를 참고하십시오." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Xfce에 관심을 주셔서 감사합니다." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce 개발 팀" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "이 목록에 빠진 내용이 있다면 망설이지 말고 다음으로 버그를 알려주십시오 ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "이 소프트웨어를 사용할 수 있게 도와준 모든 분께 감사드립니다!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4는 Oliver Foundan(fourdan@xfce.org)의 지적 소유물입니다. 다른 구성요소는 제각각의 저작권자가 저작권을 소유하고 있습니다." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfce4gui, libxfce4util, thunar-vfs, exo 패키지는 자유 소프트웨어 재단이 발표한 버전 2 또는(여러분의 선택에 따라) 그 이후의 GNU 라이브러리 일반 공중 사용 허가서의 조항에 따라 배포합니다." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop, xfwm4 패키지는 자유 소프트웨어 재단이 발표한 버전 2 또는(여러분의 선택에 따라) 그 이후의 GNU 라이브러리 일반 공중 사용 허가서의 조항에 따라 배포합니다." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "사용법을 보려면 '%s --help'를 입력합니다." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "GTK+를 초기화할 수 없습니다." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce 개발 팀. All rights reserved." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "<%s>(으)로 버그를 알려주십시오." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "%s의 번역자 목록입니다." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "인터페이스를 불러오는데 실패했습니다" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "버전 %s, %s이(가) 배포함" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "버전 %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "코어 개발자" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "활동 개발자" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "서버 관리자" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies 감독자" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "번역 감독자" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "번역자" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "이전 공헌자" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce 정보" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce 데스크톱 환경 정보" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce 데스크톱 환경 정보" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "정보" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "참여자" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "라이선스" diff -Nru libxfce4ui-4.8.1/po/ku.po libxfce4ui-4.12.1/po/ku.po --- libxfce4ui-4.8.1/po/ku.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ku.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Erdal Ronahi , 2008. -msgid "" -msgstr "" -"Project-Id-Version: libxfce4ui\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2008-11-02 13:44+0100\n" -"Last-Translator: Erdal Ronahi \n" -"Language-Team: Kurdish \n" -"Language: ku\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 0.2\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#: ../libxfce4ui/xfce-dialogs.c:69 -msgid "Information" -msgstr "Agah" - -#: ../libxfce4ui/xfce-dialogs.c:102 -msgid "Warning" -msgstr "Hiyar" - -#: ../libxfce4ui/xfce-dialogs.c:136 -msgid "Error" -msgstr "ewt" - -#: ../libxfce4ui/xfce-dialogs.c:187 -msgid "Question" -msgstr "Pirs" - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid "Session management client ID" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid "ID" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1402 -msgid "Disable session management" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1412 -msgid "Session management options" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1413 -msgid "Show session management options" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1589 -#, c-format -msgid "Failed to connect to the session manager: %s" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1596 -#, c-format -msgid "Session manager did not return a valid client id" -msgstr "" - -#. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 -#, c-format -msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -#, c-format -msgid "Use '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 -#, c-format -msgid "" -"This shortcut is already being used for the command '%s'. Which action do " -"you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 -#, c-format -msgid "Conflicting actions for %s" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 -msgid "This shortcut is already being used for something else." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 -msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 -msgid "Command Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -msgid "Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 -msgid "Shortcut:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 -msgid "Could not grab the keyboard." -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:3 -msgid "Xfce 4 Widgets" -msgstr "" diff -Nru libxfce4ui-4.8.1/po/lt.po libxfce4ui-4.12.1/po/lt.po --- libxfce4ui-4.8.1/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/lt.po 2015-03-15 18:11:26.000000000 +0000 @@ -0,0 +1,780 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Algimantas Margevičius , 2012 +# Moo, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-11 19:56+0000\n" +"Last-Translator: Moo\n" +"Language-Team: Lithuanian (http://www.transifex.com/projects/p/libxfce4ui/language/lt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lt\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" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Nepavyko atverti naršyklės tinklo dokumentacijai" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Ar norite skaityti %s naudotojo vadovą internete?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Ar norite skaityti naudotojo vadovą internete?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentacija tinkle" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Jūs būsite nukreipti į dokumentacijos svetainę kurioje yra verčiami ir prižiūrimi žinyno puslapiai." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Skaityti internete" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Visada eiti tiesiai į dokumentaciją internete" + +#: ../libxfce4ui/xfce-dialogs.c:334 +msgid "Information" +msgstr "Informacija" + +#: ../libxfce4ui/xfce-dialogs.c:377 +msgid "Warning" +msgstr "Įspėjimas" + +#: ../libxfce4ui/xfce-dialogs.c:421 +msgid "Error" +msgstr "Klaida" + +#: ../libxfce4ui/xfce-dialogs.c:494 +msgid "Question" +msgstr "Klausimas" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Nepavyko prisijungti prie seanso tvarkyklės: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Seanso tvarkyklė negrąžino tinkamo kliento id" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:409 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Darbinis aplankas „%s“ neegzistuoja. Jis nebus naudojamas atvaizduojant „%s“." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Naudoti „%s“" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Palikti „%s“" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Šis trumpinys jau naudojamas komandai „%s“. Kurį veiksmą norėsite naudoti?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Nesuderinami veiksmai skirti %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 +msgid "This shortcut is already being used for something else." +msgstr "Šis trumpinys jau naudojamas kažkam kitam." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Susiejimas" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 +msgid "Shortcut:" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 +msgid "Could not grab the keyboard." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Lango operacijų meniu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Aukštyn" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Žemyn" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Kairė" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Dešinė" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Atsisakyti" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Perjungti langus" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Perjungti langus (atvirkščiai)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Perjungti langą tai pačiai programai" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Perjungti programą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Užverti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Išskleisti langą horizontaliai" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Išskleisti langą vertikaliai" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Išskleisti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Paslėpti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Perkelti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Keisti lango dydį" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Uždengti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Priklijuoti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Iškelti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Nuleisti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Iškelti ar nuleisti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Užpildyti langą" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Užpildyti langą horizontaliai" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Užpildyti langą vertikaliai" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Perjungti aukščiau" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Perjungti viso ekrano veikseną" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Perkelti langą į aukštesnį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Perkelti langą į žemesnį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Perkelti langą į kairį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Perkelti langą į dešinį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Perkelti langą į buvusį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Perkelti langą į sekantį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Perkelti langą į darbo lauką 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Perkelti langą į darbo lauką 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Perkelti langą į darbo lauką 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Perkelti langą į darbo lauką 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Perkelti langą į darbo lauką 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Perkelti langą į darbo lauką 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Perkelti langą į darbo lauką 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Perkelti langą į darbo lauką 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Perkelti langą į darbo lauką 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Perkelti langą į darbo lauką 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Perkelti langą į darbo lauką 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Perkelti langą į darbo lauką 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Perkelti langą į kairį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Perkelti langą į žemesnį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Perkelti langą į kairį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Perkelti langą į dešinį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Rodyti darbastalį" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Viršutinis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Žemutinis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Kairysis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Dešinysis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Ankstesnis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Sekantis darbo laukas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Darbo laukas 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Darbo laukas 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Darbo laukas 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Darbo laukas 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Darbo laukas 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Darbo laukas 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Darbo laukas 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Darbo laukas 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Darbo laukas 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Darbo laukas 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Darbo laukas 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Darbo laukas 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Pridėti darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Pridėti darbo lauką šalia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Pašalinti paskutinį darbo lauką" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Pašalinti aktyvų darbo lauką" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Langas su antrašte" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Xfce 4 valdikliai" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versija" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Langų tvarkyklė" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Skydelis" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programų leistukai, langų mygtukai, programų meniu, darbo vietos keitimas ir dar daugiau." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Nustato darbastalio fono spalvą ar paveikslėlį su nebūtinu programų meniu ar piktogramas sumažintoms programoms ar leistukams, įrenginius ir aplankus." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Moderni failų tvarkyklė skirta Unix/Linux darbastaliams, besistengianti būti lengvai naudojama ir greita." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Atstato jūsų seansą paleidžiant ir leidžia išjungti kompiuterį iš Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Sistemos nustatymai" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Konfigūracijos sistema skirta valdyti įvairius aspektus, tokius kaip darbastalio išvaizda, ekranai, klaviatūra ir pelės nustatymai." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Programų paieška" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Parodo įdiegtas programas kategorijose, todėl galite lengvai rasti ir paleisti reikalingą programą." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus paremta konfigūracijos saugojimo sistema." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce tai yra programų rinkinys, kartu sudarantis pilną darbastalio aplinką. Šios programos įeina į Xfce branduolį:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce taipogi yra kūrimo platforma turinti kelias bibliotekas, tai suteikia programuotojams galimybę kurti programas kurios puikiai derinsis darbastalio aplinkoje." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce komponentai platinami pagal nemokamas ar atviro kodo licencijas; GPL ar BSDL programoms ir LGPL ar BSDL bibliotekoms. Platesnės informacijos ieškokite dokumentacijoje, pradiniame kode ar Xfce svetainėje (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Dėkui jog domitės Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce kūrėjų komanda" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Jei ko nors šiame sąraše trūksta, nesigėdykite ir užpildykite pranešimą apie klaidą ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Dėkui visiems kurie prisidėjo tam jog ši programinė įranga būtų prieinama!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 autorinės teisės priklauso Olivier Fourdan (fourdan@xfce.org). Kiti komponentai priklauso atitinkamiems autoriams." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs ir exo paketai yra platinami pagal GNU General Public License kaip paskelbė Free Software Foundation; arba pagal licencijos versiją 2, ar (jūsų pasirinkimas) bet kurią vėlesnę versiją." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Paketai thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop ir xfwm4 yra platinami pagal GNU General Public License kaip paskelbė Free Software Foundation; arba pagal licencijos versiją 2, ar (jūsų pasirinkimas) bet kurią vėlesnę versiją." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Nepavyko inicializuoti GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce kūrėjų komanda. Visos teisės saugomos." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Apie klaidas praneškite <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Vertėjų sąrašas iš %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Nepavyko įkelti sąsajos" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versija %s, sukūrė %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Versija %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Autoriai" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Dabartiniai pagalbininkai" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Serverius prižiūri" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Goodies priežiūra" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Vertimų priežiūra" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Vertėjai" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Apie Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informacija apie Xfce darbastalio aplinką" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Apie Xfce darbastalio aplinką" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Apie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Padėkos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Autorinės teisės" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licencija" diff -Nru libxfce4ui-4.8.1/po/lv.po libxfce4ui-4.12.1/po/lv.po --- libxfce4ui-4.8.1/po/lv.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/lv.po 2013-10-04 08:51:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" "PO-Revision-Date: 2009-10-21 13:10+0100\n" "Last-Translator: Rihards Prieditis \n" "Language-Team: Latvian \n" @@ -21,182 +21,808 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +#, fuzzy msgid "Information" -msgstr "Informācija" +msgstr "Versijas informācija" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" -msgstr "Brīdinājums" +msgstr "Uzmanību" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Kļūda" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Jautājums" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 +#, fuzzy msgid "Session management client ID" -msgstr "Sesijas pārvaldības klienta ID" +msgstr "Sesijas pārvaldnieka sokets" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1404 +#, fuzzy msgid "Disable session management" -msgstr "Izslēgt sesijas pārvaldību" +msgstr "Sesijas pārvaldnieka sokets" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1414 +#, fuzzy msgid "Session management options" -msgstr "Sesijas pārvaldības opcijas" +msgstr "Sesijas pārvaldnieka sokets" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1415 +#, fuzzy msgid "Show session management options" -msgstr "Rādīt sesijas pārvaldības opcijas" +msgstr "Sesijas pārvaldnieka sokets" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, fuzzy, c-format msgid "Failed to connect to the session manager: %s" msgstr "Neizdevas savienoties ar sesiju pārvaldnieku" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sesijas pārvaldnieks neatgrieza derīgu clienta id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" "\"." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" msgstr "" -"Šo īsceļu jau izmanto citai logu pārvaldnieka darbībai. Kuru darbību jūs " -"vēlaties izmantot?" +"īsceļu jau lieto !\n" +"Esat drošs, ka vēlaties to izmantot ?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Izmantot \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Paturēt otru" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 -#, c-format -msgid "" -"This shortcut is already being used for the command '%s'. Which action do " -"you want to use?" -msgstr "Šo īsceļu jau izmanto komandai \"%s\". Kuru darbību vēlaties izmantot?" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Keep '%s'" msgstr "Paturēt \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" msgstr "" -"Šo īsceļu jau izmanto logu pārvaldnieka darbība, Kuru darbību jūs vēlaties " -"izmantot?" +"īsceļu jau lieto !\n" +"Esat drošs, ka vēlaties to izmantot ?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Paturēt logu pārvaldnieka darbību" +#, fuzzy, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" +"īsceļu jau lieto !\n" +"Esat drošs, ka vēlaties to izmantot ?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Konfliktējošas darbības priekš %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 +#, fuzzy msgid "This shortcut is already being used for something else." -msgstr "Šo īsceļu jau izmanto kaut kam citam." +msgstr "" +"īsceļu jau lieto !\n" +"Esat drošs, ka vēlaties to izmantot ?" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy msgid "Window Manager Action Shortcut" -msgstr "Logu pārvaldnieku darbību īsceļi" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Darbība:" +msgstr "Xfce 4 logu pārvaldnieka uzstādījumi" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "Darbība" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy msgid "Command Shortcut" -msgstr "Komandas īsceļs" +msgstr "Veidot īsceļu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Komanda:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "Komanda" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Īsceļs" +msgstr "Īsceļš" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy msgid "Shortcut:" -msgstr "Īsceļš:" +msgstr "Nav īsceļu" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +#, fuzzy msgid "Could not grab the keyboard." -msgstr "Nevarēja notvert klaviatūru." +msgstr "Nevarēja izveidot uzstādījumu dialogu." + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "Loga operāciju izvēlne" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "Uz augšu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "Uz leju" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "Pa kreisi" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "Pa labi" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "Atcelt" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "Ciklot starp logiem" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +msgid "Cycle windows (Reverse)" +msgstr "Ciklot starp logiem (pretējā virzienā)" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +msgid "Switch window for same application" +msgstr "Pārslēgt logu, tai pašai lietotnei" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "Pārslēgt lietotni" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "Aizvērt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "Maksimizēt logu horizontāli" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "Maksimizēt logu vertikāli" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "Maksimizēt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "Slēpt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +msgid "Move window" +msgstr "Pārvietot logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +msgid "Resize window" +msgstr "Mainīt izmēru" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "Ēnot logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "Pielipināt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "Pacelt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "Nocelt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "Pacelt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +msgid "Fill window" +msgstr "Aizpildīt logu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +msgid "Fill window horizontally" +msgstr "Aizpildīt logu horizontāli" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +msgid "Fill window vertically" +msgstr "Aizpildīt logu vertikāli" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "Pārslēgt uz augšu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "Pārslēgt uz pilnekrānu režīmu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "Pārvietot logu uz augšējo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "Pārvietot logu uz apakšējo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "Pārvietot logu uz kreiso darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "Pārvietot logu uz labo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "Pārvietot logu uz iepriekšējo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "Pārvietot logu uz nākamo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +msgid "Move window to workspace 1" +msgstr "Pārvietot logu uz darbavietu 1" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +msgid "Move window to workspace 2" +msgstr "Pārvietot logu uz darbavietu 2" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +msgid "Move window to workspace 3" +msgstr "Pārvietot logu uz darbavietu 3" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +msgid "Move window to workspace 4" +msgstr "Pārvietot logu uz darbavietu 4" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +msgid "Move window to workspace 5" +msgstr "Pārvietot logu uz darbavietu 5" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +msgid "Move window to workspace 6" +msgstr "Pārvietot logu uz darbavietu 6" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +msgid "Move window to workspace 7" +msgstr "Pārvietot logu uz darbavietu 7" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +msgid "Move window to workspace 8" +msgstr "Pārvietot logu uz darbavietu 8" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +msgid "Move window to workspace 9" +msgstr "Pārvietot logu uz darbavietu 9" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +msgid "Move window to workspace 10" +msgstr "Pārvietot logu uz darbavietu 10" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +msgid "Move window to workspace 11" +msgstr "Pārvietot logu uz darbavietu 11" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +msgid "Move window to workspace 12" +msgstr "Pārvietot logu uz darbavietu 12" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "Novietot logu centrā" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "Pārvietot logu uz apakšējo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "Novietot logu centrā" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "Mainīt izmēru pa labi" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "Rādīt darbvirsmu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "Augšējā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "Apakšējā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "Kreisā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "Labā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "Iepriekšējā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "Nākamā darbavieta" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +msgid "Workspace 1" +msgstr "Darbavieta 1" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +msgid "Workspace 2" +msgstr "Darbavieta 2" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +msgid "Workspace 3" +msgstr "Darbavieta 3" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +msgid "Workspace 4" +msgstr "Darbavieta 4" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +msgid "Workspace 5" +msgstr "Darbavieta 5" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +msgid "Workspace 6" +msgstr "Darbavieta 6" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +msgid "Workspace 7" +msgstr "Darbavieta 7" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +msgid "Workspace 8" +msgstr "Darbavieta 8" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +msgid "Workspace 9" +msgstr "Darbavieta 9" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +msgid "Workspace 10" +msgstr "Darbavieta 10" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +msgid "Workspace 11" +msgstr "Darbavieta 11" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +msgid "Workspace 12" +msgstr "Darbavieta 12" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "Pievienot darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +msgid "Add adjacent workspace" +msgstr "Pievienot blakus darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +msgid "Delete last workspace" +msgstr "Dzēst pēdējo darbavietu" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +msgid "Delete active workspace" +msgstr "Dzēst aktīvo darbavietu" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Apakšvirsraksts" +#, fuzzy +msgid "Titled Dialog" +msgstr "Virsraksta fonts" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Virsraksta dialogs" +#, fuzzy +msgid "Subtitle" +msgstr "Virsraksts" #: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy msgid "Xfce 4 Widgets" -msgstr "Xfce 4 sīkrīki" +msgstr "Xfce 4 logu pārvaldnieka uzstādījumi" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versijas informācija" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Logu pārvaldnieks" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "Ekrāna _centrā" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "Logu pārvaldnieks" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "Logu pārvaldnieks" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "Sesijas pārvaldnieka sokets" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +#, fuzzy +msgid "Setting System" +msgstr "Sākt %s" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +#, fuzzy +msgid "Settings Daemon" +msgstr "Uzstādījumu pārvaldnieka sokets" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (uz %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +#, fuzzy +msgid "Translators" +msgstr "Caurspīdīgs" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "Iepriekšējā darbavieta" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" + +msgid "Keep the other one" +msgstr "Paturēt otru" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Fails nav derīgs .desktop fails" +msgid "%s" +msgstr "%s" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Neatpazīta darbvirsmas faila versija \"%s\"" +msgid "File is not a valid .desktop file" +msgstr "Fails nav derīgs .desktop fails" -#~ msgid "Starting %s" -#~ msgstr "Sākt %s" +msgid "Unrecognized desktop file Version '%s'" +msgstr "Neatpazīta darbvirsmas faila versija \"%s\"" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Lietotne nepieņem dokumentus no komandlīnijas" +msgid "Application does not accept documents on command line" +msgstr "Lietotne nepieņem dokumentus no komandlīnijas" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Neatpazīta palaišanas opcija: %d" +msgid "Unrecognized launch option: %d" +msgstr "Neatpazīta palaišanas opcija: %d" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "Nevar padot URI uz \"Type=Link\" darbvirsmas ieraksta" +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "Nevar padot URI uz \"Type=Link\" darbvirsmas ieraksta" -#~ msgid "Not a launchable item" -#~ msgstr "Nav palaižams vienums" +msgid "Not a launchable item" +msgstr "Nav palaižams vienums" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Norādiet failu, kurš satur saglabāto konfigurāciju" +msgid "Specify file containing saved configuration" +msgstr "Norādiet failu, kurš satur saglabāto konfigurāciju" -#~ msgid "FILE" -#~ msgstr "FAILS" +msgid "FILE" +msgstr "FAILS" diff -Nru libxfce4ui-4.8.1/po/Makefile.in.in libxfce4ui-4.12.1/po/Makefile.in.in --- libxfce4ui-4.8.1/po/Makefile.in.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/Makefile.in.in 2015-03-15 18:14:44.000000000 +0000 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -50,8 +49,8 @@ XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS) INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -74,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: @@ -104,7 +108,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -138,8 +142,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -Nru libxfce4ui-4.8.1/po/ms.po libxfce4ui-4.12.1/po/ms.po --- libxfce4ui-4.8.1/po/ms.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ms.po 2015-03-06 08:18:25.000000000 +0000 @@ -1,171 +1,764 @@ -# Malay translations for libxfce4ui package. -# Copyright (C) 2008 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Puretech , 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# abuyop , 2015 +# Puretech , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-26 16:37+0000\n" -"PO-Revision-Date: 2011-08-27 03:39+0800\n" -"Last-Translator: Puretech \n" -"Language-Team: Malay <>\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-03-02 22:12+0000\n" +"Last-Translator: abuyop \n" +"Language-Team: Malay (http://www.transifex.com/projects/p/libxfce4ui/language/ms/)\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" +"Language: ms\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Gagal membuka pelayar web untuk dokumentasi dalam talian" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Anda mahu membaca panduan %s dalam talian?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Anda mahu membaca panduan dalam talian?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentasi Dalam Talian" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Anda akan dihalakan ke laman web dokumentasi dimana laman bantuan diselenggara dan diterjemahkan." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Baca Dalam Talian" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "Sentiasa pergi terus ke dokumentasi dalam talian" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Maklumat" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Amaran" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Ralat" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Soalan" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID klien pengurus sesi" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Lumpuhkan pengurusan sesi" +msgstr "Lumpuhkan pengurus sesi" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Pilihan pengurusan sesi" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Papar pilihan pengurusan sesi" +msgstr "Paparkan pilihan pengurus sesi" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Gagal untuk bersambung ke pengurus sesi: %s" +msgstr "Gagal menyambung ke pengurus sesi: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Pengurus sesi tidak memberikan id klien yang sah" +msgstr "Pengurus sesi tidak mengembalikan id klien yang sah" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Direktori kerja \"%s\" tidak wujud. Ia tidak akan digunakan apabila " -"mewujudkan \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Pintasan ini telah digunakan oleh pengurus tetingkap yang lain. Tindakan " -"manakah yang anda mahu gunakan?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Direktori kerja \"%s\" tidak wujud. Ia tidak akan digunakan apabila menjana \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu gunakan?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "Guna '%s\"" +msgstr "Gunakan '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Kekalkan yang satu lagi" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Simpan '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Pintasan ini telah digunakan oleh arahan '%s'. Tindakan manakah yang anda " -"mahu gunakan?" +msgstr "Pintasan ini telah digunakan untuk arahan '%s'. Tindakan mana anda mahu gunakan?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Kekalkan '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Pintasan ini telah digunakan oleh tindakan pengurus tetingkap. Tindakan " -"manakah yang anda mahu gunakan?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Pintasan ini telah digunakan untuk tindakan '%s'. Tindakan mana anda mahu gunakan?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Sila gunakan kombinasi kekunci yang lain." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Kekalkan tindakan pengurus tetingkap" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s telah pun mencetuskan tindakan ini." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Tindakan berkonflik untuk %s" +msgstr "Konflik tindakan untuk %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Pintasan ini telah digunakan oleh perkara lain." +msgstr "Pintasan ini telah digunakan untuk perkara lain." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Tindakan Pintasan Pengurus Tetingkap" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Tindakan:" +msgstr "Pintasan Tindakan Pengurus Tetingkap" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "tindakan" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Arahan Pintasan" +msgstr "Pintaan Arahan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Arahan:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "arahan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Pintasan" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Batal" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Tekan sekarang kekunci papan kekunci yang mahu digunakan untuk mencetuskan %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Pintasan:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Tiada kekunci ditekan, teruskan." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Tidak dapat menangkap papan kekunci" +msgstr "Tidak dapat menangkap papan kekunci." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu operasi tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Batal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Kitar tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Kitar tetingkap (Mengundur)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Tukar tetingkap untuk aplikasi sama" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Tukar aplikasi" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Tutup tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimumkan tetingkap melintang" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimumkan tetingkap menegak" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimakan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Sembunyi tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Alih tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Saiz semula tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Suramkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Lekatkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Naikkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Turunkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Naikkan atau turunkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Penuhkan tetingkap" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Penuhkan tetingkap melintang" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Penuhkan tetingkap melintang" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Togol keatas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Togol skrinpenuh" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Pindah tetingkap ke ruangkerja atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Pindah tetingkap ke ruangkerja bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Pindah tetingkap ke ruangkerja kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Pindah tetingkap ke ruangkerja kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Pindah tetingkap ke ruangkerja tadi" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Pindah tetingkap ke ruangkerja seterusnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Pindah tetingkap ke ruangkerja 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Pindah tetingkap ke ruangkerja 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Pindah tetingkap ke ruangkerja 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Pindah tetingkap ke ruangkerja 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Pindah tetingkap ke ruangkerja 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Pindah tetingkap ke ruangkerja 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Pindah tetingkap ke ruangkerja 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Pindah tetingkap ke ruangkerja 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Pindah tetingkap ke ruangkerja 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Pindah tetingkap ke ruangkerja 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Pindah tetingkap ke ruangkerja 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Pindah tetingkap ke ruangkerja 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Susun tetingkap ke atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Susun tetingkap ke bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Susun tetingkap ke kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Susun tetingkap ke kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Papar desktop" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Ruangkerja atas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Ruangkerja bawah" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Ruangkerja kiri" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Ruangkerja kanan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Ruangkerja terdahulu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Ruangkerja seterusnya" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Ruangkerja 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Ruangkerja 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Ruangkerja 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Ruangkerja 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Ruangkerja 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Ruangkerja 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Ruangkerja 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Ruangkerja 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Ruangkerja 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Ruangkerja 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Ruangkerja 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Ruangkerja 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Tambah ruangkerja" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Tambah ruangkerja bersebelahan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Padam ruangkerja terakhir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Padam ruangkerja aktif" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtajuk" +msgid "Titled Dialog" +msgstr "Tajuk Dialog" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Dialog Bertajuk" +msgid "Subtitle" +msgstr "Sarikata" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Widget Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Maklumat versi" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Pengurus Tetingkap" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Mengendalikan penempatan tetingkap pada skrin." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Pelancar program, butang tetingkap, menu aplikasi, penukar ruangkerja dan sebagainya." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Pengurus Desktop" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Tetapkan warna latar belakang atau imej dengan pilihan menu aplikasi atau ikon untuk aplikasi diminimumkan atau pelancar, peranti dan folder." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Pengurus Fail " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Pengurus fail moden untuk desktop Unix/Linux, mensasarkan senang diguna dan pantas." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Pengurusan Sesi" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Kembalikan sesi pada permulaan dan membolehkan anda mematikan komputer dari Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Tetapan Sistem" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Konfigurasi sistem untuk mengawal tetapan pelbagai aspek desktop seperti penampilan, paparan, papan kekunci dan tetikus." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Pencari Aplikasi" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Memaparkan aplikasi dipasang pada sistem and dalam kategori, supaya anda dapat mencari dan melancarkannya dengan pantas." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Tetapan Daemon" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Konfigurasi simpanan sistem berasaskan D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce merupakan koleksi program yand bersatu menyediakan persekitaran desktop berciri penuh. Program berikut adalah bahagian daripada teras Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce juga merupakan platform pembangunan yang menyediakan beberapa pustakaan, yang membantu pengaturcara mencipta aplikasi yang amat sesuai dengan persekitaran desktop." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponen Xfce dilesenkan dibawah lesen bebas dan sumber terbuka; GPL atau BSDL untuk aplikasi dan LGPL atau BSDL untuk pustakaan. Lihat pada dokumentasi, kod sumber atau laman web Xfce (http://www.xfce.org) untuk maklumat." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Terima kasih kerana berminat dengan Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Pasukan Pembangunan Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Jika anda menjumpai siapa yang tiada dalam senarai ini; jagan ragu dan failkan pepijat pada ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Terima kasih kepada semua yang membantu menjayakan perisian ini!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 adlah hakcipta Oliver Fourdan (fourdan@xfce.org). Komponen lain adalah hakcipta penulis yang berkenaan." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Pakej libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs dan exo diedarkan di bawah syarat-syarat GNU General Public License seperti yang diterbitkan oleh Free Software Foundation; sama ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi selepas ini." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Pakej thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop dan xfwm4 diedarkan di bawah syarat-syarat GNU General Public License seperti yang diterbitkan oleh Free Software Foundation; sama ada Lesen versi 2, atau (atas pilihan anda) mana-mana versi selepas ini." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Taip '%s --help' untuk maklumat penggunaan." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Tidak dapat memulakan GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Pasukan pembangunan Xfce. Semua hak cipta terpelihara." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Sila laporkan pepijat ke <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Senarai penterjemah dari %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Gagal untuk memuatkan antaramuka" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versi %s, edaran oleh %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versi %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Pembangun utama" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Penyumbang aktif" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Pelayan diselenggara oleh" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Penyelia goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Penyelia terjemahan" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Penterjemah" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Penyumbang sebelum ini" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Perihal Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Maklumat tentang Persekitaran Desktop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Perihal Persekitaran Desktop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Perihal" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Kredit" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Hakcipta" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lesen" diff -Nru libxfce4ui-4.8.1/po/nb.po libxfce4ui-4.12.1/po/nb.po --- libxfce4ui-4.8.1/po/nb.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/nb.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,172 +1,765 @@ -# Norwegian bokmaal translations for libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui COPYRIGHT HOLDER +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Terje Uriansrud , 2010. -# +# +# Translators: +# Allan Nordhøy , 2014-2015 +# Harald , 2014 +# Terje Uriansrud , 2010 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui 1.4.7.0\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-10-18 21:21+0100\n" -"Last-Translator: Terje Uriansrud \n" -"Language-Team: Norwegian Bokmal \n" -"Language: nb\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-20 20:13+0000\n" +"Last-Translator: Allan Nordhøy \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/libxfce4ui/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Klarte ikke å åpne nettleseren for dokumentasjon på Internett" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Ønsker du å lese bruksanvisningen %s på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Ønsker du å lese bruksanvisningen på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentasjon på Internett" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Du vil bli omdirigert til dokumentasjonsnettstedet der hjelpesidene blir vedlikeholdt og oversatt." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Les på Internett" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Gå alltid direkte til dokumentasjonen på Internett." + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informasjon" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Advarsel" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Feil" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Spørsmål" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Klient id fra øktbehandling" +msgstr "Øktbehandling klient-ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "Id" +msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Slå øktbehandling av" +msgstr "Deaktiver øktbehandling" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Øktbehandling innstillinger" +msgstr "Alternativer for øktbehandling" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Vis øktbehandling valg" +msgstr "Vis alternativer for øktbehandling" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Klarte ikke koble til øktbehandling: %s" +msgstr "Klarte ikke koble til øktbehandleren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "Øktbehandling returnerte ikke en gyldig klient id" +msgstr "Øktbehandler returnerte ikke en gyldig klient-ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Arbeindsmappen \"%s\" finnes ikke. Den vil ikke bli brukt ved klargjøring av " +"Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Denne snarveien benyttes allerede for en annen aksjon i vindusbehandleren. " -"Hvilken aksjon ønsker du å bruke?" +msgstr "Arbeidsmappen \"%s\" finnes ikke. Den vil ikke bli brukt ved klargjøring av \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Denne snarveien benyttes allerede for handlingen '%s'. Hvilken handling ønsker du å bruke?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Bruk '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Behold den andre" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Behold '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Denne svarveien benyttes allerede for kommandoen '%s'. Hvilken aksjon ønsker " -"du å bruke?" +msgstr "Denne snarveien benyttes allerede for kommandoen '%s'. Hvilken handling ønsker du å bruke?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Behold '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Denne snarveien benyttes allerede av en aksjon i vindusbehandleren. Hvilken " -"aksjon ønsker du å bruke?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Denne snarveien benyttes allerede for handlingen '%s'. Hvilken handling ønsker du å bruke?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Vennligst bruk en annen tastekombinasjon." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Behold vindusbehandleraksjon" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s utløser allerede denne handlingen." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Konflikt i aksjoner for %s" +msgstr "Mostridende handlinger for %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Denne snarveien benyttes allerede for noe annet." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Vindusbehandler aksjonssnarvei" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Aksjon:" +msgstr "Vindusbehandler handlingssnarvei" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "handling" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Kommandosnarvei" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Kommando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Snarvei" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Avbryt" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Trykk nå tastaturtastene du ønsker å bruke for å utløse %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Snarvei:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Ingen taster trykkes enda, fortsett." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Klarte ikke gripe tastaturet" +msgstr "Klarte ikke å ta tak i tastaturet." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Undertittel" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Vindu handlingsmeny" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Opp" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Ned" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Venstre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Høyre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Avbryt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Roter vinduer" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Roter vinduer (baklengs)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Bytt vindu for samme applikasjon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Bytt applikasjon" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Lukk vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimer vindu vannrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimer vindu loddrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimer vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Skjul vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Flytt vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Endre størrelsen på vinduet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Rull opp vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Fest vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Hev vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Senk vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Hev eller senk vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fyll vindu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fyll vindu vannrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fyll vindu loddrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Slå heving på/av" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Slå fullskjerm på/av" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Flytt vindu til øvre skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Flytt vindu til nedre skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Flytt vindu til venstre skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Flytt vindu til høyre skrivebrord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Flytt vindu til forrige skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Flytt vindu til neste skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Flytt vindu til arbeidsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Flytt vindu til arbeidsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Flytt vindu til arbeidsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Flytt vindu til arbeidsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Flytt vindu til arbeidsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Flytt vindu til arbeidsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Flytt vindu til arbeidsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Flytt vindu til arbeidsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Flytt vindu til arbeidsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Flytt vindu til arbeidsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Flytt vindu til arbeidsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Flytt vindu til arbeidsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Flislegg vinduet til toppen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Flislegg vinduet til bunnen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Flislegg vinduet til venstresiden" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Flislegg vinduet til høyresiden" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Vis skrivebord" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Øvre arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Nedre arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Venstre arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Høyre arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Forrige arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Neste arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Arbeidsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Arbeidsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Arbeidsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Arbeidsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Arbeidsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Arbeidsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Arbeidsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Arbeidsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Arbeidsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Arbeidsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Arbeidsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Arbeidsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Legg til arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Legg til et skrivebord ved siden av" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Slett siste arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Slett gjeldende arbeidsområde" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Vindustittel" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Undertittel" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce4 Skjermelementer" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versjonsinformasjon" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Vindusbehandler" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Håndterer plassering av vinduer på skjermen." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programstartere, vindusknapper, programmenyer, arbeidsområdeveksler med mere." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Skrivebordsbehandler" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Velger bakgrunnsfarge eller bilde med valgfri programmeny eller ikoner for minimerte programmer eller oppstartere, enheter og mapper." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Filbehandler" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "En moderne filbehandler for Unix/Linux-skrivebord, som tar sikte på å være enkel å bruke og rask." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Øktbehandler" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Gjenoppretter tidligere økt ved oppstart og lar deg skru av maskinen fra Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Systeminnstillinger" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Innstillings-system for kontroll av forskjellige deler av skrivebordet, som utseende, skjerm, tastatur- og muse-innstillinger." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Programsøk" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Viser installerte programmer på systemet i kategorier, slik at du kan finne og starte dem raskt." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Innstillinger for bakgrunnsprosesser" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-bus-basert oppsett av lagringssystem." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce er en samling programmer som tilsammen utgjør et fullt skrivebordsmiljø. Følgende programmer er sentrale i Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce er også en utviklingsplattform som hjelper utviklere ved å tilby flere biblioteker til bruk for kreasjon av programmer som passer godt i skrivebordsmiljøet." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce-komponentene er lisensiert åpen- eller fri-prog; GPL eller BSDL for programmer og LGPL eller BSDL for biblioteker. Sjekk dokumentasjonen, kildekoden eller Xfce-nettsiden (http://www.xfce.org) for ytterligere informasjon." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Takk til deg for interesse for Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Utviklingslaget bak Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Hvis du vet om noen andre som mangler på listen, ikke nøl med å rapportere en feil til ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Takk til alle som har hjulpet til med å gjøre denne programvaren mulig!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 er kopirettsbeskyttet Olivier Fourdan (fourdan@xfce.org) De forskjellige komponentene er kopirettsbeskyttet av sine respektive forfattere." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs og exo pakkene er distribuert i henhold til betingelsene i GNU Library General Public License, som publiseres av Free Software Foundation; enten versjon 2 av lisensen eller (etter fritt valg) enhver senere versjon." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs og exo pakkene er distribuert i henhold til betingelsene i GNU Library General Public License, som publiseres av Free Software Foundation; enten versjon 2 av lisensen eller (etter fritt valg) enhver senere versjon." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Skriv '%s --help' for bruksinformasjon." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Kunne ikke klargjøre GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce utviklingslaget. Alle rettigheter reservert." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Rapporter feil til <%s>" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Liste over oversettere %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Kunne ikke laste inn grensesnitt" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versjon %s, distribuert av %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versjon %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Utviklere av sentrale komponenter" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktive bidragsytere" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Tjenere vedlikeholdt av" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies-veiledning" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Oversettelsesveiledning" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Oversettere" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Tidligere bidragsytere" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Om Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informasjon om Xfce-skrivebordsmiljøet" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Om Xfce skrivebordsmiljø" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Om" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "haarek - Harald \nkingu - Allan Nordhøy \npapparonny - Ronny K. M. Olufsen " + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Kopirett" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lisens" diff -Nru libxfce4ui-4.8.1/po/nl.po libxfce4ui-4.12.1/po/nl.po --- libxfce4ui-4.8.1/po/nl.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/nl.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,173 +1,780 @@ -# Dutch translation of the libxfce4ui package. -# Copyright (C) The Xfce development team. -# This file is distributed under the same license as the -# libxfce4ui package. -# Pjotr, 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Pjotr , 2015 +# Pjotr pjotrvertaalt@gmail.com , 2011,2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-17 10:34+0000\n" -"PO-Revision-Date: 2011-06-15 11:34+0200\n" -"Last-Translator: Pjotr\n" -"Language-Team: Dutch (Flemish)\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 17:12+0000\n" +"Last-Translator: Pjotr \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/libxfce4ui/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl (Dutch)\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Kon de webbrowser niet openen voor de internetdocumentatie" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Wilt u de handleiding voor %s op het internet lezen?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Wilt u de handleiding op het internet lezen?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Internetdocumentatie" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "U zult worden omgeleid naar de documentatiewebstek, waar de hulppagina's worden onderhouden en vertaald." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Lees op het internet" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "Ga altijd meteen naar de internetdocumentatie" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informatie" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Waarschuwing" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Fout" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Vraag" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Sessiebeheer client-ID" +msgstr "Client-ID voor sessiebeheer" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Sessiebeheer uitschakelen" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opties voor sessiebeheer" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Opties voor sessiebeheer tonen" +msgstr "Toon opties voor sessiebeheer" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Kon geen verbinding maken met de sessiebeheerder: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Geen geldige client-ID van de sessiebeheerder ontvangen" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Werkmap \"%s\" bestaat niet. Hij zal niet worden gebruikt wanneer \"%s\" " -"wordt uitgezaaid." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Deze sneltoets is al in gebruik door een andere vensterbeheeractie. Welke " -"actie wilt u gebruiken?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Werkmap '%s' bestaat niet. Hij zal niet worden gebruikt wanneer '%s' wordt uitgezaaid." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Deze sneltoets wordt reeds gebruikt voor de actie '%s'. Welke actie wilt u gebruiken?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' gebruiken" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "De andere behouden" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "'%s' behouden" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Deze sneltoets is al in gebruik door de opdracht '%s'. Welke actie wilt u " -"gebruiken?" +msgstr "Deze sneltoets wordt reeds gebruikt voor de opdracht '%s'. Welke actie wilt u gebruiken?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "'%s' behouden" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Deze sneltoets is al in gebruik door een vensterbeheerderactie. Welke actie " -"wilt u gebruiken?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Deze sneltoets wordt reeds gebruikt door de actie '%s'. Welke actie wilt u gebruiken?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Gebruik a.u.b. een andere toetscombinatie." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "De vensterbeheerderactie behouden" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Deze actie wordt al opgeroepen door %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Tegenstrijdige acties voor %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Deze sneltoets wordt al gebruikt voor iets anders." +msgstr "De sneltoets wordt al gebruikt voor iets anders." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Sneltoets voor vensterbeheerder-actie" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Actie:" +msgstr "Sneltoets voor actie van vensterbeheerder" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "actie" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Sneltoets voor opdracht" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Opdracht:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "opdracht" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Sneltoets" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Annuleren" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Druk nu op de toetsenbordtoetsen die u wil gebruiken om de %s '%s' uit te voeren." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Sneltoets:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nog geen toetsen ingedrukt, ga door." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Kon het toetsenbord niet opeisen." +msgstr "Kon het toetsenbord niet bemachtigen." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Vensteracties-menu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Naar boven" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Naar beneden" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Links" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Rechts" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Annuleren" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Vensters afwisselen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Vensters afwisselen (achterwaarts)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Wissel venster voor dezelfde toepassing" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Wissel toepassing" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Sluit venster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximaliseer venster horizontaal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximaliseer venster verticaal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximaliseer venster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Verberg venster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Verplaats venster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Pas venstergrootte aan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Rol venster op" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Plak venster vast" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Haal venster naar de voorgrond" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Verplaats venster naar de achtergrond" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Venster voluit tonen of minimaliseren" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Vul venster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Vul venster horizontaal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Vul venster verticaal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Schakel het bovenstaande om" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Schakel schermvullend om" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Verplaats venster naar bovenliggend werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Verplaats venster naar onderliggend werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Verplaats venster naar linkerwerkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Verplaats venster naar rechterwerkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Verplaats venster naar vorig werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Verplaats venster naar volgend werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Verplaats venster naar werkblad 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Verplaats venster naar werkblad 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Verplaats venster naar werkblad 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Verplaats venster naar werkblad 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Verplaats venster naar werkblad 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Verplaats venster naar werkblad 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Verplaats venster naar werkblad 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Verplaats venster naar werkblad 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Verplaats venster naar werkblad 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Verplaats venster naar werkblad 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Verplaats venster naar werkblad 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Verplaats venster naar werkblad 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Plaats venstertegel naar boven" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Plaats venstertegel naar beneden" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Plaats venstertegel naar links" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Plaats venstertegel naar rechts" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Venster naar linksboven tegelen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Venster naar rechtsboven tegelen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Venster naar linksonder tegelen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Venster naar rechtsonder tegelen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Toon bureaublad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Bovenste werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Onderste werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Linkerwerkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Rechterwerkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Vorig werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Volgend werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Werkblad 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Werkblad 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Werkblad 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Werkblad 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Werkblad 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Werkblad 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Werkblad 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Werkblad 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Werkblad 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Werkblad 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Werkblad 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Werkblad 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Voeg werkblad toe" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Voeg aangrenzend werkblad toe" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Verwijder laatste werkblad" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Verwijder actief werkblad" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Ondertitel" +msgid "Titled Dialog" +msgstr "Getiteld dialoogvenster" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Getitelde dialoog" +msgid "Subtitle" +msgstr "Ondertitel" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 Widgets" +msgstr "Xfce 4-programmaatjes" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versie-informatie" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Vensterbeheerder" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Bedient de plaatsing van vensters op het scherm." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Werkbalk" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programmastarters, vensterknoppen, toepassingenmenu, werkbladwisselaar en meer." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Bureaubladbeheerder" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Stelt de achtergrondkleur in of de afbeelding, met optioneel toepassingenmenu of pictogrammen voor geminimaliseerde toepassingen of starters, apparaten en mappen." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Bestandbeheerder" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Een moderne bestandbeheerder voor de Unix/Linux-werkomgeving, met als doel om snel te zijn en gemakkelijk te gebruiken." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Sessiebeheerder" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Herstelt uw sessie bij het opstarten en staat u toe om de computer af te sluiten vanuit Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Instellingensysteem" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Configuratiesysteem om verschillende aspecten van de werkomgeving te beheersen, zoals de instellingen voor uiterlijk, scherm, toetsenbord en muis." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Toepassingenzoeker" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Toont de toepassingen die in uw systeem zijn geïnstalleerd, verdeeld in categorieën, zodat u ze snel kunt vinden en starten." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Achtergronddienst voor instellingen" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-gebaseerd systeem voor opslag van configuraties." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce is een verzameling programma's die gezamenlijk een volledig functionele werkomgeving bieden. De volgende programma's behoren tot de kern van Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce is ook een ontwikkelingsplatform dat verschillende bibliotheken biedt, die programmeurs helpen om toepassingen te maken die goed passen in de werkomgeving." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce-onderdelen worden gelicentieerd onder vrije of open-bron-licenties; GPL of BSDL voor toepassingen en LGPL of BSDL voor bibliotheekbestanden. Lees de documentatie, de broncode of de Xfce-webstek (http://www.xfce.org) voor meer inlichtingen." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Bedankt voor uw belangstelling voor Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "De Xfce-ontwikkelploeg" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Indien u iemand weet die ontbreekt op deze lijst, aarzel dan niet en doe een foutmelding op ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Dank aan allen die geholpen hebben om deze programmatuur beschikbaar te stellen!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 behoort auteursrechtelijk aan Olivier Fourdan (fourdan@xfce.org). De verschillende onderdelen behoren auteursrechtelijk aan hun respectievelijke makers." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "De pakketten libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs en exo worden beschikbaar gesteld onder de voorwaarden van de GNU Library General Public License zoals gepubliceerd door de Free Software Foundation; hetzij versie 2 van de License, hetzij (naar uw eigen keuze) enige nieuwere versie." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "De pakketten thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop en xfwm4 worden beschikbaar gesteld onder de voorwaarden van de GNU Library General Public License zoals gepubliceerd door de Free Software Foundation; hetzij versie 2 van de License, hetzij (naar uw eigen keuze) enige nieuwere versie." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Tik '%s --help' voor een gebruiksaanwijzing." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Kon GTK+ niet initialiseren." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "De Xfce-ontwikkelploeg. Alle rechten voorbehouden." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Meld fouten a.u.b. aan <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Vertalerslijst vanuit %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Kon gebruikersschil niet laden" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versie %s, gedistribueerd door %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Versie %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Kernontwikkelaars" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Actieve bijdragers" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Servers onderhouden door" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Leiding van de Goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Leiding van de vertalingen" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Vertalers" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Vroegere bijdragers" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Over Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Inlichtingen over de Xfce-werkomgeving" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Over de Xfce-werkomgeving" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Over" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Dankbetuigingen" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Auteursrecht" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licentie" diff -Nru libxfce4ui-4.8.1/po/nn.po libxfce4ui-4.12.1/po/nn.po --- libxfce4ui-4.8.1/po/nn.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/nn.po 2015-02-18 16:12:39.000000000 +0000 @@ -0,0 +1,759 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Eivind Ødegård , 2012 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-11-19 11:04+0000\n" +"Last-Translator: Nick \n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/xfce/language/nn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Greidde ikkje opna nettlesaren for å lesa dokumentasjonen som ligg på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Vil du lesa bruksrettleiinga for %s på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Vil du lesa bruksrettleiinga på nettet?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Dokumentasjon på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Du blir sendt vidare til dokumentasjonssida, der hjelpefilene blir oppdaterte og omsette." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "Les på _Internett" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Alltid gå direkte til dokumentasjonen på nettet" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "Åtvaring" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "Feil" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "Spørsmål" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Greidde ikkje kopla til økthandsamaren: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Økthandsamaren gav ikkje ein gyldig klient-ID" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Arbeidsmappa «%s» finst ikkje. Me kjem ikkje til å bruka henne når me startar «%s»." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Bruk «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Behald «%s»" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Denne snarvegen er alt oppteken av kommandoen «%s». Kva kommando vil du bruka?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Konflikt i handlingane for %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 +msgid "This shortcut is already being used for something else." +msgstr "Denne snarvegen er alt oppteken til noko anna." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Snarveg" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +msgid "Shortcut:" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Meny for vindaugshandlingar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Opp" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Ned" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Venstre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Høgre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Avbryt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Ruller gjennom vindaugo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Ruller gjennom vindaugo (baklengs)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Byt vindaugo for same programmet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Byt program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Lukk vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maksimer vindauga vassrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maksimer vindauga loddrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maksimer vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Gøym vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Flytt vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Endra storleik på vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Skugge på vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Fest vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Hev vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Senk vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Hev eller senk vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fyll vindauga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fyll vindauga vassrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fyll vindauga loddrett" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Slå på over" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Fullskjerm av/på" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Flytt dette vindauga til øvste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Flytt dette vindauga til nedste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Flytt dette vindauga til venstre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Flytt dette vindauga til høgre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Flytt dette vindauga til førre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Flytt dette vindauga til neste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Flytt vindauga til arbeidsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Flytt vindauga til arbeidsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Flytt vindauga til arbeidsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Flytt vindauga til arbeidsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Flytt vindauga til arbeidsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Flytt vindauga til arbeidsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Flytt vindauga til arbeidsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Flytt vindauga til arbeidsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Flytt vindauga til arbeidsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Flytt vindauga til arbeidsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Flytt vindauga til arbeidsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Flytt vindauga til arbeidsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Flislegg vindauga til toppen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Flislegg vindauga til botnen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Flislegg vindauga til venstre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Flislegg vindauga til høgre" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Vis skrivebordet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Øvste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Nedste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Venstre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Høgre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Førre arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Neste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Arbeidsområde 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Arbeidsområde 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Arbeidsområde 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Arbeidsområde 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Arbeidsområde 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Arbeidsområde 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Arbeidsområde 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Arbeidsområde 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Arbeidsområde 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Arbeidsområde 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Arbeidsområde 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Arbeidsområde 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Legg til eit arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Legg til nabo-arbeidsområde" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Slett siste arbeidsområdet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Slett dette arbeidsområdet" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Dialogrute med namn" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Småprogram i Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informasjon om denne utgåva" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Vindaugshandsamar" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programstartarar, vindaugsknappar, programmeny, arbeidsområdebytar og meir." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Endrar bakgrunnsfarga eller -biletet, i tillegg til programmeny eller ikon for minimerte program, startarar, einingar og mapper." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Ein moderne filhandsamar for Unix/Linux-skrivebord, som siktar mot å vera rask og lett å bruka." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Gjenopprettar økta di ved oppstart, og let deg slå av maskina frå Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Innstillingssystem" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Oppsettssystem for å kontrollera ymse deler av skrivebordet, slik som utsjånad, skjerm, tastatur og mus." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Programfinnar" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Viser programma på maskina di, delt inn i kategoriar, så dei er enkle å finna og starta." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Lagringssystem basert på D-bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce er ei samling program som saman lagar eit skrivebordsmiljø med alle funksjonar. Dette er kjerneprogramma åt Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce er ein utviklingsplattform òg, med mange bibliotek som hjelper programmerarar å laga program som høver godt inn i skrivebordsmiljøet." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Alle deler av Xfce er under ein fri eller open kjeldelisens, GPL eller BSDL for program og LGPL eller BSDL for programbibliotek. Sjå på dokumentasjonen, kjeldekoden eller Xfce-nettsida (http://www.xfce.org) for fleire opplysingar." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Takk for at du viser interesse for Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Utviklargruppa bak Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Viss du veit at nokon manglar på denne lista, må du gjerne senda ei feilmelding på " + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Takk til alle som har hjelpt til å laga denne programvara!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 er copyright Olivier Fourdan (fourdan@xfce.org). Dei ulike programskaparane har kopieringsretten til sine eigne program." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Pakkene libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs og exo er under GNU Library General Public-lisensen, gjeven ut av Free Software Foundation; anten verjson 2 av lisensen, eller (om du vil) kva som helst nyare versjon." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Pakkene thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop og xfwm4 er under GNU General Public-lisensen, gjeven ut av Free Software Foundation; anten verjson 2 av lisensen, eller (om du vil) kva som helst nyare versjon." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Klarte ikkje starta GTK+" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Utviklingslaget for Xfce. Alle rettar er reserverte." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Rapporter feil til <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Omsetjarliste frå %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Klarte ikkje å lasta grensesnittet" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versjon %s, gjeven ut av %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Hovudutviklarar" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktive bidragsytarar" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Tenarane blir vedlikehaldne av " + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Styring over tilleggspakka" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Styring over omsetjingane" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Omsetjarar" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Om Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Opplysingar om skrivebordsmiljøet Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Om skrivebordsmiljøet Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Om" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Heider og ære" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Opphavsrett" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lisens" diff -Nru libxfce4ui-4.8.1/po/oc.po libxfce4ui-4.12.1/po/oc.po --- libxfce4ui-4.8.1/po/oc.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/oc.po 2015-02-18 16:12:39.000000000 +0000 @@ -0,0 +1,759 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cedric31 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-11-19 16:07+0000\n" +"Last-Translator: Cedric31 \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/xfce/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Impossible de dobrir lo navigador web per la documentacion en linha" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Volètz consultar lo manual %s en linha ?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Volètz consultar lo manual en linha ?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Documentacion en linha" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Seretz redirigit cap al site de documentacion en linha ont las paginas d'ajuda son mantengudas e tradusidas." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Legir en linha" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Anar _totjorn dirèctament sus la documentacion en linha" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "Informacion" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "Avertiment" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "Error" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "Question" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "ID client del gestionari de sesilha" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "Desactivar lo gestionari de sesilha" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "Opcions del gestionari de sesilha" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "Afichar las opcions del gestionari de sesilha" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Impossible de se connectar al gestionari de sesilha : %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Lo gestionari de sesilha a pas tornat un id client valable" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Lo dorsièr de trabalh « %s » existís pas. Serà pas utilizat a la reobertura de « %s »." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Aqueste acorchi es ja utilizat per l'accion '%s'. Quina accion volètz gardar ?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Utilizar '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Gardar '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Aqueste acorchi es ja utilizat per la comanda '%s'. Quina accion volètz gardar ?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Aqueste acorchi es ja atribuit per l'accion '%s'. Quina accion volètz gardar ?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Se vos plai utilizatz una autra combinason de tòcas." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s desenclava ja aquesta accion." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Accions en conflicte per %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 +msgid "This shortcut is already being used for something else." +msgstr "Aqueste acorchi es ja utilizat per quicòm mai." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "Acorchi d'una accion del gestionari de fenèstras" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "accion" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "Acorchi comanda" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comanda" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Acorchi" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Quichatz ara sus ​las tòcas del clavièr que volètz utilizar per desenclavar %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +msgid "Shortcut:" +msgstr "Acorchi :" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Pas de tòcas quichadas encara, contunhatz." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "Impossible d'accedir al clavièr." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menú de las operacions de las fenèstras" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Naut" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Bas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Alinhat a esquèrra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Alinhat a drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Anullar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Navigar demest las fenèstras" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Navigar demest las fenèstras (òrdre invèrse)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Bascuolar de fenèstra per la meteissa aplicacion" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Bascuolar d'aplicacion" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Tampar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar la fenèstra orizontalament" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar la fenèstra verticalament" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Amagar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Desplaçar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrotlar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Pegar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Montar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Abaissar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Auçar o abaissar la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Espandir la fenèstra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Espandir la fenèstra orizontalament" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Espandir la fenèstra verticalament" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Bascuolar en dessús" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Bascuolar en ecran complet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh a esquèrra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh a drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh precedent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh seguent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Desplaçar la fenèstra cap a l'espaci de trabalh 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Agençar la fenèstra en mosaïca cap amont" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Agençar la fenèstra en mosaïca cap amont" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Agençar la fenèstra en mosaïca cap a esquèrra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Agençar la fenèstra en mosaïca cap a drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Afichar lo burèu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Espaci de trabalh superior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Espaci de trabalh inferior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Espaci de trabalh a esquèrra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Espaci de trabalh a drecha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Espaci de trabalh precedent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Espaci de trabalh seguent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Espaci de trabalh 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Espaci de trabalh 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Espaci de trabalh 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Espaci de trabalh 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Espaci de trabalh 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Espaci de trabalh 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Espaci de trabalh 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Espaci de trabalh 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Espaci de trabalh 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Espaci de trabalh 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Espaci de trabalh 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Espaci de trabalh 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Apondre un espaci de trabalh" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Apondre un espaci de trabalh adjacent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Suprimir lo darrièr espaci de trabalh" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Suprimir l'espaci de trabalh actiu" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Dialòg intitulat" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Sostítol" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Widgets Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informacions sus la version" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestionari de fenèstras" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gerís lo plaçament de las fenèstras sus l'ecran." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panèl" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Aviadors de programa, botons de las fenèstras, menú de las aplicacions, cambiador d'espaci de trabalh e mai." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestionari del burèu" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Definís la color o l'image de rèire plan amb de menús o d'icònas opcionalas per las aplicacions minimizadas o los aviadors, periferics e dorsièrs." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gestionari de fichièrs " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un gestionari de fichièr modèrne pels burèus Unix/Linux, dins la tòca d'èsser de bon utilizar e rapid." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gestionari de sesilhas" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restablís vòstra sesilha a l'aviada e vos permet d'atudar l'ordenador dempuèi Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Paramètres sistèma" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Sistèma de configuracion que contraròtla diferents aspèctes del burèu tals coma l'aparéncia, l'ecran o los paramètres del clavièr e de la mirga." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Lista de las aplicacions" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Aficha las aplicacions installadas sus vòstre sistèma en categorias, de sòrta que las podètz trobar rapidament e las aviar." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Paramètres demòni" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistèma d'emmagazinatge de configuracion basat sus D-Bus" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce es un ensemble de programas que, ensemble, provesisson un environament de burèu complet. Los programas seguents fan partida del còr de Xfce :" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce es tanben una plataforma de desvolopament que provesís mantuna bibliotèca qu'ajudan los programators a crear d'aplicacions que s'intègran perfièchament dins l'environament de burèu." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Los components Xfce son enregistrats jos licéncias gratuitas o open source; GPL o BSDL per las aplicacions e LGPL o BSDL per las bibliotècas. Agachatz la documentacion, lo còde font o lo site web de Xfce (http://www.xfce.org) per mai d'informacions." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Mercé per l'interès portat à Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "L'equipa de desvolopament Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Se coneissètz qualqu'un de mancant dins aquesta lista; esitetz pas e emplenatz un bug sus ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Mercé a totes los qu'an ajuda a rendre aqueste logicial disponible !" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Los dreches d'autor de Xfce 4 apartenon a Olivier Fourdan (fourdan@xfce.org). Los diferents components son protegits per copyright per lors autors respectius." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Los paquets libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs e exo son distribuits jols tèrmes de la GNU Library General Public License tala coma publica per la Free Software Foundation; que siá en version 2, o (coma volètz) tota version ulteriora." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Los paquets thunar, xfce4-appfinder, xfce4-panel, xfce4-sesilha, xfce4-settings, xfce-utils, xfconf, xfdesktop e xfwm4 son distribuits jols tèrmes de la GNU General Public License tala coma publicada per la Free Software Foundation; que siá en version 2, o (coma volètz) tota version ulteriora." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Picatz '%s --help' per las informacions d'utilizacion." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Incapable d'inicializar GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "L'equipa de desvolopament Xfce. Totes los dreches reservats." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Se vos plai senhalatz los bugs a <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Lista dels traductors dempuèi %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Impossible de cargar l'interfàcia" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distribuida per %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Desvolopaires del còr" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Contributors actius" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servidors mantenguts per" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervision dels goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervision de las traduccions" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Traductors" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Precedents contributors" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "A prepaus de Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informacion a prepaus de l'environament de burèu Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "A prepaus de l'environament de burèu Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "A prepaus" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Crèdits" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licéncia" diff -Nru libxfce4ui-4.8.1/po/pa.po libxfce4ui-4.12.1/po/pa.po --- libxfce4ui-4.8.1/po/pa.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/pa.po 2013-10-04 08:51:42.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" "PO-Revision-Date: 2010-04-06 06:34+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -17,54 +17,85 @@ "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "ਜਾਣਕਾਰੀ" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" -msgstr "ਚੇਤਾਵਨੀ" +msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "ਗਲਤੀ" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "ਸਵਾਲ" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "Session management client ID" msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ ਕਲਾਇਟ ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1404 msgid "Disable session management" msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ ਆਯੋਗ" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1414 msgid "Session management options" msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ ਚੋਣਾਂ" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1415 msgid "Show session management options" msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ ਚੋਣਾਂ ਵੇਖੋ" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid "Session manager did not return a valid client id" msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨੇ ਢੁੱਕਵਾਂ ਕਲਾਇਟ id ਨਹੀਂ ਦਿੱਤਾ" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" @@ -72,103 +103,726 @@ msgstr "" "ਵਰਕਿੰਗ ਡਾਇਰੈਕਟਰੀ \"%s\" ਮੌਜੂਦ ਨਹੀਂ ਹੈ। ਇਹ ਵਰਤੀ ਨਹੀਂ ਜਾ ਸਕਦੀ, ਜਦੋਂ \"%s\" ਸਵੈਪ ਕਰਨੀ ਹੋਵੇ।" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" msgstr "" -"ਇਹ ਸ਼ਾਰਟਕੱਟ ਵਿੰਡੋ ਮੈਨੇਜਰ ਐਕਸ਼ਨ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਕਿਹੜੇ ਐਕਸ਼ਨ ਲਈ ਤੁਸੀਂ ਵਰਤਣਾ " -"ਚਾਹੁੰਦੇ ਹੋ?" +"ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਹੈ !\n" +" ਕੀ ਤੁਸੀ ਯਕੀਨਨ ਇਸ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' ਵਰਤੋਂ" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "ਹੋਰ ਲਈ ਰੱਖੋ" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format +msgid "Keep '%s'" +msgstr "'%s' ਰੱਖੋ" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" msgstr "" -"ਇਹ ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਕਮਾਂਡ '%s' ਲਈ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਕਿਹੜੇ ਐਕਸ਼ਨ ਲਈ ਤੁਸੀਂ ਵਰਤਣਾ ਚਾਹੁੰਦੇ " -"ਹੋ?" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "'%s' ਰੱਖੋ" +"ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਹੈ !\n" +" ਕੀ ਤੁਸੀ ਯਕੀਨਨ ਇਸ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, fuzzy, c-format msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -"ਇਹ ਸ਼ਾਰਟਕੱਟ ਵਿੰਡੋ ਮੈਨੇਜਰ ਐਕਸ਼ਨ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਕਿਹੜੇ ਐਕਸ਼ਨ ਲਈ ਤੁਸੀਂ ਵਰਤਣਾ " -"ਚਾਹੁੰਦੇ ਹੋ?" +"ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਹੈ !\n" +" ਕੀ ਤੁਸੀ ਯਕੀਨਨ ਇਸ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ ਐਕਸ਼ਨ ਰੱਖੋ" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s ਲਈ ਐਕਸ਼ਨ ਅਪਵਾਦ" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 +#, fuzzy msgid "This shortcut is already being used for something else." -msgstr "ਇਹ ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਕਿਸੇ ਹੋਰ ਲਈ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ।" +msgstr "" +"ਸ਼ਾਰਟਕੱਟ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਹੈ !\n" +" ਕੀ ਤੁਸੀ ਯਕੀਨਨ ਇਸ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ?" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy msgid "Window Manager Action Shortcut" -msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ ਐਕਸ਼ਨ ਸ਼ਾਰਟਕੱਟ" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "ਐਕਸ਼ਨ:" +msgstr "Xfce 4 ਵਿੰਡੋ ਮੈਨੇਜਰ ਸੈਟਿੰਗ" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "ਸਰਗਰਮ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy msgid "Command Shortcut" -msgstr "ਕਮਾਂਡ ਸ਼ਾਰਟਕੱਟ" +msgstr "ਸ਼ਾਰਟਕੱਟ ਭੇਜੋ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "ਕਮਾਂਡ:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "ਕਮਾਂਡ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +#, fuzzy msgid "Shortcut" -msgstr "ਸ਼ਾਰਟਕੱਟ" +msgstr "ਕੋਈ ਸ਼ਾਰਟਕੱਟ ਨਹੀਂ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy msgid "Shortcut:" -msgstr "ਸ਼ਾਰਟਕੱਟ:" +msgstr "ਕੋਈ ਸ਼ਾਰਟਕੱਟ ਨਹੀਂ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "ਕੀਬੋਰਡ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।" +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "ਵਿੰਡੋ ਓਪਰੇਸ਼ਨ ਮੇਨੂ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "ਖੱਬਾ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "ਸੱਜਾ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "ਰੱਦ ਕਰੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "ਵਿੰਡੋ ਸਾਇਕਲ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +#, fuzzy +msgid "Cycle windows (Reverse)" +msgstr "ਵਿੰਡੋ ਸਾਇਕਲ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "ਵਿੰਡੋ ਬੰਦ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "ਵਿੰਡੋ ਖਤਿਜੀ ਅਧਿਕਤਮ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "ਵਿੰਡੋ ਲੰਬਕਾਰੀ ਅਧਿਕਤਮ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "ਵਿੰਡੋ ਅਧਿਕਤਮ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "ਵਿੰਡੋ ਓਹਲੇ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +#, fuzzy +msgid "Move window" +msgstr "ਵਿੰਡੋ ਉੱਪਰ ਹਿਲਾਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +#, fuzzy +msgid "Resize window" +msgstr "ਵਿੰਡੋ ਉੱਪਰ ਮੁੜ ਆਕਾਰ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "ਵਿੰਡੋ ਛਾਂ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "ਉੱਭਰਿਆ ਵਿੰਡੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "ਵਿੰਡੋ ਪੇਸ਼ਗੀ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "ਹੇਠਲਾ ਵਿੰਡੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "ਵਿੰਡੋ ਪੇਸ਼ਗੀ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +#, fuzzy +msgid "Fill window" +msgstr "ਵਿੰਡੋ ਓਹਲੇ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +#, fuzzy +msgid "Fill window horizontally" +msgstr "ਵਿੰਡੋ ਖਤਿਜੀ ਅਧਿਕਤਮ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +#, fuzzy +msgid "Fill window vertically" +msgstr "ਵਿੰਡੋ ਲੰਬਕਾਰੀ ਅਧਿਕਤਮ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "ਪੂਰਾ-ਪਰਦਾ ਲਿਆਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "ਵਿੰਡੋ ਉੱਪਰਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "ਵਿੰਡੋ ਹੇਠਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "ਵਿੰਡੋ ਖੱਬੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "ਵਿੰਡੋ ਸੱਜੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "ਵਿੰਡੋ ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਆਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "ਵਿੰਡੋ ਅਗਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਆਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +#, fuzzy +msgid "Move window to workspace 1" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +#, fuzzy +msgid "Move window to workspace 2" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +#, fuzzy +msgid "Move window to workspace 3" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +#, fuzzy +msgid "Move window to workspace 4" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +#, fuzzy +msgid "Move window to workspace 5" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +#, fuzzy +msgid "Move window to workspace 6" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +#, fuzzy +msgid "Move window to workspace 7" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +#, fuzzy +msgid "Move window to workspace 8" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +#, fuzzy +msgid "Move window to workspace 9" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +#, fuzzy +msgid "Move window to workspace 10" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +#, fuzzy +msgid "Move window to workspace 11" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +#, fuzzy +msgid "Move window to workspace 12" +msgstr "ਵਿੰਡੋ ਵਰਕਸਪੇਸ %d 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "ਵਿੰਡੋ ਖੱਬੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "ਵਿੰਡੋ ਹੇਠਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਭੇਜੋ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "ਵਿੰਡੋ ਖੱਬੇ ਮੁੜ ਆਕਾਰ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "ਵਿੰਡੋ ਸੱਜੇ ਮੁੜ ਆਕਾਰ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "ਡਿਸਕਟਾਪ ਵੇਖਾਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "ਅੱਪਰ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "ਬਾਟਮ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "ਖੱਬਾ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "ਸੱਜੇ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "ਪਿਛਲਾ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "ਅਗਲਾ ਵਰਕਸਪੇਸ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +#, fuzzy +msgid "Workspace 1" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +#, fuzzy +msgid "Workspace 2" +msgstr "ਵਰਕਸਪੇਸ %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +#, fuzzy +msgid "Workspace 3" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +#, fuzzy +msgid "Workspace 4" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +#, fuzzy +msgid "Workspace 5" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +#, fuzzy +msgid "Workspace 6" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +#, fuzzy +msgid "Workspace 7" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +#, fuzzy +msgid "Workspace 8" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +#, fuzzy +msgid "Workspace 9" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +#, fuzzy +msgid "Workspace 10" +msgstr "ਵਰਕਸਪੇਸ %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +#, fuzzy +msgid "Workspace 11" +msgstr "ਵਰਕਸਪੇਸ %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +#, fuzzy +msgid "Workspace 12" +msgstr "ਵਰਕਸਪੇਸ %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "ਵਰਕਸਪੇਸ ਸ਼ਾਮਿਲ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +#, fuzzy +msgid "Add adjacent workspace" +msgstr "ਵਰਕਸਪੇਸ ਸ਼ਾਮਿਲ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +#, fuzzy +msgid "Delete last workspace" +msgstr "ਵਰਕਸਪੇਸ ਹਟਾਓ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +#, fuzzy +msgid "Delete active workspace" +msgstr "ਵਰਕਸਪੇਸ ਹਟਾਓ" + #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "ਸਬ-ਟਾਈਟਲ" +#, fuzzy +msgid "Titled Dialog" +msgstr "ਸਿਰਲੇਖ ਫੋਂਟ" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "ਟਾਈਲ ਕੀਤਾ ਡਾਈਲਾਗ" +#, fuzzy +msgid "Subtitle" +msgstr "ਸਿਰਲੇਖ" #: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy msgid "Xfce 4 Widgets" -msgstr "Xfce 4 ਵਿਦਜੈੱਟ" +msgstr "Xfce 4 ਵਿੰਡੋ ਮੈਨੇਜਰ ਸੈਟਿੰਗ" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "ਮੁੜ ਆਕਾਰ ਦੇਣ ਉਪਰੰਤ ਝਰੋਖੇ ਦੇ ਸੰਖੇਪ ਵਿਖਾਓ" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (%s ਉੱਤੇ)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +#, fuzzy +msgid "Translators" +msgstr "ਟਰਾਂਸਪੇਰਟ" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "ਪਿਛਲਾ ਵਰਕਸਪੇਸ" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" + +msgid "Keep the other one" +msgstr "ਹੋਰ ਲਈ ਰੱਖੋ" -#~ msgid "%s" -#~ msgstr "%s" +msgid "%s" +msgstr "%s" diff -Nru libxfce4ui-4.8.1/po/pl.po libxfce4ui-4.12.1/po/pl.po --- libxfce4ui-4.8.1/po/pl.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/pl.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,163 +1,780 @@ # 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. -# +# +# Translators: +# Piotr Sokół , 2011-2013 +# Piotr Strębski , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2007-01-20 23:10+0200\n" -"Last-Translator: Piotr Maliński \n" -"Language-Team: Polish \n" -"Language: pl\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-13 12:51+0000\n" +"Last-Translator: Piotr Strębski \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/libxfce4ui/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Nie udało się uruchomić przeglądarki internetowej, w celu wyświetlenia dokumentacji sieciowej" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Wyświetlić podręcznik sieciowy programu %s?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Wyświetlić podręcznik sieciowy?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Dokumentacja sieciowa" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Przeglądarka otworzy stronę dokumentacji, na której tworzone są podręczniki użytkownika i gdzie następuje ich tłumaczenie." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Wyświetl podręcznik" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Pomijanie tego pytania w przyszłości" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informacja" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Ostrzeżenie" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Błąd" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Pytanie" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "" +msgstr "Identyfikator klienta zarządzania sesją" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" -msgstr "" +msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "" +msgstr "Wyłącz zarządzanie sesją" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "" +msgstr "Opcje zarządzania sesją" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "" +msgstr "Pokaż opcje zarządzania sesją" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "" +msgstr "Nie udało się połączyć z menadżerem sesji: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "" +msgstr "Menadżer sesji nie zwrócił poprawnego identyfikatora klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Katalog roboczy „%s” nie istnieje. Nie zostanie on użyty podczas wywoływania „%s”." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ten skrót jest już przypisany do czynności „%s”. Co zrobić?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "" +msgstr "Użyj „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Zachowaj „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" +msgstr "Ten skrót jest już przypisany do polecenia „%s”. Co zrobić?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Ten skrót jest już przypisany do czynności „%s”. Co zrobić?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Proszę wprowadzić inną kombinację klawiszy." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Wykonanie tej czynności zostało już przypisane do skrótu %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "" +msgstr "Konflikt działania skrótu klawiszowego %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "" +msgstr "Ten skrót klawiszowy jest już używany." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "" +msgstr "Skrót klawiszowy czynności menedżera okien" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "czynności" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "" +msgstr "Skrót klawiszowy" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "polecenia" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "" +msgstr "Skrót" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Anuluj" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Proszę wcisnąć kombinację klawiszy służącą do wywołania %s „%s”." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "" +msgstr "Skrót:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nie wciśnięto żadnego klawisza." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "" +msgstr "Nie można przechwycić klawiatury." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Wyświetlenie menu poleceń" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Góra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Dół" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Lewo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Prawo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Anulowanie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Przełączenie pomiędzy oknami" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Przełączenie pomiędzy oknami w odwrotnej kolejności" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Przełączenie okna bieącego programu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Przełączenie okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zamknięcie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Zmaksymalizowanie w poziomie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Zmaksymalizowanie w pionie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Zmaksymalizowanie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Zminimalizowanie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Przemieszczenie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Zmienienie rozmiaru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Zwinięcie lub rozwinięcie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Przełączenie wyświetlania na wszystkich obszarach roboczych" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Przemieszczenie na wierzch" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Przemieszczenie na spód" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Przemieszczenie na wierzch lub spód" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Wypełnienie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Wypełnienie w poziomie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Wypełnienie w pionie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Przełączenie zawsze na wierzchu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Przełączenie pełnego ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Przemieszczenie na górny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Przemieszczenie na dolny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Przemieszczenie na lewy obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Przemieszczenie na prawy obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Przemieszczenie na poprzedni obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Przemieszczenie na następny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Przemieszczenie na obszar roboczy 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Przemieszczenie na obszar roboczy 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Przemieszczenie na obszar roboczy 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Przemieszczenie na obszar roboczy 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Przemieszczenie na obszar roboczy 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Przemieszczenie na obszar roboczy 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Przemieszczenie na obszar roboczy 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Przemieszczenie na obszar roboczy 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Przemieszczenie na obszar roboczy 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Przemieszczenie na obszar roboczy 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Przemieszczenie na obszar roboczy 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Przemieszczenie na obszar roboczy 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Dopasowanie do górnej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Dopasowanie do dolnej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Dopasowanie do lewej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Dopasowanie do prawej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Dopasowanie do górnej-lewej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Dopasowanie do górnej-prawej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Dopasowanie do dolnej-lewej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Dopasowanie do dolnej-prawej krawędzi ekranu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Wyświetlenie pulpitu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Przełączenie na górny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Przełączenie na dolny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Przełączenie na lewy obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Przełączenie na prawy obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Przełączenie na poprzedni obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Przełączenie na następny obszar roboczy" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Przełączenie na obszar roboczy 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Przełączenie na obszar roboczy 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Przełączenie na obszar roboczy 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Przełączenie na obszar roboczy 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Przełączenie na obszar roboczy 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Przełączenie na obszar roboczy 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Przełączenie na obszar roboczy 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Przełączenie na obszar roboczy 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Przełączenie na obszar roboczy 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Przełączenie na obszar roboczy 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Przełączenie na obszar roboczy 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Przełączenie na obszar roboczy 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Dodanie obszaru roboczego" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Dodanie przyległego obszaru roboczego" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Usunięcie ostatniego obszaru roboczego" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Usunięcie bieżącego obszaru roboczego" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "" +msgid "Titled Dialog" +msgstr "Treść tytułowa" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" +msgid "Subtitle" +msgstr "Podtytuł" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "" +msgstr "Widżety Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Wypisuje informacje o wersji i kończy" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Menedżer okien" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Zarządza położeniem okien na ekranie." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Przechowuje i wyświetla rozmaite aplety takie jak aktywatory, przyciski okien, podgląd obszarów roboczych i inne." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Menedżer pulpitu" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Konfiguruje tło pulpitu oraz udostępnia jego zawartość taką jak ikony, menu okna głównego czy lista okien." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Menedżer okien" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Zarządza zawartością sytemu plików, wyróżniając się szybkością i prostotą obsługi." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Menedżer sesji" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Przywraca sesje po uruchomieniu komputera i umożliwia zarządzanie nią." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Menedżer ustawień" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Konfiguruje różne cechy środowiska, takiej jak jego wygląd, ustawienia ekranu, klawiatury i myszy." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Wyszukiwarka programów" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Wyświetla programy zainstalowane w systemie rozmieszczone w kategoriach, w celu ich szybkiego odnalezienia i uruchomienia." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Demon ustawień" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Przechowuje konfiguracje programów w oparciu o system komunikacji D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce jest zestawem programów, które używane razem, oferują kompletne środowisko graficzne. Do podstawowych programów środowiska Xfce należą:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce jest również platformą programistyczną, która dostarcza kilka bibliotek ułatwiających programistom tworzenie programów dobrze dopasowanych do środowiska graficznego." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponenty Xfce są rozprowadzane na warunkach darmowych lub wolnych licencji; GPL lub BSDL dla programów i LGPL i BSDL dla bibliotek. Proszę zapoznać się z dokumentacją, kodem źródłowym lub zawartością strony internetowej (http://www.xfce.org) w celu uzyskania większej ilości informacji." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Dziękujemy za zainteresowanie projektem Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Zespół twórców Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Jeśli ktoś jeszcze powinien znaleźć się na powyższej liście, prosimy o zgłoszenie tego faktu pod adresem ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Dziękujemy wszystkim, którzy przyczynili się do stworzenia niniejszego oprogramowania." + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Właścicielem praw autorskich Xfce4 jest Olivier Fourdan (fourdan@xfce.org). Właścicielami praw autorskich poszczególnych komponentów środowiska są ich twórcy." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Pakiety libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs i exo są rozprowadzane na warunkach Powszechnej Licencji Publicznej GNU Library, wydanej przez Free Software Foundation - według wersji drugiej tej licencji lub którejś z późniejszych wersji." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Pakiety thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop i xfwm4 są rozprowadzane na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Free Software Foundation - według wersji drugiej tej licencji lub którejś z późniejszych wersji." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Nie można zainicjować GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Zespół twórców Xfce. Wszystkie prawa zastrzeżone." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Proszę zgłaszać błędy na adres <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Listę tłumaczy wygenerowano w dn. %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Nie udało się wczytać interfejsu" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Wydanie %s, dostarczone przez %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Dotyczy wersji %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Główni programiści" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Bieżący współpracownicy" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Opiekunowie serwerów" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Nadzorcy dodatków" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Nadzorcy tłumaczeń" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Tłumacze" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Byli współpracownicy" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "O środowisku Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Wyświetla informacje o środowisku graficznym Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Informacje o środowisku graficznym Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Informacje" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Zasługi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Prawa autorskie" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licencja" diff -Nru libxfce4ui-4.8.1/po/POTFILES.in libxfce4ui-4.12.1/po/POTFILES.in --- libxfce4ui-4.8.1/po/POTFILES.in 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/POTFILES.in 2013-10-04 08:51:42.000000000 +0000 @@ -17,9 +17,18 @@ libxfce4kbd-private/xfce-shortcut-dialog.c libxfce4kbd-private/xfce-shortcuts-grabber.c libxfce4kbd-private/xfce-shortcuts-provider.c +libxfce4kbd-private/xfce-shortcuts-xfwm4.c # # Support for GtkBuilder # glade/libxfce4ui-glade.c glade/libxfce4ui.xml.in + +# +# Xfce4-about +# +xfce4-about/main.c +xfce4-about/contributors.h +xfce4-about/xfce4-about.desktop.in +xfce4-about/xfce4-about-dialog.glade diff -Nru libxfce4ui-4.8.1/po/pt_BR.po libxfce4ui-4.12.1/po/pt_BR.po --- libxfce4ui-4.8.1/po/pt_BR.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/pt_BR.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,175 +1,764 @@ -# Portuguese translations for libxfce package. -# Copyright (C) 2008 THE libxfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce package. -# Fábio Nogueira , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# André Miranda , 2015 +# Fábio Nogueira , 2008 msgid "" msgstr "" -"Project-Id-Version: libxfce 4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-12-18 08:58-0500\n" -"Last-Translator: Og Maciel \n" -"Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-20 02:33+0000\n" +"Last-Translator: André Miranda \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/libxfce4ui/language/pt_BR/)\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" +"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Falha ao abrir o navegador web para mostrar a documentação online" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Você quer ler online o manual do %s?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Você quer ler o manual online?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentação online" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Você será redirecionado ao site de documentação, onde as páginas de ajuda são mantidas e traduzidas." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Ler online" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Sempre ir direto para a documentação online" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Informação" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Aviso" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Erro" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Pergunta" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID do cliente de gerenciamento de sessão" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Desabilitar o gerenciamento de sessão" +msgstr "Desabilitar gerenciamento de sessão" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opções de gerenciamento de sessão" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Mostra as opções de gerenciamento de sessão" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Falhou ao conectar ao gerenciador de sessão: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "O gerenciador de sessão não retornou um ID de cliente válido" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"O diretório de trabalho \"%s\" não existe. Ele não será usado quando gerando " +"Working directory \"%s\" does not exist. It won't be used when spawning " "\"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Este atalho já está sendo usado para uma outra ação do gerenciador de " -"janelas. Qual ação você deseja usar?" +msgstr "O diretório de trabalho \"%s\" não existe. Ele não será usado quando gerando \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Este atalho já está em uso por a ação \"%s\". Qual ação você deseja usar?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Usar \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Manter a outra" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Manter \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Este atalho já está sendo usado para o comando \"%s\". Qual ação você deseja " -"usar?" +msgstr "Este atalho já está em uso pelo comando \"%s\". Qual ação você deseja usar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Manter \"%s\"" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Este atalho já está sendo usado por uma ação do gerenciador de janelas. Qual " -"ação você deseja usar?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Este atalho já está em uso pela ação \"%s\". Qual ação você deseja usar?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Por favor, use outra combinação de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Manter a ação do gerenciador de janelas" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s já executa essa ação." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Ações em conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Este atalho já está sendo usado para algo." +msgstr "Este atalho já está em uso para outra coisa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Atalho de ações do gerenciador de janelas" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Ação:" +msgstr "Atalho de ação do gerenciador de janelas" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "ação" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Atalho do comando" +msgstr "Atalho de comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Atalho" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Pressione agora as teclas do teclado que você gostaria de usar para executar %s \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Atalho:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nenhuma tecla pressionada ainda. Proceda." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Não foi possível capturar o teclado." +msgstr "Não foi possível capturar o teclado:" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtítulo" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu de operações da janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Para cima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Para baixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Circular janelas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Circular janelas (inversamente)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Alternar janela para o mesmo aplicativo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Alternar aplicativo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Fechar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar janela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar janela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ocultar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mover janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrolar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Fixar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Levantar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Baixar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Levantar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Preencher janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Preencher janela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Preencher janela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Alternar \"Sempre no topo\"" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Alternar tela cheia" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mover a janela para o espaço de trabalho acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mover a janela para o espaço de trabalho abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mover a janela para o espaço de trabalho à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mover a janela para o espaço de trabalho à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mover a janela para o espaço de trabalho anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mover a janela para o espaço de trabalho seguinte" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mover a janela para o espaço de trabalho 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mover a janela para o espaço de trabalho 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mover a janela para o espaço de trabalho 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mover a janela para o espaço de trabalho 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mover a janela para o espaço de trabalho 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mover a janela para o espaço de trabalho 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mover a janela para o espaço de trabalho 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mover a janela para o espaço de trabalho 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mover a janela para o espaço de trabalho 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mover a janela para o espaço de trabalho 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mover a janela para o espaço de trabalho 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mover a janela para o espaço de trabalho 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Posicionar a janela no topo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Posicionar a janela abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Posicionar a janela à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Posicionar a janela à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Mostrar área de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Espaço de trabalho acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Espaço de trabalho abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Espaço de trabalho à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Espaço de trabalho à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Espaço de trabalho anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Espaço de trabalho seguinte" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Espaço de trabalho 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Espaço de trabalho 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Espaço de trabalho 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Espaço de trabalho 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Espaço de trabalho 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Espaço de trabalho 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Espaço de trabalho 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Espaço de trabalho 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Espaço de trabalho 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Espaço de trabalho 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Espaço de trabalho 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Espaço de trabalho 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Adicionar espaço de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Adicionar espaço de trabalho adjacente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Excluir o último espaço de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Excluir o espaço de trabalho ativo" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Diálogo com título" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Legenda" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Componentes do Xfce 4" +msgstr "Widgets do Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informações de versão" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gerenciador de Janelas" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Controla o localização das janelas na tela." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Painel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Lançadores de programas, botões de janelas, menu de aplicativos, alternador de espaço de trabalho e mais." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gerenciador de janelas" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Define a cor do plano de fundo ou imagem com menu de aplicativo opcional ou ícones para aplicativos minimizados ou lançadores, dispositivos e pastas." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gerenciador de arquivos" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Um gerenciador de arquivos moderno para Unix/Linux visando ser rápido e fácil de usar." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gerenciador de sessão" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura sua sessão ao iniciar e permite que você desligue o computador a partir do Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Configurações do sistema" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Configuração do sistema para controlar vários aspectos da área de trabalho como: aparência, tela, teclado e configurações do mouse." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Pesquisador de aplicativos" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Mostra os aplicativos instalados em seu sistema na forma de categorias para que você possa pesquisar e lançá-los." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Daemon de configurações" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema de armazenamento baseado em D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce é uma coleção de programas que juntos, disponibilizam um ambiente de área de trabalho repleto de recursos. Os programas a seguir são parte do núcleo do Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "O Xfce também é uma plataforma de desenvolvimento disponibilizando diversas bibliotecas que ajudam programadores a criarem aplicativos que interajam com o ambiente de área de trabalho." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Os componentes do Xfce são licenciados sob licenças livres ou de código aberto. GPL ou BSDL para aplicativos e LGPL ou BSDL para bibliotecas. Veja a documentação, o código fonte ou o site do Xfce (http://www.xfce.org) para mais informações." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Obrigado pelo seu interesse no Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Time de desenvovimento do Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Se você sabe de alguma coisa faltando nesta lista, não hesite e preencha um relatório de erros em ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Obrigado a todos aqueles que ajudaram tornar este software disponível." + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "O Xfce 4 é uma marca registrada de Olivier Fourdan (fourdan@xfce.org). Os componentes diferentes são marcas registradas de seus respectivos autores." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Os pacotes libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs e exo são distribuídos sob os termos da Licença Pública Geral GNU como publicado pela Free Software Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer versão posterior." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop e xfwm4 são distribuídos sob os termos da Licença Pública Geral GNU como publicado pela Free Software Foundation, assim como a versão 2 da licença ou (à sua opção) qualquer versão posterior." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Digite \"%s --help\" para as informações de uso." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Impossível inicializar GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Time de desenvolvimento do Xfce. Todos os direitos reservados." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Por favor, relate erros para <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Lista de tradução de %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Falhou ao carregar a interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versão %s, distribuída por %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versão %s" -#~ msgid "%s" -#~ msgstr "%s" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Desenvolvedores principais" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Contribuidores ativos" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servidores mantidos por" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervisão dos \"Goodies\"" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervisão de traduções" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Tradutores" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Contribuidores anteriores" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Sobre o Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informação sobre o Ambiente de área de trabalho Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Sobre o Ambiente de área de trabalho Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Sobre" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Créditos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licença" diff -Nru libxfce4ui-4.8.1/po/pt.po libxfce4ui-4.12.1/po/pt.po --- libxfce4ui-4.8.1/po/pt.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/pt.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,173 +1,779 @@ -# European Portuguese translation for libxfce4ui. +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Nuno Miguel , 2008, 2009. -# +# +# Translators: +# Nuno Miguel , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-11-11 16:05+0100\n" -"Last-Translator: Nuno Miguel \n" -"Language-Team: \n" -"Language: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-13 12:57+0000\n" +"Last-Translator: Nuno Miguel \n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/libxfce4ui/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: PORTUGAL\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-Language: Portuguese\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Falhou a abertura do navegador web para a documentação" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Pretende ler o manual de %s na Internet?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Pretende ler o manual na Internet?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentação na Internet" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Será direcionado para a página de documentação na Internet, na qual as páginas de ajuda são produzidas e traduzidas." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Le_r na Internet" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Abrir sempre a documentação na Internet" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Informação" +msgstr "Informações" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Aviso" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Erro" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Questão" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID do cliente de gestão de sessão" +msgstr "ID do gestor de sessões" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Desactivar gestão de sessão" +msgstr "Desativar gestão de sessões" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Opções da gestão de sessão" +msgstr "Opções da gestão de sessões" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Mostrar opções de gestão de sessão" +msgstr "Mostrar opções da gestão de sessões" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Falha ao ligar ao gestor da sessão: %s" +msgstr "Falha ao ligar ao gestor da sessões: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "O gestor de sessão não devolveu uma id de cliente válida" +msgstr "O gestor de sessões não devolveu uma identificação válida" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"O directório de trabalho \"%s\" não existe. Não será usado ao criar \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Este atalho já está a ser utilizado por outra acção do gestor de janelas. " -"Que acção pretende utilizar?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "O diretório de trabalho \"%s\" não existe. Não será usado ao criar \"%s\"" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Este atalho já está a ser utilizado pelo comando \"%s\". Que ação pretende utilizar?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Utilizar \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Manter o outro" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Manter \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Este atalho já está a ser utilizado pelo comando '%s'. Que acção pretende " -"utilizar?" +msgstr "Este atalho já está a ser utilizado pelo comando \"%s\". Que ação pretende utilizar?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Manter \"%s\"" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Este atalho já está a ser utilizado por uma acção do gestor de janelas. Que " -"acção pretende utilizar?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Este atalho já está a ser utilizado pelo comando \"%s\". Que ação pretende utilizar?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Por favor escolha outra combinação de teclas." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Manter a acção do gestor de janelas" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Esta ação já é ativada por %s." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" -msgstr "Acções em conflito para %s" +msgstr "Ações em conflito para %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Este atalho já está a ser utilizado para outra coisa." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Atalho para acções do gestor de janelas" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Acção:" +msgstr "Atalho da ação do gestor de janelas" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "ação" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Atalho do comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Atalho" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Prima as teclas que quer utilizar como ativar %s \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Atalho:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nenhuma tecla premida, continuar." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Incapaz de capturar o teclado." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Legenda" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Menu de operações da janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Subir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Descer" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Cancelar" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Percorrer janelas" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Percorrer janelas (invertido)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Trocar janela para a mesma aplicação" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Trocar aplicação" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Fechar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizar janela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizar janela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ocultar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mover janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Enrolar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Prender janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Colocar janela à frente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Colocar janela atrás" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Subir ou baixar janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Preencher janela" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Preencher janela horizontalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Preencher janela verticalmente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Colocar por cima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Trocar para ecrã completo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mover janela para a área de trabalho acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mover janela para a área de trabalho abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mover janela para a área de trabalho à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mover janela para a área de trabalho à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mover janela para a área de trabalho anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mover janela para a área de trabalho seguinte" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mover janela para a área de trabalho 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mover janela para a área de trabalho 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mover janela para a área de trabalho 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mover janela para a área de trabalho 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mover janela para a área de trabalho 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mover janela para a área de trabalho 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mover janela para a área de trabalho 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mover janela para a área de trabalho 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mover janela para a área de trabalho 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mover janela para a área de trabalho 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mover janela para a área de trabalho 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mover janela para a área de trabalho 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Janela em mosaico para cima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Janela em mosaico para baixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Janela em mosaico para a esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Janela em mosaico para a direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Janela em moscaico no topo à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Janela em mosaico no topo à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Janela em mosaico em baixo à esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Janela em mosaico em baixo à direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Mostrar ambiente de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Área de trabalho acima" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Área de trabalho abaixo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Área de trabalho esquerda" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Área de trabalho direita" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Área de trabalho anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Área de trabalho seguinte" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Área de trabalho 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Área de trabalho 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Área de trabalho 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Área de trabalho 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Área de trabalho 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Área de trabalho 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Área de trabalho 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Área de trabalho 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Área de trabalho 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Área de trabalho 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Área de trabalho 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Área de trabalho 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Adicionar área de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Adicionar área de trabalho adjacente" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Apagar última área de trabalho" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Apagar área de trabalho ativa" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Diálogo titulado" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtítulo" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "\"Widgets\" Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informações da versão" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Gestor de janelas" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gere o posicionamento das janelas no ecrã." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Painel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Lançadores de programas, botões de janelas, menu de aplicações, áreas de trabalho e mais." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Gestor de janelas" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Define a cor ou imagem de fundo, com o menu de aplicações opcional ou ícones para as aplicações ou lançadores minimizados, dispositivos e pastas." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Gestor de ficheiros" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Um gestor de ficheiros moderno para os ambientes de trabalho Unix/Linux, criado para ser rápido e fácil de utilizar." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Gestor de sessões" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaura a sessão ao arrancar e permite-lhe desligar, suspender, hibernar ou terminar a sessão do Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Definições do sistema" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "O sistema de configuração de diversos itens do ambiente de trabalho como o aspeto, ecrã, teclado, rato e mais." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Localizar aplicações" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Mostra as aplicações instaladas no sistema, de modo a que as consiga descobrir e iniciar rapidamente." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Serviço de definições" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Sistema de configurações de armazenamento D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "O Xfce é constituído por diversas aplicações que usadas em conjunto, disponibilizam um ambiente de trabalho completo. Os seguintes programas fazem parte do Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "O Xfce é também uma plataforma de desenvolvimento, disponibilizando diversas bibliotecas, ajudando os programadores a criar aplicações para o ambiente de trabalho." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Os componentes do Xfce são licenciados nos termos das licenças livres; GPL ou BSDL para as aplicações e LGPL e BSDL para as bibliotecas. Consulte a documentação e o código fonte na página do Xfce (http://www.xfce.org) para mais informações." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Obrigado pelo seu interesse no Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "A equipa de desenvolvimento do Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Se conhece alguém que participou no desenvolvimento e não está incluído nesta lista, contacte-nos ou preencha um relatório em ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Obrigado a todas as pessoas que ajudaram na disponibilização do Xfce!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Os direitos do Xfce 4 pertencem a Olivier Fourdan (fourdan@xfce.org). Os direitos dos restantes componentes são dos seus autores." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Os pacotes libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs e exo são disponibilizados nos termos da GNU Library General Public License, conforme publicada pela Free Software Foundation; tanto na versão 2 como (por opção) qualquer versão mais recente." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Os pacotes thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop e xfwm4 são disponibilizados nos termos da GNU General Public License, conforme publicada pela Free Software Foundation; tanto na versão 2 como (por opção) qualquer versão mais recente." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Digite \"%s --help\" para instruções de utilização." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Incapaz de iniciar GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "A equipa de desenvolvimento do Xfce. Todos os direitos reservados." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Por favor, reporte os erros em <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Lista de tradutores em %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Falha ao carregar a interface" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versão %s, disponibilizada por %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Versão %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Programadores principais" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Programadores ativos" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Manutenção dos servidores por" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Supervisão dos \"goodies\"" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Supervisão das traduções" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Tradutores" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Contributos anteriores" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Sobre o Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informações do ambiente de trabalho Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Sobre o ambiente de trabalho Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Sobre" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Créditos" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Direitos de autor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licença" diff -Nru libxfce4ui-4.8.1/po/ro.po libxfce4ui-4.12.1/po/ro.po --- libxfce4ui-4.8.1/po/ro.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ro.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,174 +1,763 @@ -# Romanian translations for libxfce4ui -# Traducerea în limba română pentru pachetul libxfce4util. -# Copyright (C) 2007-2011 THE libxfce4ui's COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Mișu Moldovan , 2009-2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mișu Moldovan , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui 4.8\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2011-01-11 13:58+0200\n" -"Last-Translator: Mișu Moldovan \n" -"Language-Team: Romanian \n" -"Language: ro\n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-27 13:32+0000\n" +"Last-Translator: Mișu Moldovan \n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/libxfce4ui/language/ro/)\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==0 || (n%100 > 0 && n%100 < " -"20)) ? 1 : 2);;\n" -"X-Generator: Virtaal 0.6.1\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Nu s-a putut deschide navigatorul web pentru accesarea documentației online" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Doriți să accesați manualul %s online?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Doriți să citiți manualul online?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Documentație online" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Veți fi redirectat către site-ul cu documentație, unde paginile de ajutor sunt întreținute și traduse." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Deschide online" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "Deschide întotdeauna documentația _online" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Detalii" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Avertizare" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Eroare" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Întrebare" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "ID-ul clientului managerului de sesiune" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Dezactivare management de sesiune" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Opțiuni pentru managementul de sesiune" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Arată opțiunile managementului de sesiune" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Conectarea la managerul de sesiune a eșuat: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Managerul de sesiune nu a returnat un ID valid de client" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Directorul curent „%s” nu mai există. Nu va fi folosit la crearea „%s”." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Această combinație de taste este deja utilizată pentru o altă acțiune a " -"managerului de ferestre. Ce acțiune doriți să îi fie asociată?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Directorul curent „%s” nu mai există. Nu va fi utilizat la crearea „%s”." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce acțiune doriți să îi fie asociată?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Utilizează „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Păstrează-o pe cealaltă" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Păstrează „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Această combinație de taste este deja utilizată pentru comanda „%s”. Ce " -"acțiune doriți să îi fie asociată?" +msgstr "Această combinație de taste este deja folosită pentru comanda „%s”. Ce acțiune doriți să îi fie asociată?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Păstrează „%s”" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Această combinație de taste este deja folosită pentru o acțiune a " -"managerului de ferestre. Ce acțiune doriți să îi fie asociată?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Această combinație de taste este deja folosită pentru acțiunea „%s”. Ce acțiune doriți să îi fie asociată?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Încercați o altă combinație de taste." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Păstrează acțiunea managerului de ferestre" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Combinația %s este deja asociată acestei acțiuni." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Acțiuni diferite pentru „%s”" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Această combinație de taste este deja folosită pentru altceva." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Combinație de taste asociată unei acțiuni" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Acțiune:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "acțiunea" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Combinație de taste pentru comandă" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Comandă:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "comanda" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Combinație de taste" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Renunță" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Apăsați acum tastele ce doriți să declanșeze %s „%s”." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Combinație de taste:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Nu s-a apăsat o tastă încă…" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Nu s-a putut intercepta tastatura." +msgstr "Nu s-au putut captura tastele utilizate." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Subtitlu" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Meniul de acțiuni asupra ferestrei" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Sus" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Jos" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Stânga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Dreapta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Renunță" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Ciclează ferestrele" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Ciclează ferestrele (în sens invers)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Ciclează ferestrele unui program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Ciclează programele" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Închide fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximizează pe orizontală fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximizează pe verticală fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximizează fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Ascunde fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Mută fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Redimensionează fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Strânge fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Lipește fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Ridică fereastra deasupra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Coboară fereastra dedesubt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Ridică sau coboară fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Umple fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Umple orizontal fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Umple vertical fereastra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Comută starea „deasupra”" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Comută starea „pe tot ecranul”" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Mută în spațiul de deasupra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Mută în spațiul de dedesubt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Mută în spațiul din stânga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Mută în spațiul din dreapta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Mută în spațiul anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Mută în spațiul următor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Mută în spațiul de lucru 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Mută în spațiul de lucru 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Mută în spațiul de lucru 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Mută în spațiul de lucru 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Mută în spațiul de lucru 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Mută în spațiul de lucru 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Mută în spațiul de lucru 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Mută în spațiul de lucru 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Mută în spațiul de lucru 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Mută în spațiul de lucru 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Mută în spațiul de lucru 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Mută în spațiul de lucru 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Pune în partea de sus a ecranului" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Pune în partea de jos a ecranului" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Pune în partea stângă a ecranului" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Pune în partea dreaptă a ecranului" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Arată desktopul" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Spațiul de lucru de deasupra" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Spațiul de lucru de dedesubt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Spațiul de lucru din stânga" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Spațiul de lucru din dreapta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Spațiul de lucru anterior" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Spațiul de lucru următor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Spațiul de lucru 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Spațiul de lucru 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Spațiul de lucru 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Spațiul de lucru 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Spațiul de lucru 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Spațiul de lucru 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Spațiul de lucru 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Spațiul de lucru 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Spațiul de lucru 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Spațiul de lucru 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Spațiul de lucru 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Spațiul de lucru 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Adaugă un spațiu de lucru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Adaugă un spațiu de lucru adiacent" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Șterge ultimul spațiu de lucru" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Șterge spațiul de lucru activ" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Fereastră cu titlu" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Subtitlu" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Widgeturi Xfce 4" +msgstr "Widget-uri Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Detalii despre versiune" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Manager de ferestre" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Gestionează plasarea ferestrelor pe ecran." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panoul" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Include meniul cu programe, butoanele pentru ferestre, lansatoarele de programe, comutatorul spațiilor de lucru și altele." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Managerul desktopului" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Definește culoarea și imaginea fundalului, având opțiuni pentru un meniu de programe, iconițe pentru ferestrele minimizate, lansatoare, dosare și dispozitive de sistem." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Manager de fișiere " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Un manager de fișiere modern pentru desktopurile Unix/Linux ce încearcă să fie rapid și ușor de utilizat." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Managerul de sesiune" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Restaurează sesiunea la autentificare și permite închiderea calculatorului din Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Sistemul de configurare" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Un sistem de configurare pentru controlul diferitelor opțiuni ale desktopului precum aspectul programelor, configurația monitoarelor ori opțiunile pentru tastatură și maus." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Unealta pentru pornirea de programe" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Arată pe categorii programele instalate în sistem astfel încât să le găsiți cu ușurință când doriți să le porniți." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Demonul opțiunilor" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Un sistem de stocare a configurărilor ce utilizează D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce este o colecție de programe ce împreună oferă un mediu desktop complet funcțional. Următoarele programe sunt parte din nucleul Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce este de asemenea o platformă de dezvoltare ce oferă câteva biblioteci ce facilitează programatorilor crearea de programe integrate în mediul desktop." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Componentele Xfce sunt licențiate în termenii unor licențe libere ori open source: GPL ori BSD pentru programe și LGPL ori BSD pentru biblioteci. Consultați documentația, codul sursă sau site-ul Xfce (http://www.xfce.org) pentru mai multe detalii." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Mulțumim pentru interesul arătat proiectului Xfce!" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Echipa de dezvoltare Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Dacă știți pe cineva care lipsește din această listă, nu ezitați să raportați eroarea la ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Mulțumim tuturor celor ce au facilitat crearea acestui software!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Drepturile de autor pentru Xfce 4 îi aparțin lui Olivier Fourdan (fourdan@xfce.org). Drepturile de autor pentru diferitele componente aparțin autorilor lor." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Pachetele libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs și exo sunt distribuite în termenii licenței GNU Library General Public License publicată de Free Software Foundation, versiunea 2 sau (la alegere) orice versiune mai nouă." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Pachetele thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop și xfwm4 sunt distribuite în termenii licenței GNU General Public License publicată de Free Software Foundation, versiunea 2 sau (la alegere) orice versiune mai nouă." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Încercați „%s --help” pentru detalii despre utilizare." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Nu s-a putut inițializa GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Echipa de dezvoltare Xfce. Toate drepturile sunt rezervate." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Raportați problemele la <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Lista traducătorilor de la %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Nu s-a putut încărca interfața" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Versiunea %s, distribuită de %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Versiunea %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Programatori principali" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Contribuitori activi" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Administratori de servere" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Supervizori ai proiectului Goodies" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Supervizori ai localizării" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Traducători" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Contribuitori inactivi" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Despre Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Detalii despre mediul desktop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Despre mediul desktop Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Despre" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Autori" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Drepturi de autor" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licență" diff -Nru libxfce4ui-4.8.1/po/ru.po libxfce4ui-4.12.1/po/ru.po --- libxfce4ui-4.8.1/po/ru.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ru.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,158 +1,782 @@ -# Russian translations for libxfce4ui package. -# Copyright (C) 2011 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Aleksandr Ponomarenko , 2010. -# Denis Koryavov , 2010. -# Artem Zolochevskiy , 2011. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # +# Translators: +# Aleksandr P , 2010 +# Artem Zolochevskiy , 2011 +# Denis Koryavov , 2010 +# Sergey Alyoshin , 2014-2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui 4.8\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-26 10:37+0000\n" -"PO-Revision-Date: 2011-08-23 14:21+0300\n" -"Last-Translator: Artem Zolochevskiy \n" -"Language-Team: Russian\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 13:43+0000\n" +"Last-Translator: Sergey Alyoshin \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/libxfce4ui/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\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" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Ошибка открытия браузера для просмотра онлайн-документации" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Вы хотите прочитать руководство %s в сети?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Вы хотите прочитать руководство в сети?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Онлайн-документация" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи переводятся и поддерживаются сообществом." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Прочитать онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Всегда перенаправлять на онлайн-документацию" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Сведения" +msgstr "Информация" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Внимание" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Ошибка" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Вопрос" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ID клиента управления сеансом" +msgstr "ID клиента менеджера сеансов" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Отключить управление сеансом" +msgstr "Выключить менеджер сеансов" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Параметры управления сеансом" +msgstr "Параметры менеджера сеансов" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Показывать возможности управления сеансом" +msgstr "Показать параметры менеджера сеансов" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Не удалось подключиться к менеджеру сеансов: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Менеджер сеансов не предоставил допустимый идентификатор клиента" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format -msgid "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "Рабочий каталог «%s» не существует. Он не будет использоваться для вызова «%s»." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" -msgstr "Эта комбинация клавиш уже используется для другого действия менеджера окон. Какое действие требуется использовать?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется использовать?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Использовать «%s»" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Оставить использующееся" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format -msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" -msgstr "Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется использовать?" +msgid "Keep '%s'" +msgstr "Оставить «%s»" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format -msgid "Keep '%s'" -msgstr "Оставить «%s»" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" -msgstr "Эта комбинация клавиш уже используется для действия менеджера окон. Какое действие требуется использовать?" +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется использовать?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Оставить действие менеджера окон" +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Эта комбинация клавиш уже назначена команде «%s». Какое действие требуется использовать?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Пожалуйста, используйте другую комбинацию клавиш." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s уже используется для этого действия." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Конфликт действий для %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Эта комбинация клавиш уже задействована." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Комбинация клавиш для менеджера окон" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Действие:" +msgstr "Комбинация для действия диспетчера окон" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "действие" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Комбинация клавиш для команды" +msgstr "Командная комбинация" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Команда:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Комбинация" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "О_тменить" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Наберите комбинацию клавиш, которую вы хотите использовать для %s «%s»" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" msgstr "Комбинация:" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Клавиши ещё не были нажаты." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." msgstr "Не удалось захватить клавиатуру." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Подзаголовок" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Меню действий с окном" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Вверх" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Вниз" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Влево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Вправо" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Отменить" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Переключить окна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Переключить окна (в обратном порядке)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Переключить окно этого приложения" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Переключить приложение" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Закрыть окно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Развернуть окно по горизонтали" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Развернуть окно по вертикали" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Развернуть окно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Свернуть окно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Переместить окно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Изменить размер окна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Свернуть окно в заголовок" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Приклеить окно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Поднять окно на передний план" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Опустить окно на задний план" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Переместить окно на передний план или обратно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Максимально увеличить размер окна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Максимально увеличить размер окна по горизонтали" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Максимально увеличить размер окна по вертикали" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Переключить наверх" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Полноэкранный режим" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Переместить окно на верхнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Переместить окно на нижнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Переместить окно на левое рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Переместить окно на правое рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Переместить окно на предыдущее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Переместить окно на следующее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Переместить окно на рабочее место 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Переместить окно на рабочее место 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Переместить окно на рабочее место 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Переместить окно на рабочее место 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Переместить окно на рабочее место 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Переместить окно на рабочее место 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Переместить окно на рабочее место 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Переместить окно на рабочее место 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Переместить окно на рабочее место 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Переместить окно на рабочее место 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Переместить окно на рабочее место 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Переместить окно на рабочее место 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Разместить в верхней половине" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Разместить в нижней половине" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Разместить в левой половине" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Разместить в правой половине" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Разместить сверху слева" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Разместить сверху справа" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Разместить снизу слева" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Разместить снизу справа" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Показать рабочий стол" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Верхнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Нижнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Левое рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Правое рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Предыдущее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Следующее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Рабочее место 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Рабочее место 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Рабочее место 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Рабочее место 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Рабочее место 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Рабочее место 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Рабочее место 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Рабочее место 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Рабочее место 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Рабочее место 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Рабочее место 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Рабочее место 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Добавить рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Добавить соседнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Удалить последнее рабочее место" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Удалить текущее рабочее место" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Озаглавленный диалог" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Подзаголовок" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Элементы интерфейса Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Информация о версии" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Диспетчер окон" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Обрабатывает положение окон на экране." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Панель" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Ярлыки, кнопки окон, меню приложений, переключатель рабочих столов и другое." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Менеджер рабочего стола" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Устанавливает цвет фона или изображение с дополнительным меню приложения или значки для свёрнутых приложений, ярлыков, устройств и каталогов." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Диспетчер файлов" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Современный файл-менеджер для рабочего стола Unix/Linux, стремящийся быть быстрым и простым в использовании." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Менеджер сеансов" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Восстанавливает ваш предыдущий сеанс работы и позволяет выключать компьютер из Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Поддержка настроек" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Конфигурация системы для контроля различных аспектов рабочего стола, например, внешнего вида, дисплея, клавиатуры и настроек мыши." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Поиск приложений" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Показывает установленные в вашей системе приложения по категориям, так, что вы можете быстро найти и установить их." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Служба настроек" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Основанная на D-Bus система хранения конфигурации." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce это набор программ, которые обеспечивают полнофункциональную рабочую среду. Следующие программы являются частью ядра Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce также является платформой, содержащей несколько библиотек, которые помогают программистам создавать приложения, которые хорошо интегрируются в окружение рабочего стола." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Компоненты Xfce распространяются под условиями свободных лицензий или лицензий открытого кода: GPL и BSDL для приложений и LGPL и BSDL для библиотек. Подробности можно найти в документации, в исходном коде и на веб-сайте Xfce (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Благодарим вас за проявленный интерес к Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Команда разработчиков Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Если вы знаете того, кто должен быть включён в этот список, пожалуйста, сообщите нам на " + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Спасибо всем, кто помогал создавать это программное обеспечение!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Авторские права на Xfce 4 принадлежат Olivier Fourdan (fourdan@xfce.org). Авторские права на прочие компоненты принадлежат их авторам." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Программное обеспечение libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs и exo распространяется под условиями GNU Library General Public License версии 2 или более поздней." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Программное обеспечение thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop и xfwm4 распространяется под условиями GNU General Public License версии 2 или более поздней." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Выполните «%s --help» для получения информации об использовании." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Не удалось инициализировать GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Команда разработчиков Xfce. Все права защищены." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Об ошибках сообщайте по адресу <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Список переводчиков (на %s)." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Не удалось загрузить интерфейс" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Версия %s в составе %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Версия %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Основные разработчики" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Активные участники" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Поддержка серверов" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Утилиты" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Ответственный за перевод" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Переводчики" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Предыдущие авторы" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Об Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Сведения об окружении Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Об окружении Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "О программе" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Благодарности" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Авторские права" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Лицензия" diff -Nru libxfce4ui-4.8.1/po/si.po libxfce4ui-4.12.1/po/si.po --- libxfce4ui-4.8.1/po/si.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/si.po 2013-10-04 08:51:42.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" "PO-Revision-Date: 2010-03-13 18:19+0530\n" "Last-Translator: Danishka Navin\n" "Language-Team: American English \n" @@ -17,148 +17,783 @@ "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:69 -msgid "Information" +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:102 -msgid "Warning" +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +#, fuzzy +msgid "Information" +msgstr "අනුවාද තොරතුරු" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "අවවාදයයි" + +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 +#, fuzzy msgid "Session management client ID" -msgstr "" +msgstr "සැසි කළමනාකරන සොකට්ටුව" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1404 +#, fuzzy msgid "Disable session management" -msgstr "" +msgstr "සැසි කළමනාකරන සොකට්ටුව" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1414 +#, fuzzy msgid "Session management options" -msgstr "" +msgstr "සැසි කළමනාකරන සොකට්ටුව" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1415 +#, fuzzy msgid "Show session management options" -msgstr "" +msgstr "සැසි කළමනාකරන සොකට්ටුව" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid "Session manager did not return a valid client id" msgstr "" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" "\"." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 msgid "This shortcut is already being used for something else." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "" +msgstr "කවුළු කළමනාකරු" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "ක්‍රියාව" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy msgid "Command Shortcut" -msgstr "" +msgstr "කෙටිමඟ " -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" +msgstr "කෙටිමඟ " + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy msgid "Shortcut:" +msgstr "කෙටිමඟ " + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +#, fuzzy msgid "Could not grab the keyboard." -msgstr "" +msgstr "සැකසුම් සංවාද කොටුව තැනීමට නොහැකි විය." + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "කවුළු කාර්යකරණ මෙනුව" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "ඉහළ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "පහළ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "වම" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "දකුණ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +#, fuzzy +msgid "Cancel" +msgstr "අවලංගුකරන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +#, fuzzy +msgid "Cycle windows" +msgstr "කවුළු අතර චක්‍රීය ලෙස යන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +#, fuzzy +msgid "Cycle windows (Reverse)" +msgstr "කවුළු අතර (අනෙක් අතට) චක්‍රීය ලෙස යන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "එකම යෙදුම සඳහා කවුළුව අතර මාරු වන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "යෙදුම මාරු කරන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "කවුළුව වසන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "කවුළුව තිරස්ව විහිදන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "කවුළුව සිරස්ව විහිදන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "කවුළුව විහිදන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "කවුළුව සඟවන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +msgid "Move window" +msgstr "කවුළුව එහා මෙහා කරන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +#, fuzzy +msgid "Resize window" +msgstr "කවුළු ප්‍රමාණය වෙනස් කරන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +#, fuzzy +msgid "Shade window" +msgstr "කවුළුව අඳුරු කරන්න." + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +#, fuzzy +msgid "Stick window" +msgstr "කවුළුව අලවන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +#, fuzzy +msgid "Raise window" +msgstr "කවුළුව නගන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +#, fuzzy +msgid "Lower window" +msgstr "කවුළුව හෙලන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "කවුළුව නගන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +#, fuzzy +msgid "Fill window" +msgstr "කවුළුව පුරවන්න" + +# පුරවන්න +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +#, fuzzy +msgid "Fill window horizontally" +msgstr "කවුළු තිරස්ව පිහිටුවන්න" + +# පුරවන්න +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +#, fuzzy +msgid "Fill window vertically" +msgstr "කවුළු සිරස්ව පිහිටුවන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +#, fuzzy +msgid "Toggle above" +msgstr "ඉහළ සමඟ මාරු වන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "කවුළුව ඉහළ වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "කවුළුව පහළ වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "කවුළුව වම් වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "කවුළුව දකුණු වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "කවුළුව කලින් වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "කවුළුව ඊලඟ වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +msgid "Move window to workspace 1" +msgstr "කවුළුව වැඩ අවකාශ 1 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +msgid "Move window to workspace 2" +msgstr "කවුළුව වැඩ අවකාශ 2 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +msgid "Move window to workspace 3" +msgstr "කවුළුව වැඩ අවකාශ 3 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +msgid "Move window to workspace 4" +msgstr "කවුළුව වැඩ අවකාශ 4 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +msgid "Move window to workspace 5" +msgstr "කවුළුව වැඩ අවකාශ 5 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +msgid "Move window to workspace 6" +msgstr "කවුළුව වැඩ අවකාශ 6 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +msgid "Move window to workspace 7" +msgstr "කවුළුව වැඩ අවකාශ 7 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +msgid "Move window to workspace 8" +msgstr "කවුළුව වැඩ අවකාශ 8 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +msgid "Move window to workspace 9" +msgstr "කවුළුව වැඩ අවකාශ 9 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +msgid "Move window to workspace 10" +msgstr "කවුළුව වැඩ අවකාශ 10 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +msgid "Move window to workspace 11" +msgstr "කවුළුව වැඩ අවකාශ 11 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +msgid "Move window to workspace 12" +msgstr "කවුළුව වැඩ අවකාශ 12 ට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "කවුළුව වම් වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "කවුළුව පහළ වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "කවුළුව වම් වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "කවුළුව දකුණු වැඩ අවකාශයට ගෙනයනන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "වැඩතලය පෙන්වන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "ඉහළ වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "පහළ වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "වම් වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "දකුණු වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "කලින් වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "ඊලඟ වැඩ අවකාශය" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +msgid "Workspace 1" +msgstr "වැඩ අවකාශය 1" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +msgid "Workspace 2" +msgstr "වැඩ අවකාශය 2" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +msgid "Workspace 3" +msgstr "වැඩ අවකාශය 3" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +msgid "Workspace 4" +msgstr "වැඩ අවකාශය 4" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +msgid "Workspace 5" +msgstr "වැඩ අවකාශය 5" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +msgid "Workspace 6" +msgstr "වැඩ අවකාශය 6" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +msgid "Workspace 7" +msgstr "වැඩ අවකාශය 7" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +msgid "Workspace 8" +msgstr "වැඩ අවකාශය 8" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +msgid "Workspace 9" +msgstr "වැඩ අවකාශය 9" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +msgid "Workspace 10" +msgstr "වැඩ අවකාශය 10" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +msgid "Workspace 11" +msgstr "වැඩ අවකාශය 11" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +msgid "Workspace 12" +msgstr "වැඩ අවකාශය 12" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "වැඩ අවකාශයක් එක් කරන්න " + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +msgid "Add adjacent workspace" +msgstr "යාබද වැඩ අවකාශයක් එක් කරන්න" + +# last = final or last = previous +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +#, fuzzy +msgid "Delete last workspace" +msgstr "අවසන් වැඩ අවකාශය මකා දමන්න" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +#, fuzzy +msgid "Delete active workspace" +msgstr "සක්‍රීය වැඩ අවකාශය මකා දමන්න" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" +msgid "Titled Dialog" msgstr "" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" +#, fuzzy +msgid "Subtitle" +msgstr "සිරැසිය" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "අනුවාද තොරතුරු" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "කවුළු කළමනාකරු" + +# තිරයේ මැදදී (_c) +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "තිරයේ මැද (_c)" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "කවුළු කළමනාකරු" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "කවුළු කළමනාකරු" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "සැසි කළමනාකරන සොකට්ටුව" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +#, fuzzy +msgid "Settings Daemon" +msgstr "සැකසුම් කළමනාකරන සොකට්ටුව" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (මත %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "කලින් වැඩ අවකාශය" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" diff -Nru libxfce4ui-4.8.1/po/sk.po libxfce4ui-4.12.1/po/sk.po --- libxfce4ui-4.8.1/po/sk.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/sk.po 2015-03-08 22:38:04.000000000 +0000 @@ -1,196 +1,781 @@ -# Slovak translation of libxfce4ui -# Copyright (C) 2008 the libxfce4ui's copyright holder. -# This file is distributed under the same license as the libxfce4ui package. -# Robert Hartl , 2009, 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Robert Hartl , 2009 +# Slavko , 2014-2015 +# Tomáš Vadina , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: 4.8.0\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-31 11:29+0000\n" -"PO-Revision-Date: 2011-01-31 14:50+0100\n" -"Last-Translator: Robert Hartl \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 12:49+0000\n" +"Last-Translator: Slavko \n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/libxfce4ui/language/sk/)\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" "Language: sk\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Otvorenie online dokumentácie vo webovom prehliadači zlyhalo" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Chcete si prečítať online príručku pre %s?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Chcete si prečítať online príručku?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Online dokumentácia" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Budete presmerovaní na webovú stránku dokumentácie, kde sa stránky pomocníka udržujú a prekladajú." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "Čítať _online" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Vždy automaticky prejsť na online dokumentáciu" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "Informácia" +msgstr "Informácie" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Varovanie" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Chyba" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Otázka" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Identifikátor klienta správy sedenia" +msgstr "ID klienta správy relácií" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Zakázať správu sedenia" +msgstr "Vypnúť správu relácie" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Možnosti správy sedenia" +msgstr "Voľby správy relácií" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Zobraziť možnosti správy sedenia" +msgstr "Zobraziť voľby správy relácií" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Nepodarilo sa pripojiť k správcovi sedenia: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Správca sedenia nevrátil platný identifikátor klienta" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "Pracovný adresár „%s“ neexistuje. Pri spustení „%s“ nebude použitý." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Túto klávesovú skratku už používa iná akcia správcu okien. Ktorú akciu " -"chcete použiť?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Pracovný adresár \"%s\" neexistuje. Pri spustení \"%s\" nebude použitý." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Táto skratka už slúži na akciu „%s”. Ktorú akciu chcete použiť?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Použiť '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Ponechať inú" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Ponechať '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Túto klávesovú skratku už používa príkaz '%s'. Ktorú akciu chcete použiť?" +msgstr "Táto skratka už slúži na príkaz „%s”. Ktorú akciu chcete použiť?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Ponechať '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Túto klávesovú skratku už používa akcia správcu okien. Ktorú akciu chcete " -"použiť?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Táto skratka už slúži na akciu „%s”. Ktorú akciu chcete použiť?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Prosím, použite inú kombináciu klávesov" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Ponechať akciu správcu okien" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "Túto akciu už spúšťa %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Konflikt medzi akciami pre %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "Táto klávesová skratka sa už používa inde." +msgstr "Táto skratka už slúži na niečo iné." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Klávesová skratka akcie správcu okien" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Akcia:" +msgstr "Skratky akcií Správcu okien" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "akcia" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Skratka príkazu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Príkaz:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "príkaz" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Klávesová skratka" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Zrušiť" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Teraz stlačte klávesy klávesnice, ktoré chcete použiť na vykonanie %s „%s”." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Klávesová skratka:" +msgstr "Žiadna klávesová skratka" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Zatiaľ nebol stlačený kláves, pokračujte." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Nemožno zachytiť vstup z klávesnice." +msgstr "Nemožno zachytiť klávesnicu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Ponuka možností okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Hore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Dole" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Vľavo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Vpravo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Zrušiť" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Prechádzať okná" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Prechádzať okná (obrátene)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Prepnúť okno rovnakej aplikácie" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Prepnúť aplikáciu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zatvoriť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximalizovať okno vodorovne" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximalizovať okno zvislo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximalizovať okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Skryť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Presunúť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Zmeniť veľkosť okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Zabaliť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Prilepiť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Zdvihnúť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Znížiť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Zdvihnúť alebo znížiť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Vyplniť okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Vyplniť okno vo vodorovnom smere" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Vyplniť okno vo zvislom smere" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Prepnúť hore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Prepnúť na celú obrazovku" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Presunúť okno na vrchnú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Presunúť okno na spodnú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Presunúť okno na ľavú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Presunúť okno na pravú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Presunúť okno na predchádzajúcu plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Presunúť okno na nasledujúcu plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Presunúť okno na pracovnú plochu 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Presunúť okno na pracovnú plochu 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Presunúť okno na pracovnú plochu 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Presunúť okno na pracovnú plochu 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Presunúť okno na pracovnú plochu 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Presunúť okno na pracovnú plochu 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Presunúť okno na pracovnú plochu 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Presunúť okno na pracovnú plochu 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Presunúť okno na pracovnú plochu 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Presunúť okno na pracovnú plochu 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Presunúť okno na pracovnú plochu 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Presunúť okno na pracovnú plochu 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Umiestniť okno nahor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Umiestniť okno nadol" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Umiestniť okno naľavo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Umiestniť okno napravo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Umiestniť okno vľavo hore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Umiestniť okno vpravo hore" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Umiestniť okno vľavo dole" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Umiestniť okno vpravo dole" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Zobraziť pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Vrchná pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Spodná pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Ľavá pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Pravá pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Predchádzajúca pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Nasledujúca pracovná plocha" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Pracovná plocha 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Pracovná plocha 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Pracovná plocha 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Pracovná plocha 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Pracovná plocha 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Pracovná plocha 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Pracovná plocha 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Pracovná plocha 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Pracovná plocha 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Pracovná plocha 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Pracovná plocha 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Pracovná plocha 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Pridať pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Pridať priľahlú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Odstrániť poslednú pracovnú plochu" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Odstrániť pracovnú plochu" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Podtitulok" +msgid "Titled Dialog" +msgstr "Dialóg s titlkom" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Dialógové okno s titulkom" +msgid "Subtitle" +msgstr "Podnadpis" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Widgety Xfce 4" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Informácia o verzií" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Správca okien" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Riadi umiestnenie okien na obrazovke." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Spúšťače programov, tlačidlá okien, ponuka aplikácií, prepínač pracovných plôch a iné." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Správca prihlásenia" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Nastavuje farbu pozadia alebo obrázok s voliteľnou ponukou aplikácií alebo ikon pre minimalizované aplikácie alebo spúšťače, zariadenia a priečinky." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Správca súborov" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Moderný správca súborov pre prostredie Unix/Linux, zameraný na jednoduché používanie a rýchlosť." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Správca relácií" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Súbor nie je platným súborom typu .desktop" +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Obnoví sedenie po spustení a povolí vypnúť počítač z prostredia Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Nastavenie systému" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Nerozpoznaný súbor plochy verzie '%s'" +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Nastavenie systému na ovládanie rôznych aspektov prostredia ako napríklad vzhľadu, obrazovky, nastavení klávesnice a myši." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Vyhľadávač aplikácií" -#~ msgid "Starting %s" -#~ msgstr "Spúšťam %s" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Zobrazí aplikácie nainštalované vo vašom systéme v kategóriách, tak ich môžete rýchlo nájsť a spustiť." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Démon nastavení" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Úložný systém nastavení založený na D-Bus." -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Aplikácia neprijíma dokumenty na príkazovom riadku" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce je zbierkou aplikácií, ktoré dokopy poskytujú plne vybavené pracovné prostredie. Súčasťou jadra Xfce sú tieto aplikácie:" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Nerozpoznaný parameter spustenia: %d" +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce je taktiež vývojovou platformou, poskytujúcou veľa knižníc, ktoré programátorom pomáhajú vytvárať aplikácie zapadajúce do pracovného prostredia." -#~ msgid "Not a launchable item" -#~ msgstr "Nespustiteľná položka" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Komponenty Xfce sú licencované pod slobodnou licenciou s otvoreným zdrojovým kódom; GPL alebo BSDL pre aplikácie a LGPL alebo BDSL pre knižnice. Viac informácií o zdrojových kódoch nájdete na internetovej adrese Xfce (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Ďakujeme za Váš záujem o Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Vývojový tím Xfce" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Zadajte súbor obsahujúci konfiguráciu" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Ak poznáte niekoho, kto chýba na tomto zozname, tak neváhajte a dajte nám prosím vedieť na ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Ďakujeme všetkým, ktorí pomohli k tomu, aby bol tento softvér prístupný." + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 je autorským právom Oliviera Fourdana (fourdan@xfce.org). Rôzne komponenty sú chránené autorskými právami ich autorov." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Balíčky libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs a exo sú šírené pod podmienkami licencie GNU Library General Public License vydanou nadáciou Free Software Foundation vo verzii 2 alebo (podľa Vašej vlastnej voľby) vyššej." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Balíčky thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop a xfwm4 sú distribuované pod GNU General Public License, vydávanej Free Software Foundation; buď verzie 2 tejto licencie alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Napíšte „%s --help” na zobrazenie pomocníka." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Nie je možné inicializovať GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Vývojový tím Xfce. Všetky práva vyhradené." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Chyby prosím hláste na <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Zoznam prekladateľov z %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Načítanie rozhrania zlyhalo" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Verzia %s, šírené cez %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Verzia %s" -#~ msgid "FILE" -#~ msgstr "SÚBOR" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Vývojári jadra" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Aktívni prispievateia" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Servery spravujú" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Dohľad nad doplnkami" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Dohľad nad prekladmi" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Preklady" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Predošlí prispievatelia" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "O pracovnom prostredí Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Informácie o pracovnom prostredí Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "O pracovnom prostredí Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "O prostredí" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Zásluhy" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Autorské práva" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licencia" diff -Nru libxfce4ui-4.8.1/po/sl.po libxfce4ui-4.12.1/po/sl.po --- libxfce4ui-4.8.1/po/sl.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/sl.po 2015-02-18 16:12:39.000000000 +0000 @@ -0,0 +1,760 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Aljoša Žagar , 2013 +# kernc, 2014 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2014-11-25 23:44+0000\n" +"Last-Translator: kernc\n" +"Language-Team: Slovenian (http://www.transifex.com/projects/p/libxfce4ui/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Ni bilo mogoče zagnati brskalnika za spletno dokumentacijo" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Želite prebrati %s priročnik na spletu?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Želite prebrati priročnik na spletu?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Spletna dokumentacija" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Preusmerjeni boste na spletno stran dokumentacije, kjer se vzdržujejo in prevajajo strani pomoči." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "P_reberi na spletu" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "_Vedno pojdi na spletno dokumentacijo" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "Podatki" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "Opozorilo" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "Napaka" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "Vprašanje" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "Identifikator odjemalca upravljalnika seje" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "Onemogoči upravljalnik seje" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "Možnosti upravljalnika seje" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "Prikaži možnosti upravljalnika seje" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Povezovanje z upravljalnikom seje ni uspelo: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Upravljalnik seje ni vrnil veljavnega identifikatorja odjemalca" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Imenik \"%s\" ne obstaja in ne bo uporabljen ob zagonu \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ta bližnjica se že uporablja za dejanje '%s'. Katero dejanje želite uporabiti?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Uporabi '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Obdrži '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Ta bližnjica se že uporablja za ukaz '%s'. Katero dejanje želite uporabiti?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "To bližnjico že uporablja dejanje '%s'. Katero dejanje želite uporabiti?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Uporabite drugo kombinacijo tipk." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s že sproži to dejanje." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Spor med dejanji za %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 +msgid "This shortcut is already being used for something else." +msgstr "Ta bližnjica se že uporablja za nekaj drugega." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "Bližnjica dejanja upravljalnika oken" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "dejanje" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "Bližnjica ukaza" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "ukaz" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Bližnjica" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Pritisnite tipke na tipkovnici, ki želite, da sprožijo %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +msgid "Shortcut:" +msgstr "Bližnjica:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Še nobena tipka ni bila pritisnjena." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "Ni mogoče zgrabiti tipkovnice." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Meni z operacijami okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Gor" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Dol" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Levo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Prekliči" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Kroženje oken" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Kroženje oken (vzvratno)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Preklopi okno za isti program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Preklopi program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Zapri okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Razpni okno vodoravno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Razpni okno navpično" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Razpni okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Skrij okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Premakni okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Spremeni velikost okna" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Osenči okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Prilepi okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Dvigni okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Spusti okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Dvigni ali spusti okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Zapolni okno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Zapolni okno vodoravno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Zapolni okno navpično" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Preklopi zgoraj" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Preklopi celozaslonski način" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Premakni okno na zgornjo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Premakni okno na spodnjo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Premakni okno na levo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Premakni okno na desno delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Premakni okno na prejšnjo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Premakni okno na naslednjo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Premakni okno na delovno površino 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Premakni okno na delovno površino 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Premakni okno na delovno površino 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Premakni okno na delovno površino 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Premakni okno na delovno površino 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Premakni okno na delovno površino 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Premakni okno na delovno površino 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Premakni okno na delovno površino 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Premakni okno na delovno površino 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Premakni okno na delovno površino 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Premakni okno na delovno površino 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Premakni okno na delovno površino 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Razpostavi okno na vrh" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Razpostavi okno na dno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Razpostavi okno na levo" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Razpostavi okno na desno" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Pokaži namizje" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Zgornja delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Spodnja delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Leva delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Desna delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Prejšnja delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Naslednja delovna površina" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Delovna površina 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Delovna površina 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Delovna površina 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Delovna površina 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Delovna površina 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Delovna površina 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Delovna površina 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Delovna površina 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Delovna površina 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Delovna površina 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Delovna površina 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Delovna površina 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Dodaj delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Dodaj delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Izbriši zadnjo delovno površino" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Izbriši dejavno delovno površino" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Naslovljeno pogovorno okno" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Podnapis" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Xfce 4 gradniki" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Podatki o različici" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Upravljalnik oken" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Ureja postavitev oken na zaslonu." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Pult" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Zaganjalniki programov, gumbi oken, meni s programi, preklapljanje delovnih površin in več." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Upravljalnik namizja" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Nastavi barvo ozadja ali sliko, opcijski meni programov, ikone za pomanjšane programe, zaganjalnike, naprave in imenike." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Upravljalnik datotek" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Moderen upravljalnik datotek za Unix/Linux namizja, ki je hiter in preprost za uporabo." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Upravljalnik seje" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Obnovi vašo sejo ob zagonu in omogoči, da ugasnete računalnik iz okolja Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Nastavitve sistema" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Nastavitveni sistem za kontrolo raznih podrobnosti namizja, kot so izgled, nastavitve zaslona, tipkovnice in miške." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Iskalnik aplikacije" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Pokaže nameščene programe v razvrščene v kategorijah, tako da jih lahko hitro najdete." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Nadzornik nastavitev" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Konfiguracijski sistem, ki bazira na D-Bus." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce je zbirka programov, ki skupaj oblikujejo uporabno namizno okolje. Naslednji programi so del jedra Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce je tudi razvojno okolje, ki vključuje več knjižnic, ki pomagajo programerjem ustvarjati programe, ki se lepo zlijejo z namiznim okoljem." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce komponente so na voljo pod odprto-kodnimi licencami; GPL ali BSDL za programe in LGPL ali BSDL za knjižnice. Za več informacij preglejte dokumentacijo, izvorno kodo ali Xfce spletno stran (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Hvala, da uporabljate Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce razvojna ekipa" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "V primeru, da na seznamu kdo manjka, se ne obotavljajte in odprite poročilo o hrošču na ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Hvala vsem, ki so omogočili izdelavo te programske opreme!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Avtorske pravice nad Xfce 4 ima Olivier Fourdan (fourdan@xfce.org). Avtorske pravice nad posameznimi komponentami imajo njihovi avtorji." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Paketi libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs in exo so ponujeni pod pogoji GNU GPL licence; različice 2 ali (po vaši izbiri) katerekoli naslednje različice." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Paketi thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop in xfwm4 so ponujeni pod pogoji GNU GPL licence; različice 2 ali (po vaši izbiri) katerekoli naslednje različice." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Za navodila o uporabi zaženite ukaz \"%s --help\"." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "GTK+ ni mogoče začeti." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce razvojna ekipa. Vse pravice pridržane." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Hrošče prijavite na <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Seznam prevajalcev z %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Nalaganje vmesnika ni uspelo" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Različica %s, distribucija %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Različica %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Glavni razvijalci" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktivni sodelavci" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Strežnike vzdržuje" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Nadzor nad dodatki" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Nadzor nad prevajalci" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Prevajalci" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Predhodni sodelavci" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "O Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Podatki o Xfce namiznem okolju" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "O Xfce namiznem okolju" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "O programu" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Zasluge" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Avtorske pravice" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Dovoljenje" diff -Nru libxfce4ui-4.8.1/po/sr.po libxfce4ui-4.12.1/po/sr.po --- libxfce4ui-4.8.1/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/sr.po 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,781 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Саша Петровић , 2012 +# Саша Петровић , 2012-2013,2015 +# Саша Петровић , 2015 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-08 11:23+0000\n" +"Last-Translator: Саша Петровић \n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/libxfce4ui/language/sr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr\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" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Нисам успео да отворим у веб прегледнику документацију са мреже" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Да ли желите да читате упутство за %s са мреже?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Да ли желите да читате упутство са мреже?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Упутства са мреже" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Бићете преусмерени на веб страницу где се одржава и преводи помоћ." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Читај са мреже" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Увек иди непосредно на упутство са мреже" + +#: ../libxfce4ui/xfce-dialogs.c:334 +msgid "Information" +msgstr "Обавештење" + +#: ../libxfce4ui/xfce-dialogs.c:377 +msgid "Warning" +msgstr "Упозорење" + +#: ../libxfce4ui/xfce-dialogs.c:421 +msgid "Error" +msgstr "Грешка" + +#: ../libxfce4ui/xfce-dialogs.c:494 +msgid "Question" +msgstr "Питање" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "ЛБ клијента управљања сесије" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ЛБ" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "Онемогући управљање сесијом" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "Могућности управљања сесијом" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "Прикажи могућности управљања сесијом" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Нисам успео да се повежем са управником сесије: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Управник сесије није вратио исправни ЛБ клијента" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:409 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Радна фасцикла „%s“ не постоји. Неће бити коришћена приликом израђања „%s“." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Користи „%s“" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Задржи „%s“" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Молим, користите други низ дугмади" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s већ окида ову радњу." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "Сукобљавајуће појаве за %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 +msgid "This shortcut is already being used for something else." +msgstr "Ова пречица се већ користи за нешто друго." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "Пречица радње управника прозора" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "радња" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "Пречица наредбе" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "наредба" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "Пречица" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Откажи" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Сада притисните дугмад тастатуре која желите да окида %s „%s“." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 +msgid "Shortcut:" +msgstr "Пречица:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Нема притиснутих дугмади, наставите." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 +msgid "Could not grab the keyboard." +msgstr "Нисам успео да захватим тастатуру." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Избор радњи прозора" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "горе" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "доле" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "лево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "десно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Откажи" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Кружно мењај прозоре" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Кружно мењај прозоре (обрнуто)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Мењај прозоре истог програма" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Мењај програме" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Затвори прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Увећај прозор водоравно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Увећај прозор усправно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Увећај прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Сакриј прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Премести прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Промени величину прозора" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Смотај прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Увек на видном радном простору" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Издигни прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Спусти прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Издигни или спусти прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Испуни прозор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Испуни прозор водоравно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Испуни прозор усправно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Прекидач стања изнад осталих" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Прекидач стања преко целог екрана" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Премести прозор на радни простор изнад" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Премести прозор на радни простор испод" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Премести прозор на радни простор лево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Премести прозор на радни простор десно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Премести прозор на претходни радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Премести прозор на наредни радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Премести прозор на радни простор 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Премести прозор на радни простор 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Премести прозор на радни простор 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Премести прозор на радни простор 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Премести прозор на радни простор 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Премести прозор на радни простор 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Премести прозор на радни простор 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Премести прозор на радни простор 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Премести прозор на радни простор 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Премести прозор на радни простор 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Премести прозор на радни простор 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Премести прозор на радни простор 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Поплочај прозор до врха" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Поплочај прозор до дна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Поплочај прозор на лево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Поплочај прозор на десно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Поплочај прозор нагоре лево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Поплочај прозор нагоре десно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Поплочај прозор надоле лево" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Поплочај прозор надоле десно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Прикажи радну површ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Горњи радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Доњи радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Леви радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Десни радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Претходни радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Следећи радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "радни простор 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "радни простор 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "радни простор 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "радни простор 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "радни простор 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "радни простор 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "радни простор 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "радни простор 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "радни простор 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "радни простор 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "радни простор 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "радни простор 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Додај радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Додај суседни радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Обриши последњи радни простор" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Обриши тренутни радни простор" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "Прозорче са натписом" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Поднаслов" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Иксфце-ове 4 справе" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Подаци о издању" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Управник прозора" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Управља смештајем прозора на екрану." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Полица" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Покретачи програма, дугмад прозора, програмски изборник, измењивач радних површи и друго." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Управник радне површи" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Подеси позадинску боју, или слику са могућношћу коришћења изборника програма, или икона програма са покретачима, уређајима и фасциклама." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Управник датотека " + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Савремени управник датотека за Уникс/Линукс радну станицу, који тежи да буде лак за употребу и брз." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Управник сесије" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Враћа сесију при покретању и омогућава искључивање рачунара из Иксфце-а." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Поставке система" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Подешавања система за управљање разним областима радног окружења попут подешавања изгледа, приказа, тастатуре и миша." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Проналазач програма" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Приказује програме уграђене на систему по врстама, тако да их лако можете пронаћи и покренути." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Домар поставки" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Систем складиштења подешавања заснован на Д-сабирници." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Иксфце је скуп програма који заједно обезбеђују потпуно радно окружење. Следећи програми су део језгра Иксфце-а:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Иксфце је такође развојна платформа која обезбеђује библиотеке које програмерима помажу да стварају програме који се добро уклапају у радно окружење." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Иксфце-ови делови су објављени под слободним и лиценцама отвореног кода; ГПЛ или БСД за програме и ЛГПЛ или БСДЛ за библиотеке. Погледајте документацију, изворни код, или веб страницу (http://www.xfce.org) за више обавештења." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Хвала на занимању за Иксфце." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Развојна дружина Иксфце-а" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Уколико знате неког да недостаје на овој листи, не оклевајте и пријавите грешку на ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Хвала свима који су помогли да ове мекотворине буду доступне!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Права умножавања над Иксце-ом 4 задржава Оливје Фурдан (fourdan@xfce.org). Права над разним деловима задржавају њихови одговарајући ствараоци." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Пакети „libxfce4ui“, „libxfcegui4“, „libxfce4util“, „thunar-vfs“ и „exo“ се расподељују под условима Гнуове библиотечке опште јавне лиценце како је објављује Задужбина слободног софтвера; било издања 2 те лиценце, или (према вашем мишљењу) било ког каснијег издања." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Пакети „thunar“, „xfce4-appfinder“, „xfce4-panel“, „xfce4-session“, „xfce4-settings“, „xfce-utils“, „xfconf“, „xfdesktop“ и „xfwm4“ се расподељују под условима Гнуове библиотечке опште јавне лиценце како је објављује Задужбина слободног софтвера; било издања 2 те лиценце, или (према вашем мишљењу) било ког каснијег издања." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Упишите „%s --help“ за упутство за употребу." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Нисам успео да покренем ГТК+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Развојна дружина Иксфце-а. Сва права су задржана." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Молим, пријавите грешке на <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Списак преводиоца из %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Нисам успео да учитам сучеље" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Издање %s, расподељује %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Издање %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Програмери језгра" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Садашњи доприносиоци" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Служитеље одржавају" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Надгледање добара" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Надгледање превођења" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Преводиоци" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Претходни доприносиоци" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "О Иксфце-у" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Подаци о радном окружењу Иксфце-а" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "О радном окружењу Иксфце-а" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "О програму" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Заслуге" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "ОЈЛ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "МОЈЛ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "БСД" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Права умножавања" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Дозвола" diff -Nru libxfce4ui-4.8.1/po/sv.po libxfce4ui-4.12.1/po/sv.po --- libxfce4ui-4.8.1/po/sv.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/sv.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,175 +1,759 @@ -# Swedish translation for libxfce4ui. -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. -# This file is distributed under the same license as the libxfce4ui package. -# Daniel Nylander , 2008, 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Daniel Nylander , 2008-2009 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-10-16 16:24+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"Language: sv\n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2014-02-23 17:41+0000\n" +"Last-Translator: PavelNicklasson \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\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" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Misslyckades öppna webbläsaren för onlinedokumentation" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Vill du läsa %s manualen online?" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "Vill du läsa manualen online?" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "Onlinedokumentation" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Du kommer att skickas vidare till hemsidan för dokumentation där hjälpsidorna finns och översätts." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "_Läs online" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "Gå _alltid direkt till onlinedokumentationen" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "Information" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "Varning" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "Fel" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "Fråga" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Klient-id för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "Inaktivera sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Flaggor för sessionshantering" +msgstr "Alternativ för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Visa flaggor för sessionshantering" +msgstr "Visa alternativ för sessionshantering" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "Misslyckades med att ansluta till sessionshanteraren: %s" +msgstr "Misslyckades att ansluta till sessionshanteraren: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Sessionshanteraren returnerade inte ett giltigt klient-id" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Arbetskatalogen \"%s\" finns inte. Den kommer inte att användas när \"%s\" " -"startas." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Denna genväg används redan för en annan åtgärd i fönsterhanteraren. Vilken " -"åtgärd vill du använda?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Arbetskatalogen \"%s\" finns inte. Den kommer inte att användas när \"%s\" startas." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Denna genväg används redan för funktionen '%s'. Vilken funktion vill du använda?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Använd \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Behåll den andra" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Behåll \"%s\"" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Denna genväg används redan för kommandot \"%s\". Vilken åtgärd vill du " -"använda?" +msgstr "Denna genväg används redan för kommandot '%s'. Vilken åtgärd vill du använda?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Behåll \"%s\"" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Denna genväg används redan av en åtgärd i fönsterhanteraren. Vilken åtgärd " -"vill du använda?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Denna genväg används redan av funktionen '%s'. Vilken funktion vill du använda?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Använd en annan tangentkombination." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Behåll åtgärden för fönsterhanteraren" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s utlöser redan denna funktion." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Åtgärder i konflikt för %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "Denna genväg används redan för någonting annat." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Åtgärdsgenväg för fönsterhanterare" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Åtgärd:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "åtgärd" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Kommandogenväg" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Kommando:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "kommando" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Genväg" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Tryck nu de tangenter du vill använda för att utlösa %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "Genväg:" +msgstr "Ingen genväg" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "Inga tangenter tryckta än, fortsätt." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "Kunde inte fånga tangentbordet." +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Meny för fönsteråtgärder" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Uppåt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Nedåt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Vänster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Höger" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Avbryt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Växla mellan fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Växla fönster (omvänt)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Växla fönster för samma program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Växla program" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Stäng fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Maximera fönster horisontellt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Maximera fönster vertikalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Maximera fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Dölj fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Flytta fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Ändra storlek på fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Rulla upp fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Klistra fast fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Höj fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Sänk fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Höj eller sänk fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Fyll fönster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Fyll ut fönster horisontellt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Fyll ut fönster vertikalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Växla ovanstående" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Växla helskärmsläge" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Flytta fönster till arbetsytan ovanför" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Flytta fönster till arbetsytan nedanför" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Flytta fönster till arbetsytan åt vänster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Flytta fönster till arbetsytan åt höger" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Flytta fönster till föregående arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Flytta fönster till nästa arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Flytta fönster till arbetsyta 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Flytta fönster till arbetsyta 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Flytta fönster till arbetsyta 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Flytta fönster till arbetsyta 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Flytta fönster till arbetsyta 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Flytta fönster till arbetsyta 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Flytta fönster till arbetsyta 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Flytta fönster till arbetsyta 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Flytta fönster till arbetsyta 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Flytta fönster till arbetsyta 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Flytta fönster till arbetsyta 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Flytta fönster till arbetsyta 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Fäst fönster till toppen" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Fäst fönster till botten" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Fäst fönster till vänster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Fäst fönster till höger" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "Visa skrivbordet" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "Växla till arbetsytan ovan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "Växla till arbetsytan nedan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "Växla till arbetsytan till vänster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "Växla till arbetsytan till höger" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "Föregående arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "Nästa arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "Arbetsyta 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "Arbetsyta 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "Arbetsyta 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "Arbetsyta 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "Arbetsyta 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "Arbetsyta 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "Arbetsyta 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "Arbetsyta 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "Arbetsyta 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "Arbetsyta 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "Arbetsyta 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "Arbetsyta 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "Lägg till arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "Lägg till angränsande arbetsyta" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "Ta bort sista arbetsytan" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "Ta bort aktiv arbetsyta" + #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Undertext" +msgid "Titled Dialog" +msgstr "Titeldialog" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "Namngiven dialogruta" +msgid "Subtitle" +msgstr "Undertitel" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4-widgetar" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Versionsinformation" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Fönsterhanterare" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Hanterar placeringen av fönster på skärmen" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Programstartare, fönsterknappar, programmeny, arbetsyteväxlare med mera." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Skrivbordshanterare" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Anger bakgrundsfärg eller bild med eventuell programmeny eller ikoner för minimerade program eller programstartare, enheter och mappar." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Filhanterare" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "En modern filhanterare för Unix/Linux skrivbordet, med mål att vara enkel att använda och snabb." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Sessionshanterare" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Återställer din session vid start och tillåter dig att stänga av datorn från Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Inställningssystem" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Konfigurera systemet att kontrollera diverse aspekter av skrivbordet såsom utseende, skärm, tangentbord och musinställningar." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Programsökare" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Visar program installerade på ditt system i kategorier så att du enkelt kan hitta och starta dom. " + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Inställningsdaemon" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus baserat konfigurationslagringssystem." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce är en samling av program som tillsammans tillhandahåller en fullfjädrad skrivbordsmiljö. Följande program är delar av Xfce:s kärna:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce är också en utvecklingsplattform som tillhandahåller flera bibliotek, som hjälper programmerare att skapa program som passar väl in i skrivbordsmiljön." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce komponenter är licensierade under fria eller öppenkällkodslicenser; GPL eller BSDL för program och LGPL eller BSDL för bibliotek. Titta i dokumentationen, källkoden eller Xfce:s hemsida (http://www.xfce.org) för mer information." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Tack för ditt intresse för Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce:s utvecklingsteam" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Om du känner till någon som saknas från den här listan; tveka inte att posta en felrapport på http://bugzilla.xfce.org> ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "Tack till alla som hjälpt till att göra denna programvara tillgänglig!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 är copyright Olivier Fourdan (fourdan@xfce.org). De olika komponenterna är skyddade av upphovsrätt av deras respektive författare." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Paketen libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs och exo distribueras under villkoren i GNU Library General Public License såsom publicerad av the Free Software Foundation; antingen version 2 av licensen, eller (om du så önskar) någon senare version." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Paketen: thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop och xfwm4 distribueras under villkoren i GNU General Public License såsom publicerade av the Free Software Foundation; antingen version 2 av licensen, eller (om du så önskar) någon senare version." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Skriv '%s --help' för användningsinformation." + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Kunde inte initiera GTK+." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce:s utvecklingsteam. Alla rättigheter förbehållna." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Var vänlig och rapportera fel till <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "Översättarlista från %s." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Misslyckades läsa in gränssnittet" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Version %s, distribuerad av %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "Version %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Kärnutvecklare" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "Aktiva bidragsgivare" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Servrar tillhandahållna av" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Tillsyn godsaker" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Tillsyn översättningar" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "Översättare\nPåvel Nicklasson" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "Tidigare bidragsgivare" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Om Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Information om skrivbordsmiljön Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Om skrivbordsmiljön Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "OM" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Tack" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Copyright" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Licens" diff -Nru libxfce4ui-4.8.1/po/te.po libxfce4ui-4.12.1/po/te.po --- libxfce4ui-4.8.1/po/te.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/te.po 2015-02-18 16:12:39.000000000 +0000 @@ -1,157 +1,759 @@ -# Copyright (C) 2011 Xfce Telugu Team -# This file is distributed under the same license as the libxfce4ui package. -# -# -# Praveen Illa , 2011. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# ప్రవీణ్ ఇళ్ళ , 2011 msgid "" msgstr "" -"Project-Id-Version: 4\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-22 10:11+0000\n" -"PO-Revision-Date: 2011-08-23 01:22+0530\n" -"Last-Translator: Praveen \n" -"Language-Team: Telugu \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-11-19 11:04+0000\n" +"Last-Translator: Nick \n" +"Language-Team: Telugu (http://www.transifex.com/projects/p/xfce/language/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libxfce4ui/xfce-dialogs.c:68 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "ఆన్‌లైన్ పత్రీకరణ" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "ఆన్‌లైన్లో చదవండి (_R)" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" -msgstr "సమాచారం" +msgstr "" -#: ../libxfce4ui/xfce-dialogs.c:101 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "హెచ్చరిక" -#: ../libxfce4ui/xfce-dialogs.c:135 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "దోషం" -#: ../libxfce4ui/xfce-dialogs.c:186 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "ప్రశ్న" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "సెషన్ నిర్వహణ క్లయింటు ఐడి" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ఐడి" -#: ../libxfce4ui/xfce-sm-client.c:1403 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "సెషన్ నిర్వహణని అచేతనపరుచు" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "సెషన్ నిర్వహణ ఐచ్ఛికాలు" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1414 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "సెషన్ నిర్వహణ ఐచ్ఛికాలను చూపించు" +msgstr "" -#: ../libxfce4ui/xfce-sm-client.c:1590 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "సెషన్ నిర్వాహకానికి అనుసంధానించుటలో విఫలమైంది: %s" -#: ../libxfce4ui/xfce-sm-client.c:1597 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "సెషన్ నిర్వాహకము ఒక సరైన క్లయింటు ఐడీని తిరిగి ఇచ్చుటలేదు" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:406 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format -msgid "Working directory \"%s\" does not exist. It won't be used when spawning \"%s\"." +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "పనిచేస్తున్న డైరెక్టరీ \"%s\" ఉనికిలో లేదు. \"%s\" స్పానింగులో ఉన్నపుడు అది వాడబడదు." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "This shortcut is already being used for another window manager action. Which action do you want to use?" -msgstr "ఈ షార్ట్‍కట్ ఇదివరకే వేరొక విండో నిర్వాహకము చర్యకు వాడబడింది. మీరు ఏ చర్యను వాడాలనుకుంటున్నారు?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' వాడు" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "మరొకదానిని ఉంచు" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format -msgid "This shortcut is already being used for the command '%s'. Which action do you want to use?" -msgstr "ఈ షార్ట్‍కట్ ఇదివరకే '%s' ఆదేశము కొరకు వాడబడింది. మీరు ఏ చర్యను వాడాలనుకుంటున్నారు?" +msgid "Keep '%s'" +msgstr "'%s' ఉంచు" #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format -msgid "Keep '%s'" -msgstr "'%s' ఉంచు" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "This shortcut is already being used by a window manager action. Which action do you want to use?" -msgstr "ఈ షార్ట్‍కట్ ఇదివరకే ఒక విండో నిర్వాహకము చర్యకు వాడబడింది. మీరు ఏ చర్యను వాడాలనుకుంటున్నారు?" +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "ఈ షార్ట్‍కట్ ఇదివరకే '%s' ఆదేశము కొరకు వాడబడింది. మీరు ఏ చర్యను వాడాలనుకుంటున్నారు?" #: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "విండో నిర్వాహకము చర్యను ఉంచు" +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s కొరకు సంఘర్షణ చర్యలు" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "ఈ షార్ట్‍కట్ ఇదివరకే వేరేదానికి వాడబడుతున్నది." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "విండో నిర్వాహకము చర్య షార్ట్‍కట్" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215 -msgid "Action:" -msgstr "చర్య:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "ఆదేశము షార్ట్‍కట్" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:210 -msgid "Command:" -msgstr "ఆదేశం:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "షార్ట్‍కట్" +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:255 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" msgstr "షార్ట్‍కట్" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:300 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." msgstr "కీబోర్డును హరించలేకపోయింది." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "ఉపశీర్షిక" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "పైన" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "కింద" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "ఎడమ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "కుడి" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "రద్దుచేయి" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "విండోను మూసివేయి" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "విండోని అడ్డముగా గరిష్ఠీకరించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "విండోని నిలువుగా గరిష్ఠీకరించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "విండోని గరిష్ఠీకరించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "విండోని దాయి" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "విండోని కదుపు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "విండో పరిమాణం మార్చు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "విండోని నింపు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "విండోని అడ్డముగా నింపు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "విండోని నిలువుగా నింపు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "విండోని ఎగువ కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "విండోని దిగువ కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "విండోని ఎడమవైపు కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "విండోని కుడివైపు కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "విండోని మునుపటి కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "విండోని తదుపరి కార్యక్షేత్రానికి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "విండోని కార్యక్షేత్రం 1కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "విండోని కార్యక్షేత్రం 2కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "విండోని కార్యక్షేత్రం 3కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "విండోని కార్యక్షేత్రం 4కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "విండోని కార్యక్షేత్రం 5కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "విండోని కార్యక్షేత్రం 6కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "విండోని కార్యక్షేత్రం 7కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "విండోని కార్యక్షేత్రం 8కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "విండోని కార్యక్షేత్రం 9కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "విండోని కార్యక్షేత్రం 10కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "విండోని కార్యక్షేత్రం 11కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "విండోని కార్యక్షేత్రం 12కి తరలించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "డెస్క్‍టాప్ చూపించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "ఎగువ కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "దిగువ కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "ఎడమవైపు కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "కుడివైపు కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "మునుపటి కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "తదుపరి కార్యక్షేత్రం" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "కార్యక్షేత్రం 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "కార్యక్షేత్రం 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "కార్యక్షేత్రం 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "కార్యక్షేత్రం 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "కార్యక్షేత్రం 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "కార్యక్షేత్రం 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "కార్యక్షేత్రం 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "కార్యక్షేత్రం 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "కార్యక్షేత్రం 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "కార్యక్షేత్రం 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "కార్యక్షేత్రం 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "కార్యక్షేత్రం 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "కార్యక్షేత్రాన్ని జతచేయి" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "చివరి కార్యక్షేత్రాన్ని తొలగించు" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "క్రియాశీల కార్యక్షేత్రాన్ని తొలగించు" + +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "శీర్షికగల డైలాగ్" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 విడ్జెట్లు" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "రూపాంతర సమాచారం" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "విండో నిర్వాహకం" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "ప్యానల్" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "వ్యవస్థ అమరిక" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "అనువర్తన కనుగొనునది" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Xfce నందు ఆసక్తి చూపించినందుకు ధన్యవాదములు." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce అభివృద్ధి జట్టు" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce అభివృద్ధి జట్టు. అన్ని హక్కులు కలిగివున్నారు." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "దయచేసి లోపాలను <%s>కు నివేదించండి." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "అంతరవర్తిని నింపుటలో విఫలమైంది" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "రూపాంతరం %s, పంపిణీచేయువారు %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "రూపాంతరం %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "అంతర్భాగ అభివృద్ధికారులు" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "క్రియాశీల సహాయకులు" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "సేవకాలు నిర్వహించువారు" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "అనువాదకలు" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce గురించి" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce డెస్క్‍టాప్ పర్యావరణం గురించిన సమాచారం" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce డెస్క్‍టాప్ పర్యావరణం గురించి" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "గురించి" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "పరపతులు" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "జిపియల్" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "నకలుహక్కు" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "లైసెన్స్" diff -Nru libxfce4ui-4.8.1/po/th.po libxfce4ui-4.12.1/po/th.po --- libxfce4ui-4.8.1/po/th.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/th.po 2015-03-15 18:11:26.000000000 +0000 @@ -0,0 +1,780 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Theppitak Karoonboonyanan , 2013 +# Theppitak Karoonboonyanan , 2015 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-09 05:57+0000\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai (http://www.transifex.com/projects/p/libxfce4ui/language/th/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: th\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "เปิดเว็บเบราว์เซอร์เพื่อแสดงเอกสารออนไลน์ไม่สำเร็จ" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "คุณต้องการอ่านคู่มือของ %s แบบออนไลน์หรือไม่?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "คุณต้องการอ่านคู่มือแบบออนไลน์หรือไม่?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "เอกสารออนไลน์" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "คุณจะถูกนำไปสู่เว็บไซต์เอกสารซึ่งมีการดูแลและแปลคู่มือวิธีใช้อยู่" + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_อ่านออนไลน์" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "ตรงไปยังเอกสารออนไลน์เ_สมอ" + +#: ../libxfce4ui/xfce-dialogs.c:334 +msgid "Information" +msgstr "ข้อมูล" + +#: ../libxfce4ui/xfce-dialogs.c:377 +msgid "Warning" +msgstr "คำเตือน" + +#: ../libxfce4ui/xfce-dialogs.c:421 +msgid "Error" +msgstr "ข้อผิดพลาด" + +#: ../libxfce4ui/xfce-dialogs.c:494 +msgid "Question" +msgstr "คำถาม" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "ID ของลูกข่ายการจัดการวาระ" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "ปิดการจัดการวาระ" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "ตัวเลือกของการจัดการวาระ" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "แสดงตัวเลือกของการจัดการวาระ" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "เชื่อมต่อไปยังโปรแกรมจัดการวาระไม่สำเร็จ: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "โปรแกรมจัดการวาระไม่ได้คืนค่า ID ลูกข่ายที่ใช้การได้กลับมา" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:409 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "ไดเรกทอรีทำงาน \"%s\" ไม่มีอยู่ จะไม่ใช้สำหรับ spawn \"%s\"" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "ปุ่มลัดนี้ถูกใช้กับการกระทำ '%s' ไปแล้ว คุณต้องการการกระทำไหน?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "ใช้ '%s' แทน" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "ใช้ '%s' เหมือนเดิม" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "ปุ่มลัดนี้ถูกใช้กับคำสั่ง '%s' ไปแล้ว คุณต้องการการกระทำไหน?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "ปุ่มลัดนี้ถูกใช้โดยการกระทำ '%s' ไปแล้ว คุณต้องการการกระทำไหน?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "กรุณาใช้ปุ่มลัดชุดอื่น" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s ได้ใช้เรียกการกระทำนี้ไปแล้ว" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "การกระทำขัดแย้งกันสำหรับ %s" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 +msgid "This shortcut is already being used for something else." +msgstr "ปุ่มลัดนี้ถูกใช้ทำอย่างอื่นไปแล้ว" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "ปุ่มลัดสำหรับโปรแกรมจัดการหน้าต่าง" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "การกระทำ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "ปุ่มลัดสำหรับคำสั่ง" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "คำสั่ง" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "ปุ่มลัด" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_ยกเลิก" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "กดปุ่มแป้นพิมพ์ที่คุณต้องการใช้เรียก%s '%s'" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 +msgid "Shortcut:" +msgstr "ปุ่มลัด:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "ยังไม่ได้กดปุ่มใดๆ กรุณากด" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 +msgid "Could not grab the keyboard." +msgstr "ไม่สามารถจับยึดแป้นพิมพ์" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "เมนูจัดการหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "ขึ้น" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "ลง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "ซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "ขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "ยกเลิก" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "วนหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "วนหน้าต่าง (ย้อนกลับ)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "สลับหน้าต่างภายในโปรแกรมเดียวกัน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "สลับโปรแกรม" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "ปิดหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "ขยายแผ่หน้าต่างในแนวนอน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "ขยายแผ่หน้าต่างในแนวตั้ง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "ขยายแผ่หน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "ซ่อนหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "ย้ายหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "ปรับขนาดหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "ม้วนเก็บหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "ปักหมุดหน้าต่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "ยกหน้าต่างขึ้น" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "ถอยหน้าต่างลง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "ยกหน้าต่างขึ้นหรือถอยหน้าต่างลง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "ขยายหน้าต่างเต็มที่ว่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "ขยายหน้าต่างเต็มที่ว่างแนวนอน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "ขยายหน้าต่างเต็มที่ว่างแนวตั้ง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "เปิด/ปิดการอยู่บนสุด" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "เปิด/ปิดการแสดงเต็มจอ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านบน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านล่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานด้านขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานก่อนหน้า" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงานถัดไป" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "ย้ายหน้าต่างไปพื้นที่ทำงาน 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "เรียงหน้าต่างต่อชนกันที่ขอบบน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "เรียงหน้าต่างต่อชนกันที่ขอบล่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "เรียงหน้าต่างต่อชนกันที่ขอบซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "เรียงหน้าต่างต่อชนกันที่ขอบขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "เรียงหน้าต่างต่อชนกันที่มุมบนซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "เรียงหน้าต่างต่อชนกันที่มุมบนขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "เรียงหน้าต่างต่อชนกันที่มุมล่างซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "เรียงหน้าต่างต่อชนกันที่มุมล่างขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "แสดงพื้นโต๊ะ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "พื้นที่ทำงานด้านบน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "พื้นที่ทำงานด้านล่าง" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "พื้นที่ทำงานด้านซ้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "พื้นที่ทำงานด้านขวา" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "พื้นที่ทำงานก่อนหน้า" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "พื้นที่ทำงานถัดไป" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "พื้นที่ทำงาน 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "พื้นที่ทำงาน 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "พื้นที่ทำงาน 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "พื้นที่ทำงาน 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "พื้นที่ทำงาน 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "พื้นที่ทำงาน 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "พื้นที่ทำงาน 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "พื้นที่ทำงาน 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "พื้นที่ทำงาน 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "พื้นที่ทำงาน 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "พื้นที่ทำงาน 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "พื้นที่ทำงาน 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "เพิ่มพื้นที่ทำงาน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "เพิ่มพื้นที่ทำงานติดกัน" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "ลบพื้นที่ทำงานสุดท้าย" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "ลบพื้นที่ทำงานที่กำลังใช้อยู่" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "กล่องโต้ตอบพร้อมกำหนดหัวเรื่อง" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "หัวเรื่องย่อย" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "วิดเจ็ตของ Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "ข้อมูลรุ่น" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "โปรแกรมจัดการหน้าต่าง" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "จัดการการจัดวางของหน้าต่างบนหน้าจอ" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "พาเนล" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "ปุ่มเรียกโปรแกรม, ปุ่มเลือกหน้าต่าง, เมนูโปรแกรม, เครื่องมือสลับพื้นที่ทำงาน และอื่นๆ" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "โปรแกรมจัดการพื้นโต๊ะ" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "กำหนดสีหรือภาพพื้นหลัง โดยอาจมีเมนูเรียกโปรแกรม หรือไอคอนของโปรแกรมหรือปุ่มเรียกโปรแกรมที่ย่อเก็บ, อุปกรณ์และโฟลเดอร์ต่างๆ" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "โปรแกรมจัดการแฟ้ม" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "โปรแกรมจัดการแฟ้มสมัยใหม่สำหรับเดสก์ท็อปยูนิกซ์/ลินุกซ์ โดยมุ่งให้ใช้งานง่ายและทำงานรวดเร็ว" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "โปรแกรมจัดการวาระ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "เปิดคืนวาระเดิมของคุณเมื่อเข้าระบบ และช่วยให้คุณสามารถปิดเครื่องคอมพิวเตอร์จาก Xfce ได้" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "ระบบตั้งค่า" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "ระบบตั้งค่าสำหรับควบคุมด้านต่างๆ ของเดสก์ท็อป เช่น ตั้งค่ารูปลักษณ์, จอแสดงผล, แป้นพิมพ์และเมาส์" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "เครื่องมือค้นหาโปรแกรม" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "แสดงโปรแกรมที่ติดตั้งอยู่ในระบบของคุณแยกตามหมวดหมู่ เพื่อที่คุณจะสามารถค้นหาและเรียกทำงานได้อย่างรวดเร็ว" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "ดีมอนค่าตั้ง" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "ระบบจัดเก็บค่าตั้ง โดยทำงานผ่าน D-Bus" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce เป็นชุดของโปรแกรมซึ่งรวมกันเป็นชุดเดสก์ท็อปที่ความสามารถเพียบพร้อม ส่วนแกนหลักของ Xfce ประกอบด้วยโปรแกรมต่อไปนี้:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "นอกจากนี้ Xfce ยังเป็นแพลตฟอร์มสำหรับพัฒนาโปรแกรม โดยจัดเตรียมไลบรารีต่างๆ ให้หลายชุด ซึ่งจะช่วยโปรแกรมเมอร์ในการสร้างโปรแกรมที่เข้ากันกับตัวเดสก์ท็อป" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "องค์ประกอบต่างๆ ของ Xfce จะใช้สัญญาอนุญาตที่เสรีและโอเพนซอร์ส โดยใช้ GPL หรือ BSDL สำหรับโปรแกรม และ LGPL หรือ ฺBSDL สำหรับไลบรารี ดูข้อมูลเพิ่มเติมได้จากเอกสาร, ซอร์สโค้ด, หรือเว็บไซต์ Xfce (http://www.xfce.org)" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "ขอขอบคุณที่ให้ความสนใจ Xfce" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "ทีมพัฒนา Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "ถ้าคุณพบว่ามีชื่อของใครตกหล่นจากรายชื่อนี้ ก็โปรดอย่าลังเลที่จะรายงานบั๊กที่ " + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "ขอขอบคุณทุกท่านที่ช่วยทำให้ซอฟต์แวร์นี้เกิดขึ้นได้!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 สงวนลิขสิทธิ์โดย Olivier Fourdan (fourdan@xfce.org) ส่วนองค์ประกอบต่างๆ สงวนลิขสิทธิ์โดยผู้พัฒนาของแต่ละองค์ประกอบ" + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "แพกเกจ libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs และ exo เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต GNU Library General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "แพกเกจ thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop และ xfwm4 เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาต GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)" + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "สั่ง '%s --help' เพื่อดูข้อมูลเพิ่มเติม" + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "ไม่สามารถตั้งต้น GTK+" + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "The Xfce development team. All rights reserved." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "หากพบปัญหา กรุณารายงานที่ <%s>" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "รายชื่อผู้แปล ณ %s" + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "โหลดส่วนติดต่อผู้ใช้ไม่สำเร็จ" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "รุ่น %s, แจกจ่ายโดย %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "รุ่น %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "นักพัฒนาแกนหลัก" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "ผู้ร่วมสมทบงานที่ยังทำงานอยู่" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "ดูแลเซิร์ฟเวอร์ต่างๆ โดย" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "ดูแลให้คำปรึกษาการพัฒนา Goodies" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "ดูแลให้คำปรึกษางานแปล" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "ผู้แปล" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "ผู้ร่วมสมทบงานในอดีต" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "เกี่ยวกับ Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "ข้อมูลเกี่ยวกับเดสก์ท็อป Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "เกี่ยวกับเดสก์ท็อป Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "เกี่ยวกับ" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "เครดิต" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "ลิขสิทธิ์" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "สัญญาอนุญาต" diff -Nru libxfce4ui-4.8.1/po/tl_PH.po libxfce4ui-4.12.1/po/tl_PH.po --- libxfce4ui-4.8.1/po/tl_PH.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/tl_PH.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -# 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-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-04-20 14:08+0200\n" -"Last-Translator: ian \"dakbyani\" besina \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" - -#: ../libxfce4ui/xfce-dialogs.c:69 -msgid "Information" -msgstr "Impormasyon" - -#: ../libxfce4ui/xfce-dialogs.c:102 -msgid "Warning" -msgstr "Babala" - -#: ../libxfce4ui/xfce-dialogs.c:136 -msgid "Error" -msgstr "Error" - -#: ../libxfce4ui/xfce-dialogs.c:187 -msgid "Question" -msgstr "Tanong" - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid "Session management client ID" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1401 -msgid "ID" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1402 -msgid "Disable session management" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1412 -msgid "Session management options" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1413 -msgid "Show session management options" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1589 -#, c-format -msgid "Failed to connect to the session manager: %s" -msgstr "" - -#: ../libxfce4ui/xfce-sm-client.c:1596 -#, c-format -msgid "Session manager did not return a valid client id" -msgstr "" - -#. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 -#, c-format -msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -#, c-format -msgid "Use '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 -#, c-format -msgid "" -"This shortcut is already being used for the command '%s'. Which action do " -"you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 -#, c-format -msgid "Conflicting actions for %s" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 -msgid "This shortcut is already being used for something else." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 -msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 -msgid "Command Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 -msgid "Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 -msgid "Shortcut:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 -msgid "Could not grab the keyboard." -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:3 -msgid "Xfce 4 Widgets" -msgstr "" diff -Nru libxfce4ui-4.8.1/po/tl.po libxfce4ui-4.12.1/po/tl.po --- libxfce4ui-4.8.1/po/tl.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/tl.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,418 +0,0 @@ -# Tagalog translation of libxfce4ui -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Charles Casuga , 2011. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-17 13:15+0000\n" -"PO-Revision-Date: 2009-04-20 14:08+0200\n" -"Last-Translator: charles casuga \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" - -#: ../libxfce4ui/xfce-dialogs.c:68 -msgid "Information" -msgstr "Impormasyon" - -#: ../libxfce4ui/xfce-dialogs.c:101 -msgid "Warning" -msgstr "Babala" - -#: ../libxfce4ui/xfce-dialogs.c:135 -msgid "Error" -msgstr "Error" - -#: ../libxfce4ui/xfce-dialogs.c:186 -msgid "Question" -msgstr "Tanong" - -#: ../libxfce4ui/xfce-sm-client.c:1402 -msgid "Session management client ID" -msgstr "ID ng kliyente sa pamamahala ng sesyon" - -#: ../libxfce4ui/xfce-sm-client.c:1402 -msgid "ID" -msgstr "ID" - -#: ../libxfce4ui/xfce-sm-client.c:1403 -msgid "Disable session management" -msgstr "Huwag paganahin ang pamamahala ng sesyon" - -#: ../libxfce4ui/xfce-sm-client.c:1413 -msgid "Session management options" -msgstr "Mga opsyon sa pamamahala ng sesyon" - -#: ../libxfce4ui/xfce-sm-client.c:1414 -msgid "Show session management options" -msgstr "Ipakita ang mga opsyon sa pamamahala ng sesyon" - -#: ../libxfce4ui/xfce-sm-client.c:1590 -#, c-format -msgid "Failed to connect to the session manager: %s" -msgstr "Nabigong kumonekta sa namamahala ng sesyon" - -#: ../libxfce4ui/xfce-sm-client.c:1597 -#, c-format -msgid "Session manager did not return a valid client id" -msgstr "Ang namamahala ng sesyon ay hindi nagbalik ng balidong ID ng kliyente" - -#. print warning for user -#: ../libxfce4ui/xfce-spawn.c:406 -#, c-format -msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -#, c-format -msgid "Use '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 -#, c-format -msgid "" -"This shortcut is already being used for the command '%s'. Which action do " -"you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 -msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 -#, c-format -msgid "Conflicting actions for %s" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 -msgid "This shortcut is already being used for something else." -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 -msgid "Window Manager Action Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215 -msgid "Action:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 -msgid "Command Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:210 -msgid "Command:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:214 -msgid "Shortcut" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:255 -msgid "Shortcut:" -msgstr "" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:300 -msgid "Could not grab the keyboard." -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "" - -#: ../glade/libxfce4ui.xml.in.h:3 -msgid "Xfce 4 Widgets" -msgstr "" - -#: ../xfce4-about/main.c:52 -#, fuzzy -msgid "Version information" -msgstr "Impormasyon" - -#: ../xfce4-about/main.c:70 -msgid "Window Manager" -msgstr "" - -#: ../xfce4-about/main.c:71 -msgid "Handles the placement of windows on the screen." -msgstr "" - -#: ../xfce4-about/main.c:74 -msgid "Panel" -msgstr "" - -#: ../xfce4-about/main.c:75 -msgid "" -"Program launchers, window buttons, applications menu, workspace switcher and " -"more." -msgstr "" - -#: ../xfce4-about/main.c:79 -msgid "Desktop Manager" -msgstr "" - -#: ../xfce4-about/main.c:80 -msgid "" -"Sets the background color or image with optional application menu or icons " -"for minimized applications or launchers, devices and folders." -msgstr "" - -#: ../xfce4-about/main.c:84 -msgid "File Manager " -msgstr "" - -#: ../xfce4-about/main.c:85 -msgid "" -"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " -"and fast." -msgstr "" - -#: ../xfce4-about/main.c:89 -msgid "Session Manager" -msgstr "" - -#: ../xfce4-about/main.c:90 -msgid "" -"Restores your session on startup and allows you to shutdown the computer " -"from Xfce." -msgstr "" - -#: ../xfce4-about/main.c:94 -msgid "Setting System" -msgstr "" - -#: ../xfce4-about/main.c:95 -msgid "" -"Configuration system to control various aspects of the desktop like " -"appearance, display, keyboard and mouse settings." -msgstr "" - -#: ../xfce4-about/main.c:99 -msgid "Application Finder" -msgstr "" - -#: ../xfce4-about/main.c:100 -msgid "" -"Shows the applications installed on your system in categories, so you can " -"quickly find and launch them." -msgstr "" - -#: ../xfce4-about/main.c:104 -msgid "Settings Daemon" -msgstr "" - -#: ../xfce4-about/main.c:105 -msgid "D-Bus-based configuration storage system." -msgstr "" - -#: ../xfce4-about/main.c:112 -msgid "" -"Xfce is a collection of programs that together provide a full-featured " -"desktop environment. The following programs are part of the Xfce core:" -msgstr "" - -#: ../xfce4-about/main.c:136 -msgid "" -"Xfce is also a development platform providing several libraries, that help " -"programmers create applications that fit in well with the desktop " -"environment." -msgstr "" - -#: ../xfce4-about/main.c:142 -msgid "" -"Xfce components are licensed under free or open source licences; GPL or BSDL " -"for applications and LGPL or BSDL for libraries. Look at the documentation, " -"the source code or the Xfce website (http://www.xfce.org) for more " -"information." -msgstr "" - -#: ../xfce4-about/main.c:149 -msgid "Thank you for your interest in Xfce." -msgstr "" - -#: ../xfce4-about/main.c:153 -msgid "The Xfce Development Team" -msgstr "" - -#: ../xfce4-about/main.c:262 -msgid "" -"If you know of anyone missing from this list; don't hesitate and file a bug " -"on ." -msgstr "" - -#: ../xfce4-about/main.c:266 -msgid "Thanks to all who helped making this software available!" -msgstr "" - -#: ../xfce4-about/main.c:283 -msgid "" -"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " -"components are copyrighted by their respective authors." -msgstr "" - -#: ../xfce4-about/main.c:288 -msgid "" -"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " -"distributed under the terms of the GNU Library General Public License as " -"published by the Free Software Foundation; either version 2 of the License, " -"or (at your option) any later version." -msgstr "" - -#: ../xfce4-about/main.c:295 -msgid "" -"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" -"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." -msgstr "" - -#: ../xfce4-about/main.c:442 -#, c-format -msgid "Type '%s --help' for usage information." -msgstr "" - -#: ../xfce4-about/main.c:448 -msgid "Unable to initialize GTK+." -msgstr "" - -#: ../xfce4-about/main.c:457 -msgid "The Xfce development team. All rights reserved." -msgstr "" - -#: ../xfce4-about/main.c:458 -#, c-format -msgid "Please report bugs to <%s>." -msgstr "" - -#. I18N: date/time the translators list was updated -#: ../xfce4-about/main.c:461 -#, c-format -msgid "Translators list from %s." -msgstr "" - -#: ../xfce4-about/main.c:471 -msgid "Failed to load interface" -msgstr "" - -#. I18N: first %s will be replaced by the version, second by -#. * the name of the distribution (--with-vendor-info=NAME) -#: ../xfce4-about/main.c:485 -#, c-format -msgid "Version %s, distributed by %s" -msgstr "" - -#. I18N: %s will be replaced by the Xfce version number -#: ../xfce4-about/main.c:489 -#, c-format -msgid "Version %s" -msgstr "" - -#. { N_("Project Lead"), -#. xfce_contributors_lead -#. }, -#: ../xfce4-about/contributors.h:127 -msgid "Core developers" -msgstr "" - -#: ../xfce4-about/contributors.h:130 -msgid "Active contributors" -msgstr "" - -#: ../xfce4-about/contributors.h:133 -msgid "Servers maintained by" -msgstr "" - -#: ../xfce4-about/contributors.h:136 -msgid "Goodies supervision" -msgstr "" - -#: ../xfce4-about/contributors.h:139 -msgid "Translations supervision" -msgstr "" - -#: ../xfce4-about/contributors.h:142 -msgid "Translators" -msgstr "" - -#: ../xfce4-about/contributors.h:145 -msgid "Previous contributors" -msgstr "" - -#: ../xfce4-about/xfce4-about.desktop.in.h:1 -msgid "About Xfce" -msgstr "" - -#: ../xfce4-about/xfce4-about.desktop.in.h:2 -msgid "Information about the Xfce Desktop Environment" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:1 -msgid "About" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:2 -msgid "About the Xfce Desktop Environment" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:3 -msgid "BSD" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:4 -msgid "Copyright" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:5 -msgid "Credits" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:6 -msgid "GPL" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:7 -msgid "LGPL" -msgstr "" - -#: ../xfce4-about/xfce4-about-dialog.glade.h:8 -msgid "License" -msgstr "" diff -Nru libxfce4ui-4.8.1/po/tr.po libxfce4ui-4.12.1/po/tr.po --- libxfce4ui-4.8.1/po/tr.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/tr.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,202 +1,782 @@ -# Turkish translation of libxfce4ui -# Copyright (C) 2008 Gökmen Görgen -# This file is distributed under the same license as the xfce package. -# -# Gökmen Görgen , 2008. -# Ayhan YALÇINSOY , 2010. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Ayhan YALÇINSOY , 2010 +# Gökmen Görgen , 2008 +# Natavan Mirzayeva , 2015 +# Volkan Gezer , 2013 msgid "" msgstr "" -"Project-Id-Version: SVN\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-05-09 21:08+0200\n" -"Last-Translator: Gökmen Görgen \n" -"Language-Team: Turkish \n" -"Language: tr\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-14 23:37+0000\n" +"Last-Translator: Natavan Mirzayeva \n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/libxfce4ui/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Çevrimiçi belgelendirme için tarayıcı açılamadı" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "%s kılavuzunu çevrimiçi okumak ister misiniz?" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Kılavuzu çevrimiçi okumak ister misiniz?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Çevrimiçi Belgelendirme" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Yardım sayfalarının güncellendiği ve çevrildiği dökümantasyon sayfasına yönlendirileceksiniz." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Çevrimiçi Oku" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Her zaman doğrudan çevrimiçi belgelendirmeye git" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Bilgi" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "Uyarı" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Hata" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Soru" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "Oturum yönetimi istemci kimliği" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "Kimlik" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Oturum yönetimi kapalı" +msgstr "Oturum yönetimini devre dışı bırak" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "Oturum yönetimi seçenekleri" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "Oturum yönetimi seçeneklerini göster" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Oturum yöneticisine bağlanırken hata oluştu: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Oturum yöneticisi geçerli bir istemci kimliği getirmedi" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "\"%s\" çalışma dizini yok. \"%s\" oluşturulurken kullanılamayacak." -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Bu kısayol başka bir pencere yönetimi eylemi için kullanılmaktadır. Hangi " -"eylemi kullanmak istersiniz?" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Bu kısayol aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Kullan: '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Diğerini koru" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Koru: '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Bu kısayol aynı zamanda '%s' komutu için de kullanılmaktadır. Hangisini " -"eylemi kullanmak istersiniz?" +msgstr "Bu kısayol aynı zamanda '%s' komutu için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Koru: '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Bu kısayol başka bir pencere yönetimi eylemi için de kullanılmaktadır. Hangi " -"eylemi kullanmak istersiniz?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Bu kısayol aynı zamanda '%s' eylemi için de kullanılmaktadır. Hangi eylemi kullanmak istersiniz?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Lütfen farklı bir tuş bileşimi kullanın." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Pencere yönetimi eylemini koru" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s zaten bu eylemi tetikliyor." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s için çelişen eylemler" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Bu kısayol başka bir şey için de kullanılmış durumda." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "Pencere Yönetimi Eylemi Kısayolu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Eylem:" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "eylem" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "Komut Kısayolu" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Komut:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "komut" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "Kısayol" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_İptal" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Şimdi %s '%s' eylemini tetiklemede kullanmak istediğiniz klavye tuşlarına basın." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Kısayol:" +msgstr "Kısayol yok" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Henüz bir tuşa basılmadı, devam et." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Klavyeyi tanıyamadı." +msgstr "Klavye yakalanamadı." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Altyazı" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Pencere işlem menüsü" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Yukarı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Aşağı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Sol" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Sağ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "İptal" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Pencereleri çevir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Pencereleri çevir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Aynı uygulama için pencereyi değiştir." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Uygulamayı değiştir" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Pencereyi kapat" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Pencereyi yatay olarak büyült" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Pencereyi dikey olarak büyült" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Pencereyi büyüt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Pencereyi sakla" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Pencereyi taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Pencereyi yeniden boyutlandır" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Pencereyi gölgele" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Pencereyi yapıştır" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Pencereyi yükselt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Alçak pencere" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Pencereyi yükselt veya alçalt" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Pencereyi büyült" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Pencereyi yatay olarak büyült" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Pencereyi dikey olarak büyült" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Yukarıdakine geçiş" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Tam ekrana geçiş" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Pencereyi üst çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Pencereyi alt çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Pencereyi sol çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Pencereyi sağ çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Pencereyi önceki çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Pencereyi sonraki çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Pencereyi 1. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Pencereyi 2. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Pencereyi 3. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Pencereyi 4. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Pencereyi 5. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Pencereyi 6. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Pencereyi 7. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Pencereyi 8. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Pencereyi 9. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Pencereyi 10. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Pencereyi 11. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Pencereyi 12. çalışma alanına taşı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Pencere yukarıyı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Pencere aşağıyı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Pencere solu kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Pencere sağı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Pencer sol-üst kısmı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Pencere sağ-üst kısmı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Pencere sol-alt kısmı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Pencere sağ-alt kısmı kaplasın" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Masaüstünü göster" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Üst çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Alt çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Sol çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Sağ çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Önceki çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Sonraki çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "1. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "2. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "3. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "4. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "5. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "6. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "7. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "8. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "9. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "10. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "11. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "12. çalışma alanı" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Çalışma alanı ekle" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Bitişik çalışma alanı ekle" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Son çalışma alanını sil" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Etkin çalışma alanını sil" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Başlıklı Pencere" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Alt başlık" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 Parçacıkları" +msgstr "Xfce 4 Gereçleri" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Sürüm bilgisi" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Pencere Yöneticisi" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Pencerelerin ekran üzerinde yerleştirilmesiyle ilgilenir." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Panel" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Program başlatıcıları, pencere düğmeleri, uygulama menüleri, çalışma alanı değiştirici ve daha fazlası." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Masaüstü Yöneticisi" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Arkaplan rengi ya da duvar kağıdını, bir uygulama menüsü ile değiştirir ya da küçültülmüş uygulamalar veya başlatıcılar, aygıtlar ve dizinler için ikonları değiştirir." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Dosya Yöneticisi" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Linux/Unix masaüstü için, kullanımının basit ve hızlı olmasını amaç edinmiş, çağdaş bir dosya yöneticisi." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Oturum Yöneticisi" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Başlangıçta oturumunuzu geri getirir ve Xfce içerisinden bilgisayarınızı kapatma imkanı sağlar." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Ayar Sistemi" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Masaüstü ortamının görünüş, sunum, tuş takımını ve fare ayarları gibi yönlerini kontrol etmek için yapılandırma sistemi." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Uygulama Bulucu" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Sisteminizde kurulu uygulamaları kategoriler biçiminde gösterir, böylece onları hızlıca bulabilir ve başlatabilirsiniz." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Ayar Yardımcısı" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "D-Bus-temelli yapılandırma saklama sistemi." -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Dosya geçerli bir .desktop dosyası değil" +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce birlikte kapsamlı bir masaüstü ortamı sağlayan bir programlar derlemesidir. Aşağıdaki programlar Xfce çekirdeğinin parçasıdır:" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Algılanamayan bir desktop dosyası Sürüm '%s'" +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce aynı zamanda, programcılara masaüstü ortamına güzelce uyan uygulamalar yaratmasına imkan veren kütüphaneler sunan bir geliştirme altyapısıdır." -#~ msgid "Starting %s" -#~ msgstr "Başlatıyor %s" +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce bileşenleri özgür veya açık kaynak lisanslarıyla tescillenmiştir; uygulamalar için GPL or BSDL and kütüphaneler için LGPL or BSDL lisansları kullanılır. Daha fazla bilgi için yardım belgelerine, kaynak koda veya Xfce internet sitesine (http://www.xfce.org) göz atın." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Xfce'ye ilginiz için teşekkürler" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce Geliştirme Takımı" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Uygulama, dosyaları komut satırından açmayı kabul edemez" +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Bu listede birilerinin eksik olduğunu düşünüyorsanız lütfen adresini kullanarak bizi bilgilendirmekten çekinmeyin." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Bu yazılıma yardım eden ve emeği geçen herkese teşekkürler!" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Tanınmayan başlatma seçeneği: %d" +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4'ün kopyalama hakları Olivier Fourdan'a (fourdan@xfce.org) aittir. Farklı bileşenlerin kopyalama hakları ilgili yazarlara aittir." -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "Belge URIlerini bir 'Type=Link' masaüstü girişi haline getiremiyor" +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs ve exo paketleri Özgür Yazılım Vakfı tarafından yayımlanan GNU Kütüphane Genel Kamu Lisansı hükümleri altında dağıtılmaktadır; ya bu lisansın 2. versiyonu veya (sizin kararınıza göre) daha sonraki bir versiyonu geçerlidir." -#~ msgid "Not a launchable item" -#~ msgstr "Başlatılacak öge yok" +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop ve xfwm4 paketleri Özgür Yazılım Vakfı tarafından yayımlanan GNU Genel Kamu Lisansı hükümleri altında dağıtılmaktadır; ya bu lisansın 2. versiyonu veya (sizin kararınıza göre) daha sonraki bir versiyonu geçerlidir." -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Kaydedilmiş yapılandırmayı içeren dosyayı belirt" +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Kullanım bilgisi için '%s --help' yazın." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "GTK+ başlatılamıyor." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce geliştirme takımı. Tüm hakları saklıdır." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Lütfen hataları <%s> adresine bildirin." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "%sden çevirmenler listesi." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Arayüzün yüklenmesi başarısız oldu" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Sürüm %s, %s tarafından dağıtılıyor." + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Sürüm %s" -#~ msgid "FILE" -#~ msgstr "DOSYA" +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Ana geliştiriciler" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Aktif katkıcılar" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Sunucuların bakımını yapanlar" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Goodies sorumlusu" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Çeviri sorumlusu" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Çevirmenler" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Önceki katkıcılar" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Xfce Hakkında" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Xfce Masaüstü Ortamı hakkında bilgi" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Xfce Masaüstü Ortamı Hakkında" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Hakkında" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Geliştiriciler" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Telif Hakkı" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Lisans" diff -Nru libxfce4ui-4.8.1/po/ug.po libxfce4ui-4.12.1/po/ug.po --- libxfce4ui-4.8.1/po/ug.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ug.po 2013-10-04 08:51:42.000000000 +0000 @@ -1,167 +1,759 @@ -# Uyghur translations for libxfce4ui package. -# Copyright (C) 2008 THE libxfce4ui'S COPYRIGHT HOLDER -# This file is distributed under the same license as the libxfce4ui package. -# Gheyret T.Kenji , 2010. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Abduqadir Abliz , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2009-10-21 00:36+0900\n" -"Last-Translator: Gheyret T.Kenji \n" -"Language-Team:Uyghur Computer Science Association \n" -"Language: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-08-17 02:17+0000\n" +"Last-Translator: Abduqadir Abliz \n" +"Language-Team: Uighur (http://www.transifex.com/projects/p/xfce/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ug\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "توردىكى پۈتۈكلەرنى كۆرۈش ئۈچۈن توركۆرگۈنى ئېچىشتا خاتالىق كۆرۈلدى" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "قوللانما %s نى توردا ئوقۇمسىز؟" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "قوللانمىنى توردا ئوقۇمسىز؟" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "توردىكى پۈتۈك" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "سىز ياردەم بەتلىرى ۋە تەرجىمىلىرى بار بەتكە بىۋاسىتە بارىسىز." + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "توردا ئوقۇ(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "ھەمىشە توردىكى پۈتۈككە بىۋاسىتە يۆتكەل(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:281 msgid "Information" msgstr "ئۇچۇر" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "دىققەت" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "خاتالىق" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "سوئال" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "ئەڭگىمە باشقۇرۇش client ID" +msgstr "سۆزلىشىش باشقۇرۇش خېرىدار ID سى" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "ئەڭگىمە باشقۇرۇشنى ئىناۋەتسىز قىل" +msgstr "سۆزلىشىش باشقۇرۇشنى چەكلە" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "ئەڭگىمە باشقۇرۇش تاللانمىلىرى" +msgstr "سۆزلىشىش باشقۇرۇش تاللانمىلىرى" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "ئەڭگىمە باشقۇرۇش تاللانمىلىرىنى كۆرسەت" +msgstr "سۆزلىشىش باشقۇرۇش تاللانمىلىرىنى كۆرسەت" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "ئەڭگىمە باشقۇرغۇغا باغلىنىش مەغلۇپ بولدى: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "ئەڭگىمە باشقۇرغۇ ئىناۋەتلىك client id نى قايتۇرمىدى" +msgstr "ئەڭگىمە باشقۇرغۇ ئىناۋەتلىك خېرىدار كىملىكىنى قايتۇرمىدى" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"خىزمەت مۇندەرىجىسى \"%s\" يوقتەك قىلىدۇ. \"%s\" نى ھاسىل قىلغاندا " -"ئىشلىتىلمەيدۇ." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"مەزكۇر تېزلەتمە باشقا كۆزنەك باشقۇرغۇدا ئىشلىتىلىۋاتىدۇ. قايسىنى ئىشلىتىسىز؟" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "خىزمەت مۇندەرىجىسى «%s» يوق. «%s» نى ھاسىل قىلغاندا ئىشلىتىلمەيدۇ." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "بۇ قىسقا يول '%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى ئىشلىتىسىز؟" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "'%s' نى ئىشلىتىش" +msgstr "‹%s› نى ئىشلەت" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "باشقىسىنى ئىشلىتىش" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "‹%s› نى ئىشلەت" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "مەزكۇر تېزلەتمە '%s' بۇيرۇقتا ئىشلىتىلىۋاتىدۇ.قايسىسىنى ئىشلىتىسىز؟" +msgstr "مەزكۇر تېزلەتمە ‹%s› بۇيرۇقتا ئىشلىتىلىۋاتىدۇ. قايسىسىنى ئىشلىتىسىز؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "'%s' نى ئىشلىتىش" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"مەزكۇر تېزلەتمە باشقا كۆزنەك باشقۇرغۇدا ئىشلىتىلىۋاتىدۇ. قايسىنى ئىشلىتىسىز؟" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "بۇ قىسقا يول'%s' مەشغۇلات ئۈچۈن ئىشلىتىلگەن. سىز قايسى مەشغۇلاتنى ئىشلىتىسىز؟" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "باشقا بىرىكمە كۇنۇپكا ئىشلىتىڭ." -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "كۆزنەك باشقۇرغۇدىكىنى ئىشلىتىش" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "بۇ %s بولسا ئاللىقاچان مەزكۇر مەشغۇلاتنى پايلاۋاتىدۇ." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s توقۇنۇشۇپ قالدى" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 msgid "This shortcut is already being used for something else." msgstr "مەزكۇر تېزلەتمە باشقا يەردە ئىشلىتىلىۋاتىدۇ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "كۆزنەك باشقۇرغۇ تېزلەتمە بۇيرۇقى" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "ھەرىكەت:" +msgstr "كۆزنەك باشقۇرغۇچ مەشغۇلات قىسقا يولى" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "مەشغۇلات" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "بۇيرۇقنىڭ تېزلەتمىسى" +msgstr "بۇيرۇق قىسقا يولى" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "بۇيرۇق:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "بۇيرۇق" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "تېزلەتمە" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "ھازىر %s '%s' نى قوزغىتىدىغان ھەرپتاختا كۇنۇپكىسىنى بېسىڭ." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 msgid "Shortcut:" -msgstr "تېزلەتمە:" +msgstr "قىسقا يول:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "تېخى ھېچقانداق كۇنۇپكا بېسىلمىدى، داۋاملاشتۇرۇڭ." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 msgid "Could not grab the keyboard." -msgstr "ھەرپتاختا تۇتقىلى بولمىدى" +msgstr "ھەرپتاختا كىرگۈزۈشىگە ئېرىشەلمىدى." + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "كۆزنەك مەشغۇلاتلىرى تىزىملىكى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "ئۈستى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "ئاستى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "سول" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "ئوڭ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "ۋاز كەچ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "كۆزنەكنى ئالماشتۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "كۆزنەكنى ئالماشتۇر(تەتۈر يۆنىلىشتە)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "ئوخشاش پروگراممىنىڭ كۆزنىكىنى ئالماشتۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "پروگرامما ئالماشتۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "كۆزنەك تاقا" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "گورىزونتال يۆنىلىشتە ئەڭ چوڭ قىل" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "ۋېرتىكال يۆنىلىشتە ئەڭ چوڭ قىل" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "كۆزنەكنى ئەڭ چوڭ قىلىدۇ" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "كۆزنەكنى يوشۇرۇش" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "كۆزنەك يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "كۆزنەك چوڭلۇقنى ئۆزگەرت" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "كۆزنەكنى سايىلەش" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "كۆزنەكنى قاداپ قوي" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "كۆزنەكنى كۆتۈر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "كۆزنەكنى باس" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "كۆزنەكنى ئۆرلەت ياكى تۆۋەنلەت" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "كۆزنەكنى تولدۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "كۆزنەكنى گورىزونتال يۆنىلىشتە تولدۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "كۆزنەكنى ۋېرتىكال يۆنىلىشتە تولدۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "ئۈستىدىكىسىگە ئالماشتۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "پۈتۈن ئېكران شەكلىگە ئالماشتۇر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "كۆزنەكنى ئۈستىدىكى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "كۆزنەكنى تۆۋەندىكى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "كۆزنەكنى سولدىكى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "كۆزنەكنى ئوڭدىكى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "كۆزنەكنى ئالدىنقى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "كۆزنەكنى كېيىنكى خىزمەت رايونىغا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "كۆزنەكنى خىزمەت رايونى 1 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "كۆزنەكنى خىزمەت رايونى 2 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "كۆزنەكنى خىزمەت رايونى 3 كە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "كۆزنەكنى خىزمەت رايونى 4 كە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "كۆزنەكنى خىزمەت رايونى 5 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "كۆزنەكنى خىزمەت رايونى 6 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "كۆزنەكنى خىزمەت رايونى 7 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "كۆزنەكنى خىزمەت رايونى 8 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "كۆزنەكنى خىزمەت رايونى 1 غا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "كۆزنەكنى خىزمەت رايونى 10 غا يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "كۆزنەكنى خىزمەت رايونى 11 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "كۆزنەكنى خىزمەت رايونى 12 گە يۆتكە" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "ئۈستى تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "ئاستى تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "سول تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "ئوڭ تەرەپكە كۆزنەكنى كاھىش شەكىلدە تىز" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "ئۈستەلئۈستىنى كۆرسەت" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "ئۈستىدىكى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "ئاستىدىكى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "سولدىكى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "ئوڭدىكى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "ئالدىنقى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "كېيىنكى خىزمەت رايونى" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "خىزمەت رايونى 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "خىزمەت رايونى 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "خىزمەت رايونى 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "خىزمەت رايونى 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "خىزمەت رايونى 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "خىزمەت رايونى 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "خىزمەت رايونى 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "خىزمەت رايونى 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "خىزمەت رايونى 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "خىزمەت رايونى 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "خىزمەت رايونى 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "خىزمەت رايونى 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "خىزمەت رايونى قوش" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "تۇتاش خىزمەت رايونى قوش" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "ئەڭ ئاخىرقى خىزمەت رايونىنى ئۆچۈر" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "ئاكتىپ خىزمەت رايونىنى ئۆچۈر" #: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "كىچىك ماۋزۇ" +msgid "Titled Dialog" +msgstr "ماۋزۇلۇق سۆزلەشكۈ" #: ../glade/libxfce4ui.xml.in.h:2 -msgid "Titled Dialog" -msgstr "ماۋزۇلۇق كۆزنەك" +msgid "Subtitle" +msgstr "تارماق ماۋزۇ" #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 نىڭ Widget لىرى" +msgstr "بۇ Xfce 4 نىڭ كىچىك ئەپلىرى" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "نەشر ئۇچۇرى" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "كۆزنەك باشقۇرغۇ" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "كۆزنەكنىڭ ئېكراندىكى جايلاشتۇرۇلۇشىنى بىر تەرەپ قىلىدۇ." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "كۆزنەك" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "ئىجراچىلار، كۆزنەك توپچىلىرى، پروگرامما تىزىملىكى، خىزمەت رايونى ئالماشتۇرغۇ ۋە باشقىلار." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "ئۈستەلئۈستى باشقۇرغۇچ" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "كىچىكلىتىلگەن پروگرامما ياكى ئىجراچى،ئۈسكۈنە ۋە قىسقۇچلارنىڭ تەگلىك رەڭگى ياكى تەگلىك سۈرەتلىرىنى، پروگرامما تىزىملىكى ۋە سىنبەلگىلىرىنى بەلگىلەيدۇ." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "ھۆججەت باشقۇرغۇچ" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "زامانىۋى ، ئىشلىتىشكە ئەپلىك ۋە تېز بولغان يۇنىكىس/لىنۇكىس سىستېمىسىنىڭ ھۆججەت باشقۇرغۇسى." + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "سۆزلىشىش باشقۇرغۇچ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "باشلانغاندا سىزنىڭ ئەڭگىمىڭىزنى ئەسلىگە كەلتۈرىدۇ ۋە Xfce ئارقىلىق سىستېمىنى تاقاشقا بولىدۇ." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "سىستېما تەڭشەش" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "ئۈستەلئۈستىنىڭ كۆرۈنۈشى، كۆرسەتكۈچ، ھەرپتاختا ۋە چاشقىنەك ۋە باشقا ھەر خىل تەڭشەش مەشغۇلاتلىرىنى ئېلىپ بېرىشقا بولىدۇ." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "پروگرامما ئىزدىگۈ" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "سىستېمىغا ئورنىتىلغان پروگراممىلارنى كاتېگورىيەسى بويىچە كۆرسىتىپ بېرىدۇ. شۇڭا سىز پروگراممىلارنى ئاسانلا تاپالايسىز." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "تەڭشەك كۆزەتكۈچى" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "سەپلىمىلەرنى D-Bus ئاساسىدىكى ساقلىغۇچتا ساقلاش سىستېمىسى." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "مەزكۇر ئۈستەلئۈستى سىستېمىسى(Xfce) نۇرغۇن پروگراممىلاردىن تەركىب تاپقان بولۇپ، ئۇلار بىرلىشىش ئارقىلىق مۇكەممەل بولغان ئۈستەلئۈستى مۇھىتىنى بارلىققا كەلتۈرگەن. تۆۋەندىكىلەر مەزكۇر ئۈستەلئۈستىنىڭ يادرولۇق بۆلەكچىلىرىدۇر:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "مەزكۇر سىستېما ئۈستەلئۈستى سىستېمىسى بولۇپلا قالماستىن يەنە بىر قىسىم ئامبارلاردىن تەركىب تاپقان ئىجادىيەت سىستېمىسىدۇر. شۇڭا ئىجادىيەتچىلەر مەزكۇر مۇھىتقا ماس كېلىدىغان ئەپلەرنى ياسىيالايدۇ." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "مەزكۇر سىستېمىنىڭ بارلىق بۆلەكلىرى ئەركىن ياكى ئوچۇق مەنبە ئىجازەتنامىلىرى بىلەن تارقىتىلغان بولۇپ، پروگراممىلار GPL ياكى BSDL ئىجازەتنامىسى بويىچە، ئامبارلار بولسا LGPL ياكى BSDL ئىجازەتنامىسى بويىچە تارقىتىلغان. تەپسىلىي ئۇچۇرلارنى ۋە قوللانمىلارنى Xfce تورتۇراسى (http://www.xfce.org) دىن كۆرۈڭ." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "مەزكۇر Xfce سىستېمىسىغا قىزىققانلىقىڭىز ئۈچۈن تەشەككۈر." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce ئىجادىيەت ئەترىتى" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "تىزىمدىن كەم قالغان بىرەر نەرسىنى بايقىسىڭىز تارتىنماستىن گە كەمتۈك يوللىشىڭىزنى ئۈمىد قىلىمىز." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "مەزكۇر يۇمشاق دېتالغا تۆھپە قوشقان بارلىق كىشىلەرگە تەشەككۈرلەر بولسۇن!" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "نەشر ھوقۇقى Olivier Fourdan (fourdan@xfce.org) غا تەۋە. ئوخشىمىغان بۆلەكلەرنىڭ نەشر ھوقۇقى ئۇلارنىڭ ئاپتورلىرىغا تەۋە." + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "بۇ بوغچىلار(ibxfce4ui، libxfcegui4، libxfce4util، thunar-vfs ۋە exo) ئەركىن يۇمشاق دېتال فوندىنىڭ GNU Library General Public License دېگەن ئىجازەتنامىسىنىڭ ئىككىنچى نەشرىنىڭ ياكى كېيىنكى نەشرلىرىنىڭ ماددىلىرى بويىچە تارقىتىلدى." + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "بۇ بوغچىلار(thunar، xfce4-appfinder، xfce4-panel، xfce4-session، xfce4-settings، xfce-utils، xfconf، xfdesktop ۋە xfwm4) ئەركىن يۇمشاق دېتال فوندىنىڭ GNU General Public License دېگەن ئىجازەتنامىسىنىڭ ئىككىنچى نەشرىنىڭ ياكى كېيىنكى نەشرلىرىنىڭ ماددىلىرى بويىچە تارقىتىلدى." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "ئىشلىتىش ئۇسۇلى ئۈچۈن '%s --help' نى كىرگۈزۈڭ" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "GTK+ دەسلەپلەشتۈرگىلى بولمىدى." + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce ئىجادىيەت گۇرۇپپىسى. نەشر ھوقۇقى ئۆزىمىزگە تەۋە." + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "كەمتۈكنى <%s> غا دوكلات قىلىڭ." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "تەرجىمانلار تىزىمى (%s دىن)." + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "ئارايۈزنى ئوقۇش مەغلۇپ بولدى" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "نەشر %s، تارقاتقۇچى %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "نەشرى %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "ئاساسلىق ئىجادىيەتچىلەر" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "ئاكتىپ تۆھپىكارلار" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "مۇلازىمېتىر مەسئۇللىرى" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "Goodies يېتەكچىسى" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "تەرجىمە يېتەكچىسى" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "تەرجىمانلار" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "ئىلگىرىكى تۆھپىكارلار" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "مەزكۇر Xfce ھەققىدە" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "مەزكۇر Xfce ئۈستەلئۈستى مۇھىتى ھەققىدە ئۇچۇر" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "مەزكۇر ئۈستەلئۈستى مۇھىتى(Xfce) ھەققىدە" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "ھەققىدە" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "تەشەككۈر" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "نەشر ھوقۇقى" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "ئىجازەتنامە" diff -Nru libxfce4ui-4.8.1/po/uk.po libxfce4ui-4.12.1/po/uk.po --- libxfce4ui-4.8.1/po/uk.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/uk.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,172 +1,780 @@ -# Ukrainian translation of libxfce4ui. -# Copyright (C) 2008 Dmitry Nikitin -# This file is distributed under the same license as the libxfce4ui package. -# -# Dmitry Nikitin , 2008. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Dmitry Nikitin , 2008 +# Yarema aka Knedlyk , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2008-06-30 17:35+0300\n" -"Last-Translator: Dmitry Nikitin \n" -"Language-Team: Ukrainian \n" -"Language: uk\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-10 00:07+0000\n" +"Last-Translator: Yarema aka Knedlyk \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libxfce4ui/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"Language: uk\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" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "Не можу відкрити переглядач для документації онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "Ви бажаєте переглянути документацію по %s онлайн?" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "Ви бажаєте переглянути документацію онлайн?" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "Документація онлайн" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "Вас буде скеровано до веб-сторінки з документацією, що містить допомогу і її переклади." + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "_Переглянути онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "_Завжди переходити безпосередньо до документації онлайн" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "Інформація" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" -msgstr "Перередження" +msgstr "Попередження" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "Помилка" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "Запитання" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "Управління сеансом ІН клієнта" +msgstr "ID клієнта менеджера сесії" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ІН" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "Заборонити управління сеансами" +msgstr "Відключення менеджера сесії" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "Опції управління сеансами" +msgstr "Властивості менеджера сесії" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "Показати опції управління сеансами" +msgstr "Показати властивості менеджера сесії" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "Не вдалось з'єднатись з менеджером сеансів: %s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "Менеджер сеансів не повернув правильного ІН клієнта" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "" -"Робоча тека \"%s\" не існує. Вона не буде використовуватися, поки " -"створюється \"%s\"." - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "" -"Цей запускач вже використовувався для іншої дії менеджера вікон. Яку дію ви " -"бажаєте використати?" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "Робоча тека \"%s\" не існує. Вона не буде використовуватися, поки створюється \"%s\"." #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "Використовувати '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "Зберегти попередній" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Зберегти '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "" -"Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте " -"використати?" +msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "Зберегти '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "" -"Цей запускач вже використовується дією менеджера вікон. Яку дію ви бажаєте " -"використати?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "Цей запускач вже використовувався для іншої команди '%s'. Яку дію ви бажаєте використати?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "Будь ласка, використайте іншу комбінацію клавіш" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "Зберегти дію менеджера вікон" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s вже відповідає за цю дію." -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "Конфліктуючі дії для %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." msgstr "Цей запускач вже використовується для чогось іншого." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "Швидкі дії менеджера вікон" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "Дія:" +msgstr "Комбінації клавіш дій віконного менеджера" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "дія" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "Команда дії:" +msgstr "Комбінація клавіш для команди" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "Команда:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "команда" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "Запускач" +msgstr "Комбінація клавіш" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "_Скасувати" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "Натисніть тепер ті кнопки на клавіатурі, які Ви бажаєте використати для %s '%s'." + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "Запускач:" +msgstr "Комбінація клавіш:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "Не натиснуто жодної кнопки, продовжую." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "Не вдалось захопити клавіатуру." +msgstr "Неможливо захопити клавіатуру." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "Підзаголовок" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "Меню операцій з вікнами" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "Вгору" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "Вниз" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "Зліва" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "Справа" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "Скасувати" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "Перемикати вікна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "Перемикання вікон (Зворотнє)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "Перемикати вікна однієї програми" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "Перемикати програми" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "Закрити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "Розгорнути вікно по горизонталі" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "Розгорнути вікно по вертикалі" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "Розгорнути вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "Приховати вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "Перемістити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "Змінити розмір вікна" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "Згорнути вікно у заголовок" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "Приліпити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "Підняти вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "Опустити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "Підняти або опустити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "Заповнити вікно" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "Заповнити вікно по горизонталі" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "Заповнити вікно по вертикалі" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "Вікно згори" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "Повноекранний режим" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "Перемістити вікно на верхню робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "Перемістити вікно на нижню робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "Перемістити вікно на ліву робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "Перемістити вікно на праву робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "Перемістити вікно на попередню робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "Перемістити вікно на наступну робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "Перемістити вікно на робочу область 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "Перемістити вікно на робочу область 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "Перемістити вікно на робочу область 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "Перемістити вікно на робочу область 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "Перемістити вікно на робочу область 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "Перемістити вікно на робочу область 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "Перемістити вікно на робочу область 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "Перемістити вікно на робочу область 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "Перемістити вікно на робочу область 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "Перемістити вікно на робочу область 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "Перемістити вікно на робочу область 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "Перемістити вікно на робочу область 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "Перемістити вікно догори" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "Перемістити вікно донизу" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "Перемістити вікно ліворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "Перемістити вікно праворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "Перемістити вікно вверх ліворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "Перемістити вікно вверх праворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "Перемістити вікно вниз ліворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "Перемістити вікно вниз праворуч" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "Показати стільницю" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "Верхня робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "Нижня робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "Ліва робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "Права робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "Попередня робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "Наступна робоча область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "Робоча область 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "Робоча область 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "Робоча область 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "Робоча область 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "Робоча область 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "Робоча область 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "Робоча область 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "Робоча область 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "Робоча область 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "Робоча область 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "Робоча область 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "Робоча область 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "Додати робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "Додати суміжну робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "Видалити останню робочу область" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "Видалити активну робочу область" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "Відображуваний діалог" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "Підзаголовок" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Віджети Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "Інформація про версію" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Менеджер вікон" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "Управляє розміщення вікон на екрані." + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "Панель" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "Пускачі програм, кнопки вікон, меню програм, переключатель робочих столів і багато іншого." + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "Менеджер стільниці" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "Встановити колір тла або малюнок з опціональним меню програм або іконки для мінімізованих програм або пускачів, пристроїв або тек." + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "Менеджер файлів" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Сучасний менеджер файлів для робочого столу Unix/Linux, легкий для вжитку і швидкий" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "Менеджер сесії" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "Відновлює Ваш сеанс при запуску і дозволяє Вам вимикати комп’ютер з Xfce" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Налаштування системи" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "Налаштування системи для контролю різноманітних властивостей робочого столу, таких як вигляду, екрану, клавіатури і налаштування миші." + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Пошук програм" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "Показує програми, встановлених у Вашій системі в категоріях, так що Ви легко можете знайти їх і запустити." + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "Демон властивостей" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "Система зберігання на базі D-Bus конфігурації." + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce - це колекція програм разом утворюють повноцінне середовище робочого столу. Наступні програми є частиною ядра Xfce:" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce також є платформою для розробки програм, яка містить кілька бібліотек, що допомагають розробникам створювати програми для середовища робочого столу." + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Компоненти Xfce розробляються під вільними або відкрито-джерельними ліцензіямі: GPL або BSDL для програм і LGPL або BSDL для бібліотек. Для перевірки перегляньте документацію, джерельний код або веб-сторінку проекту Xfce (http://www.xfce.org)." + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Дякуємо Вам за зацікавлення проектом Xfce." + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Команда розробників Xfce" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "Якщо Ви помітите, що щось відсутнє у списку, повідомте про це поштою ." + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "Дякуємо усім, хто допоміг появитися цій програмі!" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Всі права на Xfce 4 належать до Olivier Fourdan (fourdan@xfce.org). Права на різні компоненти належать до відповідних авторам." + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "Пакунки libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs і exo розповсюджуються згідно умов GNU Library General Public License, виданою Free Software Foundation; або версії 2 цієї ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "Пакунки thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, xfce-utils, xfconf, xfdesktop і xfwm4 розповсюджуються згідно умов GNU Library General Public License, виданою Free Software Foundation; або версії 2 цієї ліцензії, або (на Ваш розгляд) будь-якої пізнішої версії." + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Введіть \"%s --help\" для допомоги по використанню." + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "Не можу ініціалізувати GTK+." + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Команда розробників Xfce. Всі права застережено." + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Будь-ласка, повідомте про помилку до <%s>." + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "Список перекладачів з %s." + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "Неможливо завантажити інтерфейс" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Версія %s, випущена через %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "Версія %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "Основні розробники" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "Активний внесок через" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "Сервери під наглядом через" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "Нагляд над \"ласощами\"" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "Керівник перекладачів" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "Перекладачі" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "Попередні розробники" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Про Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Інформація про середовище робочого столу Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Про середовище робочого столу Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Про" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Подяки" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Права застережено" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Ліцензія" diff -Nru libxfce4ui-4.8.1/po/ur_PK.po libxfce4ui-4.12.1/po/ur_PK.po --- libxfce4ui-4.8.1/po/ur_PK.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ur_PK.po 2013-10-04 08:51:42.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" "PO-Revision-Date: 2009-07-13 10:00+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" @@ -22,187 +22,818 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +#, fuzzy msgid "Information" -msgstr "معلومات" +msgstr "ورژن معلومات" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "انتباہ" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "غلطی" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "سوال" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 #, fuzzy msgid "Session management client ID" -msgstr "نشست منیجر اختیارات:" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "ID" msgstr "آئی ڈی" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1404 #, fuzzy msgid "Disable session management" -msgstr "نشست منیجر آئی ڈی متعین کریں" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1414 #, fuzzy msgid "Session management options" -msgstr "نشست منیجر اختیارات:" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1415 +#, fuzzy msgid "Show session management options" -msgstr "نشست منیجر کے اختیارات ظاہر کریں" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, fuzzy, c-format msgid "Failed to connect to the session manager: %s" msgstr "نشست منیجر سے اتصال معطل کریں" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid "Session manager did not return a valid client id" msgstr "" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" "\"." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی دوسری ونڈو منیجر حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " -"حرکت استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' استعمال کریں" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "سابقہ کو محفوظ رکھیں" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format +msgid "Keep '%s'" +msgstr "'%s' کو برقرار رکھیں" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی کمانڈ '%s' کے لیے استعمال ہو رہا ہے. آپ کون سی حرکت " -"استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "'%s' کو برقرار رکھیں" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, fuzzy, c-format msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی ونڈو منیجر کی حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " -"حرکت استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "ونڈو منیجر کی حرکت کو برقرار رکھیں" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "تعارضی حرکات برائے %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 msgid "This shortcut is already being used for something else." msgstr "یہ شارٹ کٹ کسی چیز کے لیے پہلے ہی استعمال میں ہے." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy msgid "Window Manager Action Shortcut" -msgstr "ونڈو منیجر حرکت شارٹ کٹ" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "حرکت:" +msgstr "ونڈو منیجر ترتیبات" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "حرکت" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy msgid "Command Shortcut" -msgstr "کمانڈ شارٹ کٹ" +msgstr "شارٹ کٹ بنائیں" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "کمانڈ:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "کمانڈ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "شارٹ کٹ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy msgid "Shortcut:" -msgstr "شارٹ کٹ:" +msgstr "شارٹ کٹ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +#, fuzzy msgid "Could not grab the keyboard." -msgstr "کیبورڈ اٹھایا نہیں جاسکا." +msgstr "ترتیبات ڈائیلاگ نہیں بنایا جاسکتا." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "ذیلی عنوان" +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "ونڈو آپریشن مینیو" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "اوپر" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "نیچے" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "بائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "دائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "مسترد" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "ونڈوز سائکل" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +msgid "Cycle windows (Reverse)" +msgstr "ونڈوز چکر (عکسی)" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "ونڈو_ز مقام کار پر منتقل ہوں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "ونڈو بند کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "ونڈو افقی طور پر بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "ونڈو عمودی طور پر بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "ونڈو بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "ونڈو چھپائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +msgid "Move window" +msgstr "ونڈو منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +msgid "Resize window" +msgstr "ونڈو ری سائز کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "ونڈو شیڈ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "ونڈو چسپاں کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "بڑی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "چھوٹی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "بڑی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +msgid "Fill window" +msgstr "ونڈو بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +msgid "Fill window horizontally" +msgstr "ونڈو افقی طور پر بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +msgid "Fill window vertically" +msgstr "ونڈو عمودی طور پر بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "اوپر منعکس کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "فل سکرین منعکس کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "ونڈو اوپری مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "ونڈو نچلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "ونڈو بائیں مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "ونڈو دائیں مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "ونڈو سابقہ مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "ونڈو اگلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +msgid "Move window to workspace 1" +msgstr "ونڈو مقام کار 1 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +msgid "Move window to workspace 2" +msgstr "ونڈو مقام کار 2 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +msgid "Move window to workspace 3" +msgstr "ونڈو مقام کار 3 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +msgid "Move window to workspace 4" +msgstr "ونڈو مقام کار 4 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +msgid "Move window to workspace 5" +msgstr "ونڈو مقام کار 5 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +msgid "Move window to workspace 6" +msgstr "ونڈو مقام کار 6 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +msgid "Move window to workspace 7" +msgstr "ونڈو مقام کار 7 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +msgid "Move window to workspace 8" +msgstr "ونڈو مقام کار 8 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +msgid "Move window to workspace 9" +msgstr "ونڈو مقام کار 9 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +msgid "Move window to workspace 10" +msgstr "ونڈو مقام کار 10 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +msgid "Move window to workspace 11" +msgstr "ونڈو مقام کار 11 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +msgid "Move window to workspace 12" +msgstr "ونڈو مقام کار 12 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "ونڈو درمیان میں رکھیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "ونڈو نچلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "ونڈو درمیان میں رکھیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "ونڈو دائیں ری سائز کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "ڈیسک ٹاپ ظاہر کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "اوپری مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "نچلا مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "بائیں مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "دائیں مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "سابقہ مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "اگلا مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +msgid "Workspace 1" +msgstr "مقام کار 1" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +msgid "Workspace 2" +msgstr "مقام کار 2" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +msgid "Workspace 3" +msgstr "مقام کار 3" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +msgid "Workspace 4" +msgstr "مقام کار 4" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +msgid "Workspace 5" +msgstr "مقام کار 5" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +msgid "Workspace 6" +msgstr "مقام کار 6" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +msgid "Workspace 7" +msgstr "مقام کار 7" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +msgid "Workspace 8" +msgstr "مقام کار 8" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +msgid "Workspace 9" +msgstr "مقام کار 9" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +msgid "Workspace 10" +msgstr "مقام کار 10" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +msgid "Workspace 11" +msgstr "مقام کار 11" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +msgid "Workspace 12" +msgstr "مقام کار 12" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "مقام کار شامل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +msgid "Add adjacent workspace" +msgstr "نزدیکی مقام کار شامل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +msgid "Delete last workspace" +msgstr "آخری مقام کار حذف کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +msgid "Delete active workspace" +msgstr "فعال مقام کار حذف کریں" + +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "عنوان شدہ ڈائیلاگ" +#: ../glade/libxfce4ui.xml.in.h:2 +#, fuzzy +msgid "Subtitle" +msgstr "عنوان" + #: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy msgid "Xfce 4 Widgets" -msgstr "ایکسفس 4 وجٹس" +msgstr "ایکسفس 4 ونڈو منیجر ترتیبات" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "ورژن معلومات" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "سکرین کے _وسط میں" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "ترتیبات منیجر ساکٹ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +#, fuzzy +msgid "Setting System" +msgstr "%s شروع کیا جارہا ہے" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +#, fuzzy +msgid "Settings Daemon" +msgstr "ترتیبات منیجر ساکٹ" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (پر %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "سابقہ مقام کار" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" + +msgid "" +"This shortcut is already being used for another window manager action. Which " +"action do you want to use?" +msgstr "" +"یہ شارٹ کٹ پہلے ہی دوسری ونڈو منیجر حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " +"حرکت استعمال کرنا چاہتے ہیں؟" + +msgid "Keep the other one" +msgstr "سابقہ کو محفوظ رکھیں" + +msgid "" +"This shortcut is already being used by a window manager action. Which action " +"do you want to use?" +msgstr "" +"یہ شارٹ کٹ پہلے ہی ونڈو منیجر کی حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " +"حرکت استعمال کرنا چاہتے ہیں؟" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "فائل موزوں .desktop فائل نہیں ہے" +msgid "%s" +msgstr "%s" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "غیر پہچان کردہ ڈیسک ٹاپ فائل ورژن '%s'" +msgid "File is not a valid .desktop file" +msgstr "فائل موزوں .desktop فائل نہیں ہے" -#~ msgid "Starting %s" -#~ msgstr "%s شروع کیا جارہا ہے" +msgid "Unrecognized desktop file Version '%s'" +msgstr "غیر پہچان کردہ ڈیسک ٹاپ فائل ورژن '%s'" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "اطلاقیہ کمانڈ لائن پر دستاویزات قبول نہیں کرتا" +msgid "Application does not accept documents on command line" +msgstr "اطلاقیہ کمانڈ لائن پر دستاویزات قبول نہیں کرتا" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "غیر پہچان کردہ چلانے کا اختیار: %d" +msgid "Unrecognized launch option: %d" +msgstr "غیر پہچان کردہ چلانے کا اختیار: %d" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "دستاویز ربط تا 'Type=Link' ڈیسک ٹاپ انٹری پاس نہیں کیا جاسکتا" +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "دستاویز ربط تا 'Type=Link' ڈیسک ٹاپ انٹری پاس نہیں کیا جاسکتا" -#~ msgid "Not a launchable item" -#~ msgstr "چلانے کے قابل عنصر نہیں ہے" +msgid "Not a launchable item" +msgstr "چلانے کے قابل عنصر نہیں ہے" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "محفوظ شدہ وضع کاریوں پر مشتمل فائل متعین کریں" +msgid "Specify file containing saved configuration" +msgstr "محفوظ شدہ وضع کاریوں پر مشتمل فائل متعین کریں" -#~ msgid "FILE" -#~ msgstr "فائل" +msgid "FILE" +msgstr "فائل" diff -Nru libxfce4ui-4.8.1/po/ur.po libxfce4ui-4.12.1/po/ur.po --- libxfce4ui-4.8.1/po/ur.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/ur.po 2013-10-04 08:51:42.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" "PO-Revision-Date: 2009-07-13 10:00+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" @@ -22,187 +22,818 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +#, fuzzy msgid "Information" -msgstr "معلومات" +msgstr "ورژن معلومات" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:314 msgid "Warning" msgstr "انتباہ" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:348 msgid "Error" msgstr "غلطی" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:399 msgid "Question" msgstr "سوال" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 #, fuzzy msgid "Session management client ID" -msgstr "نشست منیجر اختیارات:" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1403 msgid "ID" msgstr "آئی ڈی" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1404 #, fuzzy msgid "Disable session management" -msgstr "نشست منیجر آئی ڈی متعین کریں" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1414 #, fuzzy msgid "Session management options" -msgstr "نشست منیجر اختیارات:" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1415 +#, fuzzy msgid "Show session management options" -msgstr "نشست منیجر کے اختیارات ظاہر کریں" +msgstr "ترتیبات منیجر ساکٹ" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1591 #, fuzzy, c-format msgid "Failed to connect to the session manager: %s" msgstr "نشست منیجر سے اتصال معطل کریں" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1598 #, c-format msgid "Session manager did not return a valid client id" msgstr "" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:413 #, c-format msgid "" "Working directory \"%s\" does not exist. It won't be used when spawning \"%s" "\"." msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی دوسری ونڈو منیجر حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " -"حرکت استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "'%s' استعمال کریں" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "سابقہ کو محفوظ رکھیں" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format +msgid "Keep '%s'" +msgstr "'%s' کو برقرار رکھیں" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی کمانڈ '%s' کے لیے استعمال ہو رہا ہے. آپ کون سی حرکت " -"استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#, c-format -msgid "Keep '%s'" -msgstr "'%s' کو برقرار رکھیں" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, fuzzy, c-format msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" msgstr "" -"یہ شارٹ کٹ پہلے ہی ونڈو منیجر کی حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " -"حرکت استعمال کرنا چاہتے ہیں؟" +"شارٹ کٹ پہلے ہی استعمال میں ہے !\n" +"کیا آپ واقعی اسے استعمال کرنا چاہتے ہیں؟" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "ونڈو منیجر کی حرکت کو برقرار رکھیں" +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "تعارضی حرکات برائے %s" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 msgid "This shortcut is already being used for something else." msgstr "یہ شارٹ کٹ کسی چیز کے لیے پہلے ہی استعمال میں ہے." -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy msgid "Window Manager Action Shortcut" -msgstr "ونڈو منیجر حرکت شارٹ کٹ" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "حرکت:" +msgstr "ونڈو منیجر ترتیبات" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "حرکت" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy msgid "Command Shortcut" -msgstr "کمانڈ شارٹ کٹ" +msgstr "شارٹ کٹ بنائیں" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "کمانڈ:" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "کمانڈ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "شارٹ کٹ" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy msgid "Shortcut:" -msgstr "شارٹ کٹ:" +msgstr "شارٹ کٹ" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +#, fuzzy msgid "Could not grab the keyboard." -msgstr "کیبورڈ اٹھایا نہیں جاسکا." +msgstr "ترتیبات ڈائیلاگ نہیں بنایا جاسکتا." -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "ذیلی عنوان" +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "ونڈو آپریشن مینیو" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "اوپر" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "نیچے" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "بائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "دائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "مسترد" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "ونڈوز سائکل" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +msgid "Cycle windows (Reverse)" +msgstr "ونڈوز چکر (عکسی)" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "ونڈو_ز مقام کار پر منتقل ہوں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +msgid "Switch application" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "ونڈو بند کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "ونڈو افقی طور پر بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "ونڈو عمودی طور پر بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "ونڈو بڑی کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "ونڈو چھپائیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +msgid "Move window" +msgstr "ونڈو منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +msgid "Resize window" +msgstr "ونڈو ری سائز کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "ونڈو شیڈ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "ونڈو چسپاں کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "بڑی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "چھوٹی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "بڑی ونڈو" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +msgid "Fill window" +msgstr "ونڈو بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +msgid "Fill window horizontally" +msgstr "ونڈو افقی طور پر بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +msgid "Fill window vertically" +msgstr "ونڈو عمودی طور پر بھریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "اوپر منعکس کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "فل سکرین منعکس کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "ونڈو اوپری مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "ونڈو نچلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "ونڈو بائیں مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "ونڈو دائیں مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "ونڈو سابقہ مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "ونڈو اگلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +msgid "Move window to workspace 1" +msgstr "ونڈو مقام کار 1 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +msgid "Move window to workspace 2" +msgstr "ونڈو مقام کار 2 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +msgid "Move window to workspace 3" +msgstr "ونڈو مقام کار 3 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +msgid "Move window to workspace 4" +msgstr "ونڈو مقام کار 4 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +msgid "Move window to workspace 5" +msgstr "ونڈو مقام کار 5 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +msgid "Move window to workspace 6" +msgstr "ونڈو مقام کار 6 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +msgid "Move window to workspace 7" +msgstr "ونڈو مقام کار 7 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +msgid "Move window to workspace 8" +msgstr "ونڈو مقام کار 8 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +msgid "Move window to workspace 9" +msgstr "ونڈو مقام کار 9 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +msgid "Move window to workspace 10" +msgstr "ونڈو مقام کار 10 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +msgid "Move window to workspace 11" +msgstr "ونڈو مقام کار 11 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +msgid "Move window to workspace 12" +msgstr "ونڈو مقام کار 12 پرمنتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "ونڈو درمیان میں رکھیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "ونڈو نچلے مقام کار میں منتقل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "ونڈو درمیان میں رکھیں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "ونڈو دائیں ری سائز کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "ڈیسک ٹاپ ظاہر کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "اوپری مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "نچلا مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "بائیں مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "دائیں مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "سابقہ مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "اگلا مقام کار" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +msgid "Workspace 1" +msgstr "مقام کار 1" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +msgid "Workspace 2" +msgstr "مقام کار 2" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +msgid "Workspace 3" +msgstr "مقام کار 3" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +msgid "Workspace 4" +msgstr "مقام کار 4" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +msgid "Workspace 5" +msgstr "مقام کار 5" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +msgid "Workspace 6" +msgstr "مقام کار 6" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +msgid "Workspace 7" +msgstr "مقام کار 7" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +msgid "Workspace 8" +msgstr "مقام کار 8" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +msgid "Workspace 9" +msgstr "مقام کار 9" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +msgid "Workspace 10" +msgstr "مقام کار 10" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +msgid "Workspace 11" +msgstr "مقام کار 11" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +msgid "Workspace 12" +msgstr "مقام کار 12" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "مقام کار شامل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +msgid "Add adjacent workspace" +msgstr "نزدیکی مقام کار شامل کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +msgid "Delete last workspace" +msgstr "آخری مقام کار حذف کریں" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +msgid "Delete active workspace" +msgstr "فعال مقام کار حذف کریں" + +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "عنوان شدہ ڈائیلاگ" +#: ../glade/libxfce4ui.xml.in.h:2 +#, fuzzy +msgid "Subtitle" +msgstr "عنوان" + #: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy msgid "Xfce 4 Widgets" -msgstr "ایکسفس 4 وجٹس" +msgstr "ایکسفس 4 ونڈو منیجر ترتیبات" -#~ msgid "%s" -#~ msgstr "%s" +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "ورژن معلومات" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "سکرین کے _وسط میں" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "ونڈو منیجر" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "ترتیبات منیجر ساکٹ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" + +#: ../xfce4-about/main.c:94 +#, fuzzy +msgid "Setting System" +msgstr "%s شروع کیا جارہا ہے" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +#, fuzzy +msgid "Settings Daemon" +msgstr "ترتیبات منیجر ساکٹ" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (پر %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "سابقہ مقام کار" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "" + +msgid "" +"This shortcut is already being used for another window manager action. Which " +"action do you want to use?" +msgstr "" +"یہ شارٹ کٹ پہلے ہی دوسری ونڈو منیجر حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " +"حرکت استعمال کرنا چاہتے ہیں؟" + +msgid "Keep the other one" +msgstr "سابقہ کو محفوظ رکھیں" + +msgid "" +"This shortcut is already being used by a window manager action. Which action " +"do you want to use?" +msgstr "" +"یہ شارٹ کٹ پہلے ہی ونڈو منیجر کی حرکت کے لیے استعمال ہو رہا ہے. آپ کون سی " +"حرکت استعمال کرنا چاہتے ہیں؟" -#~ msgid "File is not a valid .desktop file" -#~ msgstr "فائل موزوں .desktop فائل نہیں ہے" +msgid "%s" +msgstr "%s" -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "غیر پہچان کردہ ڈیسک ٹاپ فائل ورژن '%s'" +msgid "File is not a valid .desktop file" +msgstr "فائل موزوں .desktop فائل نہیں ہے" -#~ msgid "Starting %s" -#~ msgstr "%s شروع کیا جارہا ہے" +msgid "Unrecognized desktop file Version '%s'" +msgstr "غیر پہچان کردہ ڈیسک ٹاپ فائل ورژن '%s'" -#~ msgid "Application does not accept documents on command line" -#~ msgstr "اطلاقیہ کمانڈ لائن پر دستاویزات قبول نہیں کرتا" +msgid "Application does not accept documents on command line" +msgstr "اطلاقیہ کمانڈ لائن پر دستاویزات قبول نہیں کرتا" -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "غیر پہچان کردہ چلانے کا اختیار: %d" +msgid "Unrecognized launch option: %d" +msgstr "غیر پہچان کردہ چلانے کا اختیار: %d" -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "دستاویز ربط تا 'Type=Link' ڈیسک ٹاپ انٹری پاس نہیں کیا جاسکتا" +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "دستاویز ربط تا 'Type=Link' ڈیسک ٹاپ انٹری پاس نہیں کیا جاسکتا" -#~ msgid "Not a launchable item" -#~ msgstr "چلانے کے قابل عنصر نہیں ہے" +msgid "Not a launchable item" +msgstr "چلانے کے قابل عنصر نہیں ہے" -#~ msgid "Specify file containing saved configuration" -#~ msgstr "محفوظ شدہ وضع کاریوں پر مشتمل فائل متعین کریں" +msgid "Specify file containing saved configuration" +msgstr "محفوظ شدہ وضع کاریوں پر مشتمل فائل متعین کریں" -#~ msgid "FILE" -#~ msgstr "فائل" +msgid "FILE" +msgstr "فائل" diff -Nru libxfce4ui-4.8.1/po/vi.po libxfce4ui-4.12.1/po/vi.po --- libxfce4ui-4.8.1/po/vi.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/vi.po 2013-10-04 08:51:42.000000000 +0000 @@ -0,0 +1,840 @@ +# Vietnamese translations of the libxfce4ui package. +# Copyright (C) The Xfce development team. +# This file is distributed under the same license as the +# libxfce4ui package. +# Vinh , 2012. +# +# , fuzzy +msgid "" +msgstr "" +"Project-Id-Version: libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-28 09:06+0100\n" +"PO-Revision-Date: 2011-12-31 04:47+0800\n" +"Last-Translator: Vinh Nguyen \n" +"Language-Team: Vi (Vietnamese)\n" +"Language: Vi (Vietnamese)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are " +"maintained and translated." +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "Thông tin" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "Lỗi" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "Câu hỏi" + +#: ../libxfce4ui/xfce-sm-client.c:1403 +msgid "Session management client ID" +msgstr "" + +#: ../libxfce4ui/xfce-sm-client.c:1403 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1404 +msgid "Disable session management" +msgstr "Vô hiệu hóa việc quản lý session" + +#: ../libxfce4ui/xfce-sm-client.c:1414 +msgid "Session management options" +msgstr "Tùy chọn quản lý session" + +#: ../libxfce4ui/xfce-sm-client.c:1415 +msgid "Show session management options" +msgstr "Hiện các tùy chọn quản lý session" + +#: ../libxfce4ui/xfce-sm-client.c:1591 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "Không kết nối được với trình quản lý session: %s" + +#: ../libxfce4ui/xfce-sm-client.c:1598 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "Trình quản lý phiên làm việc không trả lại một định danh khách hợp lệ" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" +"\"." +msgstr "" +"Thư mục làm việc \"%s\" không tồn tại. Nó sẽ không thể được dùng khi phân " +"tách \"%s\"." + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you " +"want to use?" +msgstr "" +"Phím tắt đã được dùng!\n" +"Bạn chắc chắn muốn dùng nó?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "Sử dụng '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "Giữ '%s'" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "" +"Phím tắt đã được dùng!\n" +"Bạn chắc chắn muốn dùng nó?" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, fuzzy, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "" +"Phím tắt đã được dùng!\n" +"Bạn chắc chắn muốn dùng nó?" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:189 +#, fuzzy +msgid "This shortcut is already being used for something else." +msgstr "" +"Phím tắt đã được dùng!\n" +"Bạn chắc chắn muốn dùng nó?" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +#, fuzzy +msgid "Window Manager Action Shortcut" +msgstr "Thiết lập trình quản lí cửa sổ Xfce 4" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +#, fuzzy +msgid "action" +msgstr "Hoạt động" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +#, fuzzy +msgid "Command Shortcut" +msgstr "Soạn phím tắt" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +#, fuzzy +msgid "command" +msgstr "Lệnh" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +#, fuzzy +msgid "Shortcut" +msgstr "Không có phím nóng" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +#, fuzzy +msgid "Shortcut:" +msgstr "Không có phím nóng" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "Không thể bắt tín hiệu bàn phím." + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:33 +msgid "Window operations menu" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:34 +msgid "Up" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:35 +msgid "Down" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:36 +msgid "Left" +msgstr "Trái" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:37 +msgid "Right" +msgstr "Phải" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:38 +msgid "Cancel" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:39 +msgid "Cycle windows" +msgstr "Chuyển quanh các cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:40 +#, fuzzy +msgid "Cycle windows (Reverse)" +msgstr "Chuyển quanh các cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:41 +#, fuzzy +msgid "Switch window for same application" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:42 +#, fuzzy +msgid "Switch application" +msgstr "Ứng dụng không rõ!" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:43 +msgid "Close window" +msgstr "Đóng cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:44 +msgid "Maximize window horizontally" +msgstr "Phóng to cửa sổ theo chiều ngang" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:45 +msgid "Maximize window vertically" +msgstr "Phóng to cửa sổ theo chiều dọc" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:46 +msgid "Maximize window" +msgstr "Phóng to cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:47 +msgid "Hide window" +msgstr "Ẩn cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:48 +#, fuzzy +msgid "Move window" +msgstr "Di chuyển cửa sổ lên" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:49 +#, fuzzy +msgid "Resize window" +msgstr "Thay đổi kích thước cửa sổ lên trên" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:50 +msgid "Shade window" +msgstr "Che cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:51 +msgid "Stick window" +msgstr "Dán cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:52 +msgid "Raise window" +msgstr "Nâng cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:53 +msgid "Lower window" +msgstr "Hạ cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:54 +#, fuzzy +msgid "Raise or lower window" +msgstr "Nâng cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:55 +#, fuzzy +msgid "Fill window" +msgstr "Ẩn cửa sổ" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:56 +#, fuzzy +msgid "Fill window horizontally" +msgstr "Phóng to cửa sổ theo chiều ngang" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:57 +#, fuzzy +msgid "Fill window vertically" +msgstr "Phóng to cửa sổ theo chiều dọc" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:58 +msgid "Toggle above" +msgstr "" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:59 +msgid "Toggle fullscreen" +msgstr "Tăt/bật toàn màn hình" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:60 +msgid "Move window to upper workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc ở trên" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:61 +msgid "Move window to bottom workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc ở dưới" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:62 +msgid "Move window to left workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc bên trái" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:63 +msgid "Move window to right workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc bên phải" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:64 +msgid "Move window to previous workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc trước" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:65 +msgid "Move window to next workspace" +msgstr "Di chuyển cửa sổ sang vùng làm việc kế" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:66 +#, fuzzy +msgid "Move window to workspace 1" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:67 +#, fuzzy +msgid "Move window to workspace 2" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:68 +#, fuzzy +msgid "Move window to workspace 3" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:69 +#, fuzzy +msgid "Move window to workspace 4" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:70 +#, fuzzy +msgid "Move window to workspace 5" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:71 +#, fuzzy +msgid "Move window to workspace 6" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:72 +#, fuzzy +msgid "Move window to workspace 7" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:73 +#, fuzzy +msgid "Move window to workspace 8" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:74 +#, fuzzy +msgid "Move window to workspace 9" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:75 +#, fuzzy +msgid "Move window to workspace 10" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:76 +#, fuzzy +msgid "Move window to workspace 11" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:77 +#, fuzzy +msgid "Move window to workspace 12" +msgstr "Di chuyển cửa sổ sang vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:78 +#, fuzzy +msgid "Tile window to the top" +msgstr "Di chuyển cửa sổ sang vùng làm việc bên trái" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:79 +#, fuzzy +msgid "Tile window to the bottom" +msgstr "Di chuyển cửa sổ sang vùng làm việc ở dưới" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:80 +#, fuzzy +msgid "Tile window to the left" +msgstr "Thay đổi kích thước cửa sổ sang trái" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:81 +#, fuzzy +msgid "Tile window to the right" +msgstr "Thay đổi kích thước cửa sổ sang phải" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:82 +msgid "Show desktop" +msgstr "Hiện ảnh nền" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:83 +msgid "Upper workspace" +msgstr "Vùng làm việc trên" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:84 +msgid "Bottom workspace" +msgstr "Vùng làm việc dưới" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:85 +msgid "Left workspace" +msgstr "Vùng làm việc bên trái" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:86 +msgid "Right workspace" +msgstr "Vùng làm việc bên phải" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:87 +msgid "Previous workspace" +msgstr "Vùng làm việc trước" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:88 +msgid "Next workspace" +msgstr "Vùng làm việc tiếp theo" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:89 +#, fuzzy +msgid "Workspace 1" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:90 +#, fuzzy +msgid "Workspace 2" +msgstr "Vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:91 +#, fuzzy +msgid "Workspace 3" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:92 +#, fuzzy +msgid "Workspace 4" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:93 +#, fuzzy +msgid "Workspace 5" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:94 +#, fuzzy +msgid "Workspace 6" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:95 +#, fuzzy +msgid "Workspace 7" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:96 +#, fuzzy +msgid "Workspace 8" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:97 +#, fuzzy +msgid "Workspace 9" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:98 +#, fuzzy +msgid "Workspace 10" +msgstr "Vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:99 +#, fuzzy +msgid "Workspace 11" +msgstr "Vùng làm việc %i" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:100 +#, fuzzy +msgid "Workspace 12" +msgstr "Vùng làm việc %d" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:101 +msgid "Add workspace" +msgstr "Thêm vùng làm việc" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:102 +#, fuzzy +msgid "Add adjacent workspace" +msgstr "Thêm vùng làm việc" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:103 +#, fuzzy +msgid "Delete last workspace" +msgstr "Xoá vùng làm việc" + +#: ../libxfce4kbd-private/xfwm4-shortcut-values.h:104 +#, fuzzy +msgid "Delete active workspace" +msgstr "Xoá vùng làm việc" + +#: ../glade/libxfce4ui.xml.in.h:1 +#, fuzzy +msgid "Titled Dialog" +msgstr "Phông tiêu đề" + +#: ../glade/libxfce4ui.xml.in.h:2 +#, fuzzy +msgid "Subtitle" +msgstr "Tiêu đề" + +#: ../glade/libxfce4ui.xml.in.h:3 +#, fuzzy +msgid "Xfce 4 Widgets" +msgstr "Thiết lập trình quản lí cửa sổ Xfce 4" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "Trình quản lí cửa sổ" + +#: ../xfce4-about/main.c:71 +#, fuzzy +msgid "Handles the placement of windows on the screen." +msgstr "Hiển thị nội dung cửa sổ khi thay đổi kích thước" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and " +"more." +msgstr "" +"Trình khởi động chương trình, các nútm, trình đơn ứng dụng, thanh chuyển " +"không gian làm việc và nhiều hơn thế nữa." + +#: ../xfce4-about/main.c:79 +#, fuzzy +msgid "Desktop Manager" +msgstr "Trình quản lí cửa sổ" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "" + +#: ../xfce4-about/main.c:84 +#, fuzzy +msgid "File Manager " +msgstr "Trình quản lí cửa sổ" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "" +"Một chương trình quản lý tập tin hiện đại cho Linux/Unix, hướn đển dễ sử " +"dụng và tốc độ" + +#: ../xfce4-about/main.c:89 +#, fuzzy +msgid "Session Manager" +msgstr "Trình quản lí cửa sổ" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "" +"Khôi phục phiên làm việc lúc khởi động và cho phép bạn tắt máy tính trong " +"Xfce." + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "Thiết lập hệ thống" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "Trình tìm kiếm ứng dụng" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL " +"for applications and LGPL or BSDL for libraries. Look at the documentation, " +"the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "Cảm ơn cho sự ủng hộ của bạn đối với Xfce" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Nhóm phát triển Xfce" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "" +"Nếu bạn biết bất cứ lỗi nào khoogn có trong danh sách này; đừng ngần ngại để " +"báo cáo lỗi trên ." + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-" +"settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed 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." +msgstr "" +"Các gói thunar, xfce4-appfinder, xfce4-panel, xfce4-session, xfce4-settings, " +"xfce-utils, xfconf, xfdesktop and xfwm4 được phân phối dưới các quy định của " +"GNU General Public License khi được xuất bản bởi Tổ chức phần mềm tự do hoặc " +"là phiên bản 2 của giấy phép, hoặc (tùy bạn) bất cứ phiên bản nào sau này." + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "Gõ '%s --help' để xem hướng dẫn sử dụng" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "Không thể khởi tạo GTK+" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Nhóm phát triển Xfce. Tất cả các quyền được bảo lưu" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "Thất bại nạp giao diện" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "Phiên bản %s, được phân phối bởi %s" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, fuzzy, c-format +msgid "Version %s" +msgstr "%s (trên %s)" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "Các nhà phát triển lõi phần mềm" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "Máy chủ được quản lý bởi" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "Quản lý dich" + +#: ../xfce4-about/contributors.h:136 +#, fuzzy +msgid "Translators" +msgstr "Trong suốt" + +#: ../xfce4-about/contributors.h:139 +#, fuzzy +msgid "Previous contributors" +msgstr "Vùng làm việc trước" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "Thông tin về XFCE" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "Thông tin về môi trường màn hình Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "Thông tin môi trường màn hình Xfce" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "Thông tin" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "Công trạng" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "Bản quyền" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "Giáy phép" + +msgid "Keep the other one" +msgstr "Giữ lại cái kia" diff -Nru libxfce4ui-4.8.1/po/zh_CN.po libxfce4ui-4.12.1/po/zh_CN.po --- libxfce4ui-4.8.1/po/zh_CN.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/zh_CN.po 2015-03-15 18:11:26.000000000 +0000 @@ -1,164 +1,783 @@ -# Simplified Chinese translation for the libxfce4ui package. -# Copyright (C) 2008 The Xfce development team. -# This file is distributed under the same license as the libxfce4ui package. -# Chris K. Zhang , 2009. -# Hunt Xu , 2009, 2010. -# Chipong Luo , 2011-2012 +# Chris K. Zhang , 2009 +# Hunt Xu , 2009-2010,2012 +# 玉堂白鹤 , 2015 +# 白铭骢 , 2015 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 22:34+0000\n" -"PO-Revision-Date: 2010-04-06 13:14+0800\n" -"Last-Translator: Chipong Luo \n" -"Language-Team: Simplied Chinese \n" -"Language: zh_CN\n" +"POT-Creation-Date: 2015-03-08 00:30+0100\n" +"PO-Revision-Date: 2015-03-09 02:14+0000\n" +"Last-Translator: 玉堂白鹤 \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/libxfce4ui/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "无法打开网络浏览器获取在线文档" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "您要在线阅读 %s 手册吗？" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "您要在线阅读手册吗？" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "在线文档" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "会将您重定向至维护和翻译帮助文档的网站。" + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "在线阅读(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "总是直接进入在线文档(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" -msgstr "信息" +msgstr "版本信息" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "警告" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "错误" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "问题" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" msgstr "会话管理客户端 ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" msgstr "禁用会话管理" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" msgstr "会话管理选项" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" msgstr "显示会话管理选项" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" msgstr "无法与会话管理器连接：%s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" msgstr "会话管理器未返回一个有效的客户端 ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." -msgstr "工作目录 “%s” 不存在。启动 “%s” 时将不会使用它。" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "该快捷键已被另一个窗口管理器动作所使用。您要使用哪个动作？" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "工作目录 \"%s\" 不存在。启动 \"%s\" 时不会使用它。" #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "该快捷键已被用于动作 '%s'。您要使用哪个动作？" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" -msgstr "使用 ‘%s’" +msgstr "使用 '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "保留另外一个" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "保留 '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "该快捷键已被命令 “%s” 所使用。您要使用哪个动作？" +msgstr "该快捷键已被用于命令 '%s'。您要使用哪个动作？" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "保留 “%s”" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "该快捷键已被一窗口管理器动作使用。您要使用哪个动作？" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "该快捷键已被动作 '%s' 使用。您要使用哪个动作？" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "请使用另一组按键组合。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "保留此窗口管理器动作" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s 已经触发此动作。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "因 %s 冲突的动作" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "其它动作已使用该快捷键。" +msgstr "其它动作在使用此快捷键。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" msgstr "窗口管理器动作快捷键" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "动作：" - +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "动作" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" msgstr "命令快捷键" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "命令：" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "命令" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" msgstr "快捷键" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "取消 (_C)" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "现在请按下您希望触发 %s '%s' 的按键。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "快捷键：" +msgstr "快捷键:" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "未按下任何按键，请继续。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "无法获取键盘输入。" +msgstr "未能捕获键盘输入。" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "子标题" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "窗口操作菜单" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "左" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "右" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "取消" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "循环窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "循环窗口(反向)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "切换同一应用程序的窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "切换应用程序" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "关闭窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "水平最大化窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "竖直最大化窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "最大化窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "隐藏窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "移动窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "调整窗口大小" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "折叠窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "粘滞窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "提升窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "降低窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "提升或降低窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "填充窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "水平填充窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "竖直填充窗口" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "切换以上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "全屏切换" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "移动窗口至上方工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "移动窗口至下方工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "移动窗口至左边工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "移动窗口至右边工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "移动窗口至上一工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "移动窗口至下一工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "移动窗口至工作区 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "移动窗口至工作区 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "移动窗口至工作区 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "移动窗口至工作区 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "移动窗口至工作区 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "移动窗口至工作区 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "移动窗口至工作区 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "移动窗口至工作区 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "移动窗口至工作区 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "移动窗口至工作区 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "移动窗口至工作区 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "移动窗口至工作区 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "窗口平铺在顶部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "窗口平铺在底部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "窗口平铺在左边" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "窗口平铺在右边" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Tile window to the top-left" +msgstr "窗口平铺在左上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Tile window to the top-right" +msgstr "窗口平铺在右上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Tile window to the bottom-left" +msgstr "窗口平铺在左下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Tile window to the bottom-right" +msgstr "窗口平铺在右下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Show desktop" +msgstr "显示桌面" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Upper workspace" +msgstr "上方工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Bottom workspace" +msgstr "下方工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Left workspace" +msgstr "左边工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Right workspace" +msgstr "右边工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Previous workspace" +msgstr "上一工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Next workspace" +msgstr "下一工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 1" +msgstr "工作区 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 2" +msgstr "工作区 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 3" +msgstr "工作区 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 4" +msgstr "工作区 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 5" +msgstr "工作区 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 6" +msgstr "工作区 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 7" +msgstr "工作区 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 8" +msgstr "工作区 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Workspace 9" +msgstr "工作区 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Workspace 10" +msgstr "工作区 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Workspace 11" +msgstr "工作区 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Workspace 12" +msgstr "工作区 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:108 +msgid "Add workspace" +msgstr "添加工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:109 +msgid "Add adjacent workspace" +msgstr "添加相邻工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:110 +msgid "Delete last workspace" +msgstr "删除最后一个工作区" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:111 +msgid "Delete active workspace" +msgstr "删除当前工作区" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "有标题的对话框" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "子标题" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" msgstr "Xfce 4 控件" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "版本信息" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "窗口管理器" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "处理窗口在屏幕上的位置摆放" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "面板" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "程序启动器、窗口按钮、应用程序菜单、工作区切换器等等。" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "桌面管理器" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "设置背景的颜色或图片，可选应用程序菜单或最小化应用程序、启动器、设备文件夹的图标。" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "文件管理器" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix/Linux 桌面的现代文件管理器，旨在易用和快速。" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "会话管理器" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "在桌面启动时恢复您的会话并让您从 Xfce 关闭计算机。" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "设置系统" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "控制桌面的如外观、显示、键盘和鼠标设置各个方面的配置系统。" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "应用程序查找器" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "分类显示在您系统上安装的应用程序，这样您就可以快速地查找和启动它们。" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "设置守护进程" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "基于 D-Bus 的配置存储系统。" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce 是一个提供全功能桌面环境的程序集。以下程序是 Xfce 核心的部分：" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce 还是一个提供若干库文件，帮助程序员创建适合桌面环境的应用程序的开发平台。" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce 组件以自由或开源许可协议授权；应用程序以 GPL 或 BSDL，库文件以 LGPL 或BSDL 授权。看文档、源代码或 Xfce 站点(http://www.xfce.org) 获取详情。" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "感谢您对 Xfce 感兴趣。" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce 开发团队" + +#: ../xfce4-about/main.c:261 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "如果您知道此列表漏掉了某个人，不要犹豫并在 上提交缺陷。" + +#: ../xfce4-about/main.c:265 +msgid "Thanks to all who helped making this software available!" +msgstr "感谢所有帮助此软件发布的人们！" + +#: ../xfce4-about/main.c:282 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 版权归 Olivier Fourdan(fourdan@xfce.org)。不同组件的版权归它们各自的作者。" + +#: ../xfce4-about/main.c:287 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui、libxfcegui4、libxfce4util、thunar-vfs 和 exo 软件包以自由软件基金会发布的 GNU 宽通用公共许可协议第二版或(您可以选择)更高版的方式发布。" + +#: ../xfce4-about/main.c:294 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar、xfce4-appfinder、xfce4-panel、xfce4-session、xfce4-settings、xfce-utils、xfconf、xfdesktop 和 xfwm4 软件包以自由软件基金会发布的 GNU 通用公共许可协议的第二版或(您可以选择)更高版的方式发布。" + +#: ../xfce4-about/main.c:441 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "输入 '%s --help' 获取用法。" + +#: ../xfce4-about/main.c:447 +msgid "Unable to initialize GTK+." +msgstr "未能初始化 GTK+。" + +#: ../xfce4-about/main.c:456 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce 开发团队。保留所有权利。" + +#: ../xfce4-about/main.c:457 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "请向 <%s> 报告缺陷。" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:460 +#, c-format +msgid "Translators list from %s." +msgstr "来自 %s 的翻译者列表。" + +#: ../xfce4-about/main.c:470 +msgid "Failed to load interface" +msgstr "无法载入界面" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:484 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "版本 %s，由 %s 发布。" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:488 +#, c-format +msgid "Version %s" +msgstr "版本 %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:128 +msgid "Core developers" +msgstr "核心开发者" + +#: ../xfce4-about/contributors.h:131 +msgid "Active contributors" +msgstr "活跃贡献者" + +#: ../xfce4-about/contributors.h:134 +msgid "Servers maintained by" +msgstr "服务器维护者" + +#: ../xfce4-about/contributors.h:137 +msgid "Goodies supervision" +msgstr "珍品管理" + +#: ../xfce4-about/contributors.h:140 +msgid "Translations supervision" +msgstr "翻译管理" + +#: ../xfce4-about/contributors.h:143 +msgid "Translators" +msgstr "翻译者" + +#: ../xfce4-about/contributors.h:146 +msgid "Previous contributors" +msgstr "上一贡献者" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "关于 Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "有关 Xfce 桌面环境的信息" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "关于 Xfce 桌面环境" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "关于" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "鸣谢" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "版权" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "许可协议" diff -Nru libxfce4ui-4.8.1/po/zh_HK.po libxfce4ui-4.12.1/po/zh_HK.po --- libxfce4ui-4.8.1/po/zh_HK.po 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/po/zh_HK.po 2015-02-18 16:12:39.000000000 +0000 @@ -0,0 +1,759 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cheng-Chia Tseng , 2010 +msgid "" +msgstr "" +"Project-Id-Version: Libxfce4ui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-07-02 22:33+0200\n" +"PO-Revision-Date: 2013-12-15 09:13+0000\n" +"Last-Translator: Walter Cheuk \n" +"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/xfce/language/zh_HK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_HK\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "未能開啟網頁瀏覽器以供線上文件使用" + +#: ../libxfce4ui/xfce-dialogs.c:213 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "想要線上閱讀 %s 手冊嗎？" + +#: ../libxfce4ui/xfce-dialogs.c:215 +msgid "Do you want to read the manual online?" +msgstr "想要線上閱讀這份手冊嗎？" + +#: ../libxfce4ui/xfce-dialogs.c:218 +msgid "Online Documentation" +msgstr "線上文件" + +#: ../libxfce4ui/xfce-dialogs.c:221 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "您會被重新引導至我們保存和翻譯說明文件的網站。" + +#: ../libxfce4ui/xfce-dialogs.c:225 +msgid "_Read Online" +msgstr "線上閱讀(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:237 +msgid "_Always go directly to the online documentation" +msgstr "必定直接前往線上說明文件(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:281 +msgid "Information" +msgstr "資訊" + +#: ../libxfce4ui/xfce-dialogs.c:314 +msgid "Warning" +msgstr "警告" + +#: ../libxfce4ui/xfce-dialogs.c:348 +msgid "Error" +msgstr "錯誤" + +#: ../libxfce4ui/xfce-dialogs.c:399 +msgid "Question" +msgstr "疑問" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "Session management client ID" +msgstr "工作階段管理程式用戶端 ID" + +#: ../libxfce4ui/xfce-sm-client.c:1424 +msgid "ID" +msgstr "ID" + +#: ../libxfce4ui/xfce-sm-client.c:1425 +msgid "Disable session management" +msgstr "停用工作階段管理" + +#: ../libxfce4ui/xfce-sm-client.c:1435 +msgid "Session management options" +msgstr "工作階段管理選項" + +#: ../libxfce4ui/xfce-sm-client.c:1436 +msgid "Show session management options" +msgstr "顯示工作階段管理選項" + +#: ../libxfce4ui/xfce-sm-client.c:1611 +#, c-format +msgid "Failed to connect to the session manager: %s" +msgstr "未能連接工作階段管理員：%s" + +#: ../libxfce4ui/xfce-sm-client.c:1617 +#, c-format +msgid "Session manager did not return a valid client id" +msgstr "工作階段管理員沒有傳回有效的用戶端 ID" + +#. print warning for user +#: ../libxfce4ui/xfce-spawn.c:413 +#, c-format +msgid "" +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." +msgstr "工作目錄「%s」不存在。當建立「%s」時不會用。" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:53 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "「%s」動作用了此捷徑鍵。想要使用何動作？" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Use '%s'" +msgstr "使用「%s」" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "保留「%s」" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#, c-format +msgid "" +"This shortcut is already being used for the command '%s'. Which action do " +"you want to use?" +msgstr "「%s」指令已經用了此捷徑。想要使用何動作？" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "此捷徑鍵正給動作「%s」使用。您想要使用何動作？" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "請使用另一個按鍵組合。" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s 已會觸發此動作。" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 +#, c-format +msgid "Conflicting actions for %s" +msgstr "%s 的動作發生衝突" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:176 +msgid "This shortcut is already being used for something else." +msgstr "此捷徑正被其它動作使用。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 +msgid "Window Manager Action Shortcut" +msgstr "視窗管理程式動作捷徑鍵" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "動作" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 +msgid "Command Shortcut" +msgstr "指令捷徑鍵" + +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "指令" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 +msgid "Shortcut" +msgstr "捷徑鍵" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:267 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "請現在按下想要用來觸發 %s「%s」的鍵盤按鍵。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:291 +msgid "Shortcut:" +msgstr "捷徑鍵：" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:296 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:475 +msgid "No keys pressed yet, proceed." +msgstr "未按下任何按鍵，繼續。" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:378 +msgid "Could not grab the keyboard." +msgstr "無法抓取鍵盤。" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "視窗操作選單" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "左" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "右" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "取消" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "循環視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "循環視窗 (反向)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "切換同一個應用程式的視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "切換應用程式" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "關閉視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "水平的最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "垂直的最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "隱藏視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "移動視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "重新調整視窗大小" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "捲起視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "貼連視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "提升視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "降低視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "提升或降低視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "水平方向填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "垂直方向填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "切換至上方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "切換全螢幕模式" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "將視窗移至上方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "將視窗移至下方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "將視窗移至左方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "將視窗移至右方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "將視窗移至上一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "將視窗移至下一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "將視窗移至工作區 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "將視窗移至工作區 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "將視窗移至工作區 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "將視窗移至工作區 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "將視窗移至工作區 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "將視窗移至工作區 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "將視窗移至工作區 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "將視窗移至工作區 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "將視窗移至工作區 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "將視窗移至工作區 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "將視窗移至工作區 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "將視窗移至工作區 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "將視窗鋪在頂部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "將視窗鋪在底部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "將視窗鋪在左方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "將視窗鋪在右方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "顯示桌面" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "上方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "下方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "左方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "右方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "上一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "下一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "工作區 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "工作區 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "工作區 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "工作區 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "工作區 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "工作區 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "工作區 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "工作區 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "工作區 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "工作區 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "工作區 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "工作區 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "新增工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "加入相鄰工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "刪除最後一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "刪除活動中的工作區" + +#: ../glade/libxfce4ui.xml.in.h:1 +msgid "Titled Dialog" +msgstr "有標題的對話窗" + +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "子標題" + +#: ../glade/libxfce4ui.xml.in.h:3 +msgid "Xfce 4 Widgets" +msgstr "Xfce 4 器件" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "版本資訊" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "視窗管理員" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "處理如何於螢幕置放視窗。" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "面板" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "程式啟動器、視窗按鈕、應用程式選單、工作區切換與其他。" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "視窗管理員" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "設定背景色彩，或選用應用程式選單的影像，或最小化應用程式或啟動器、裝置、資料夾的圖示。" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "檔案管理員" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix/Linux 桌面的現代化檔案管理員，旨在易用、快速。" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "工作階段管理員" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "啟動時還原的工作階段，並讓你可以從 Xfce 關機。" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "設定系統" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "控制多項桌面層面的設定系統，例如外觀、顯示器、鍵盤、滑鼠等設定。" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "應用程式協尋器" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "將安裝於系統的應用程式分類顯示，這樣才能快速尋找並啟動。" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "設定幕後程式" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "以 D-Bus 為基礎的設定儲存系統。" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce 是程式的集合，這些程式一同提供多功能的桌面環境。以下程式為 Xfce 的核心部份：" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce 也是提供多種函式庫的開發平台，有助程式開發者建立適用於本桌面環境的應用程式。" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce 部件是以自由或開源的授權條款提供授權；GPL 或 BSDL 適用於應用程式，而 LGPL 或 BSDL 適用於函式庫。請查看文件、源碼或 Xfce 網站 (http://www.xfce.org) 取得更多資訊。" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "感謝您對 Xfce 有興趣。" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce 開發團隊" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "若您發現清單中有些人沒有列出來，請不要猶豫在 提交一個臭蟲回報。" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "感謝所有幫助製作出這個軟件的人！" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 版權所有者為 Olivier Fourdan (fourdan@xfce.org)。不同的部件是由其各自的作者擁有其版權。" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui、libxfcegui4、libxfce4util、thunar-vfs 與 exo 套件是基於 Free Software Foundation 發布的 GNU Library General Public License 授權條款給予授權；不管是該授權的第 2 版，或 (根據您自己選擇) 的後續版本都可以。" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar、xfce4-appfinder、xfce-panel、xfce4-session、xfce4-settings、xfce-utils、xfconf、xfdeskop 與 xfwm4 套件是基於 Free Software Foundation 發布的 GNU General Public License 授權條款給予授權；不管是該授權的第 2 版，或 (根據您自己選擇) 的後續版本都可以。" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "請輸入「%s --help」以瞭解用法資訊。" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "無法初始化 GTK+。" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce 開發團隊。保留所有權利。" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "請回報臭蟲至 <%s>。" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "%s 的翻譯者清單。" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "未能載入介面" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "版本 %s，透過 %s 散布" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "版本 %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "核心開發者" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "活躍的開發者" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "伺服器維護者：" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "好物監督" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "翻譯監督" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "翻譯者" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "之前的貢獻者" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "關於 Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "有關 Xfce 桌面環境的資訊" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "關於 Xfce 桌面環境" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "關於" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "鳴謝" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "版權所有" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "授權" diff -Nru libxfce4ui-4.8.1/po/zh_TW.po libxfce4ui-4.12.1/po/zh_TW.po --- libxfce4ui-4.8.1/po/zh_TW.po 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/po/zh_TW.po 2015-02-28 14:38:27.000000000 +0000 @@ -1,163 +1,765 @@ -# Traditional Chinese translation for the libxfce4ui package. -# Copyright (C) 2008 The Xfce development team -# This file is distributed under the same license as the libxfce4ui package. -# Cheng-Chia Tseng , 2010. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Cheng-Chia Tseng , 2010 +# Jeff Huang , 2015 +# Walter Cheuk , 2013 msgid "" msgstr "" -"Project-Id-Version: libxfce4ui master\n" +"Project-Id-Version: Libxfce4ui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 16:03+0100\n" -"PO-Revision-Date: 2010-08-23 16:40+0800\n" -"Last-Translator: Cheng-Chia Tseng \n" -"Language-Team: Chinese-l10n \n" -"Language: \n" +"POT-Creation-Date: 2015-02-18 18:30+0100\n" +"PO-Revision-Date: 2015-02-19 06:19+0000\n" +"Last-Translator: Jeff Huang \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/libxfce4ui/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../libxfce4ui/xfce-dialogs.c:69 +#: ../libxfce4ui/xfce-dialogs.c:98 +msgid "Failed to open web browser for online documentation" +msgstr "無法開啟網頁瀏覽器以供線上文件使用" + +#: ../libxfce4ui/xfce-dialogs.c:252 +#, c-format +msgid "Do you want to read the %s manual online?" +msgstr "您想要線上閱讀 %s 手冊嗎？" + +#: ../libxfce4ui/xfce-dialogs.c:254 +msgid "Do you want to read the manual online?" +msgstr "您想要線上閱讀這份手冊嗎？" + +#: ../libxfce4ui/xfce-dialogs.c:257 +msgid "Online Documentation" +msgstr "線上文件" + +#: ../libxfce4ui/xfce-dialogs.c:264 +msgid "" +"You will be redirected to the documentation website where the help pages are" +" maintained and translated." +msgstr "您會被重新引導至我們保存和翻譯幫助頁面的說明文件的網站。" + +#: ../libxfce4ui/xfce-dialogs.c:278 +msgid "_Read Online" +msgstr "線上閱讀(_R)" + +#: ../libxfce4ui/xfce-dialogs.c:290 +msgid "_Always go directly to the online documentation" +msgstr "總是直接前往線上文件(_A)" + +#: ../libxfce4ui/xfce-dialogs.c:334 msgid "Information" msgstr "資訊" -#: ../libxfce4ui/xfce-dialogs.c:102 +#: ../libxfce4ui/xfce-dialogs.c:377 msgid "Warning" msgstr "警告" -#: ../libxfce4ui/xfce-dialogs.c:136 +#: ../libxfce4ui/xfce-dialogs.c:421 msgid "Error" msgstr "錯誤" -#: ../libxfce4ui/xfce-dialogs.c:187 +#: ../libxfce4ui/xfce-dialogs.c:494 msgid "Question" msgstr "疑問" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "Session management client ID" -msgstr "作業階段管理用戶端 ID" +msgstr "工作階段管理程式用戶端 ID" -#: ../libxfce4ui/xfce-sm-client.c:1401 +#: ../libxfce4ui/xfce-sm-client.c:1424 msgid "ID" msgstr "ID" -#: ../libxfce4ui/xfce-sm-client.c:1402 +#: ../libxfce4ui/xfce-sm-client.c:1425 msgid "Disable session management" -msgstr "停用作業階段管理" +msgstr "停用工作階段管理" -#: ../libxfce4ui/xfce-sm-client.c:1412 +#: ../libxfce4ui/xfce-sm-client.c:1435 msgid "Session management options" -msgstr "作業階段管理選項" +msgstr "工作階段管理選項" -#: ../libxfce4ui/xfce-sm-client.c:1413 +#: ../libxfce4ui/xfce-sm-client.c:1436 msgid "Show session management options" -msgstr "顯示作業階段管理選項" +msgstr "顯示工作階段管理選項" -#: ../libxfce4ui/xfce-sm-client.c:1589 +#: ../libxfce4ui/xfce-sm-client.c:1611 #, c-format msgid "Failed to connect to the session manager: %s" -msgstr "連接到作業階段管理程式失敗：%s" +msgstr "連接到工作階段管理程式失敗：%s" -#: ../libxfce4ui/xfce-sm-client.c:1596 +#: ../libxfce4ui/xfce-sm-client.c:1617 #, c-format msgid "Session manager did not return a valid client id" -msgstr "作業階段管理程式沒有回傳有效的用戶端 id" +msgstr "工作階段管理程式沒有回傳有效的用戶端 ID" #. print warning for user -#: ../libxfce4ui/xfce-spawn.c:407 +#: ../libxfce4ui/xfce-spawn.c:409 #, c-format msgid "" -"Working directory \"%s\" does not exist. It won't be used when spawning \"%s" -"\"." +"Working directory \"%s\" does not exist. It won't be used when spawning " +"\"%s\"." msgstr "工作目錄「%s」不存在。當建立「%s」時不會被使用。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:52 -msgid "" -"This shortcut is already being used for another window manager action. Which " -"action do you want to use?" -msgstr "此捷徑正被其他視窗管理程式的動作使用。您想要使用何動作" - #: ../libxfce4kbd-private/xfce-shortcuts.c:53 -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 +#, c-format +msgid "" +"This shortcut is already being used for the action '%s'. Which action do you" +" want to use?" +msgstr "「%s」動作已經用了此捷徑鍵。您想要使用何動作？" + +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 #, c-format msgid "Use '%s'" msgstr "使用 '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:53 -msgid "Keep the other one" -msgstr "保留其它的" +#: ../libxfce4kbd-private/xfce-shortcuts.c:54 +#: ../libxfce4kbd-private/xfce-shortcuts.c:57 +#: ../libxfce4kbd-private/xfce-shortcuts.c:60 +#: ../libxfce4kbd-private/xfce-shortcuts.c:63 +#, c-format +msgid "Keep '%s'" +msgstr "保留 '%s'" -#: ../libxfce4kbd-private/xfce-shortcuts.c:55 -#: ../libxfce4kbd-private/xfce-shortcuts.c:58 +#: ../libxfce4kbd-private/xfce-shortcuts.c:56 +#: ../libxfce4kbd-private/xfce-shortcuts.c:59 #, c-format msgid "" "This shortcut is already being used for the command '%s'. Which action do " "you want to use?" -msgstr "此捷徑正被指令 '%s' 使用。您想要使用何動作？" +msgstr "「%s」指令已經用了此捷徑鍵。您想要使用何動作？" -#: ../libxfce4kbd-private/xfce-shortcuts.c:56 -#: ../libxfce4kbd-private/xfce-shortcuts.c:59 +#: ../libxfce4kbd-private/xfce-shortcuts.c:62 #, c-format -msgid "Keep '%s'" -msgstr "保留 '%s'" - -#: ../libxfce4kbd-private/xfce-shortcuts.c:61 msgid "" -"This shortcut is already being used by a window manager action. Which action " -"do you want to use?" -msgstr "此捷徑正被視窗管理程式的某動作使用。您想要使用何動作？" +"This shortcut is already being used by the action '%s'. Which action do you " +"want to use?" +msgstr "「%s」動作已經用了此捷徑鍵。您想要使用何動作？" + +#. This shortcut already exists in the provider, we don't want it twice +#. Warn the user +#: ../libxfce4kbd-private/xfce-shortcuts.c:110 +msgid "Please use another key combination." +msgstr "請使用另一個按鍵組合。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:62 -msgid "Keep the window manager action" -msgstr "保留視窗管理程式動作" +#: ../libxfce4kbd-private/xfce-shortcuts.c:111 +#, c-format +msgid "%s already triggers this action." +msgstr "%s 已會觸發此動作。" -#: ../libxfce4kbd-private/xfce-shortcuts.c:95 +#: ../libxfce4kbd-private/xfce-shortcuts.c:116 #, c-format msgid "Conflicting actions for %s" msgstr "%s 的動作發生衝突" -#: ../libxfce4kbd-private/xfce-shortcuts.c:128 +#: ../libxfce4kbd-private/xfce-shortcuts.c:186 msgid "This shortcut is already being used for something else." -msgstr "此捷徑正被其它動作使用。" +msgstr "此捷徑鍵已經用了。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:209 msgid "Window Manager Action Shortcut" -msgstr "視窗管理程式動作捷徑" - -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 -msgid "Action:" -msgstr "動作：" +msgstr "視窗管理程式動作捷徑鍵" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:212 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:226 +msgid "action" +msgstr "動作" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:216 msgid "Command Shortcut" -msgstr "命令捷徑" +msgstr "指令捷徑鍵" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:213 -msgid "Command:" -msgstr "命令：" +#. TRANSLATORS: this string will be used to create an explanation for +#. * the user in a following string +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:219 +msgid "command" +msgstr "指令" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:217 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:223 msgid "Shortcut" -msgstr "捷徑" +msgstr "捷徑鍵" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:247 +msgid "_Cancel" +msgstr "取消(_C)" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:275 +#, c-format +msgid "Press now the keyboard keys you want to use to trigger the %s '%s'." +msgstr "請現在按下您想要用來觸發 %s「%s」的鍵盤按鍵。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:258 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:299 msgid "Shortcut:" -msgstr "捷徑：" +msgstr "捷徑鍵：" + +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:304 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:483 +msgid "No keys pressed yet, proceed." +msgstr "未按下任何按鍵，繼續。" -#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:303 +#: ../libxfce4kbd-private/xfce-shortcut-dialog.c:386 msgid "Could not grab the keyboard." -msgstr "無法抓到鍵盤。" +msgstr "無法抓取鍵盤。" -#: ../glade/libxfce4ui.xml.in.h:1 -msgid "Subtitle" -msgstr "次標題" +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:36 +msgid "Window operations menu" +msgstr "視窗操作選單" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:37 +msgid "Up" +msgstr "上" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:38 +msgid "Down" +msgstr "下" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:39 +msgid "Left" +msgstr "左" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:40 +msgid "Right" +msgstr "右" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:41 +msgid "Cancel" +msgstr "取消" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:42 +msgid "Cycle windows" +msgstr "循環視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:43 +msgid "Cycle windows (Reverse)" +msgstr "循環視窗 (反向)" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:44 +msgid "Switch window for same application" +msgstr "切換同一個應用程式的視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:45 +msgid "Switch application" +msgstr "切換應用程式" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:46 +msgid "Close window" +msgstr "關閉視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:47 +msgid "Maximize window horizontally" +msgstr "水平的最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:48 +msgid "Maximize window vertically" +msgstr "垂直的最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:49 +msgid "Maximize window" +msgstr "最大化視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:50 +msgid "Hide window" +msgstr "隱藏視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:51 +msgid "Move window" +msgstr "移動視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:52 +msgid "Resize window" +msgstr "重新調整視窗大小" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:53 +msgid "Shade window" +msgstr "捲起視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:54 +msgid "Stick window" +msgstr "貼連視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:55 +msgid "Raise window" +msgstr "提升視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:56 +msgid "Lower window" +msgstr "降低視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:57 +msgid "Raise or lower window" +msgstr "提升或降低視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:58 +msgid "Fill window" +msgstr "填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:59 +msgid "Fill window horizontally" +msgstr "水平方向填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:60 +msgid "Fill window vertically" +msgstr "垂直方向填滿視窗" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:61 +msgid "Toggle above" +msgstr "切換至上方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:62 +msgid "Toggle fullscreen" +msgstr "切換全螢幕模式" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:63 +msgid "Move window to upper workspace" +msgstr "將視窗移至上方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:64 +msgid "Move window to bottom workspace" +msgstr "將視窗移至下方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:65 +msgid "Move window to left workspace" +msgstr "將視窗移至左方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:66 +msgid "Move window to right workspace" +msgstr "將視窗移至右方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:67 +msgid "Move window to previous workspace" +msgstr "將視窗移至上一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:68 +msgid "Move window to next workspace" +msgstr "將視窗移至下一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:69 +msgid "Move window to workspace 1" +msgstr "將視窗移至工作區 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:70 +msgid "Move window to workspace 2" +msgstr "將視窗移至工作區 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:71 +msgid "Move window to workspace 3" +msgstr "將視窗移至工作區 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:72 +msgid "Move window to workspace 4" +msgstr "將視窗移至工作區 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:73 +msgid "Move window to workspace 5" +msgstr "將視窗移至工作區 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:74 +msgid "Move window to workspace 6" +msgstr "將視窗移至工作區 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:75 +msgid "Move window to workspace 7" +msgstr "將視窗移至工作區 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:76 +msgid "Move window to workspace 8" +msgstr "將視窗移至工作區 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:77 +msgid "Move window to workspace 9" +msgstr "將視窗移至工作區 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:78 +msgid "Move window to workspace 10" +msgstr "將視窗移至工作區 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:79 +msgid "Move window to workspace 11" +msgstr "將視窗移至工作區 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:80 +msgid "Move window to workspace 12" +msgstr "將視窗移至工作區 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:81 +msgid "Tile window to the top" +msgstr "將視窗鋪在頂部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:82 +msgid "Tile window to the bottom" +msgstr "將視窗鋪在底部" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:83 +msgid "Tile window to the left" +msgstr "將視窗鋪在左方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:84 +msgid "Tile window to the right" +msgstr "將視窗鋪在右方" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:85 +msgid "Show desktop" +msgstr "顯示桌面" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:86 +msgid "Upper workspace" +msgstr "上方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:87 +msgid "Bottom workspace" +msgstr "下方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:88 +msgid "Left workspace" +msgstr "左方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:89 +msgid "Right workspace" +msgstr "右方工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:90 +msgid "Previous workspace" +msgstr "上一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:91 +msgid "Next workspace" +msgstr "下一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:92 +msgid "Workspace 1" +msgstr "工作區 1" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:93 +msgid "Workspace 2" +msgstr "工作區 2" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:94 +msgid "Workspace 3" +msgstr "工作區 3" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:95 +msgid "Workspace 4" +msgstr "工作區 4" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:96 +msgid "Workspace 5" +msgstr "工作區 5" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:97 +msgid "Workspace 6" +msgstr "工作區 6" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:98 +msgid "Workspace 7" +msgstr "工作區 7" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:99 +msgid "Workspace 8" +msgstr "工作區 8" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:100 +msgid "Workspace 9" +msgstr "工作區 9" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:101 +msgid "Workspace 10" +msgstr "工作區 10" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:102 +msgid "Workspace 11" +msgstr "工作區 11" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:103 +msgid "Workspace 12" +msgstr "工作區 12" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:104 +msgid "Add workspace" +msgstr "新增工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:105 +msgid "Add adjacent workspace" +msgstr "加入相鄰工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:106 +msgid "Delete last workspace" +msgstr "刪除最後一個工作區" + +#: ../libxfce4kbd-private/xfce-shortcuts-xfwm4.c:107 +msgid "Delete active workspace" +msgstr "刪除活動中的工作區" -#: ../glade/libxfce4ui.xml.in.h:2 +#: ../glade/libxfce4ui.xml.in.h:1 msgid "Titled Dialog" msgstr "有標題的對話窗" +#: ../glade/libxfce4ui.xml.in.h:2 +msgid "Subtitle" +msgstr "子標題" + #: ../glade/libxfce4ui.xml.in.h:3 msgid "Xfce 4 Widgets" -msgstr "Xfce 4 小工具" +msgstr "Xfce 4 器件" + +#: ../xfce4-about/main.c:52 +msgid "Version information" +msgstr "版本資訊" + +#: ../xfce4-about/main.c:70 +msgid "Window Manager" +msgstr "視窗管理程式" + +#: ../xfce4-about/main.c:71 +msgid "Handles the placement of windows on the screen." +msgstr "處理如何於螢幕置放視窗。" + +#: ../xfce4-about/main.c:74 +msgid "Panel" +msgstr "面板" + +#: ../xfce4-about/main.c:75 +msgid "" +"Program launchers, window buttons, applications menu, workspace switcher and" +" more." +msgstr "程式啟動器、視窗按鈕、應用程式選單、工作區切換器與其他。" + +#: ../xfce4-about/main.c:79 +msgid "Desktop Manager" +msgstr "視窗管理程式" + +#: ../xfce4-about/main.c:80 +msgid "" +"Sets the background color or image with optional application menu or icons " +"for minimized applications or launchers, devices and folders." +msgstr "設定背景色彩，或選用應用程式選單的影像，或最小化應用程式或啟動器、裝置、資料夾的圖示。" + +#: ../xfce4-about/main.c:84 +msgid "File Manager " +msgstr "檔案管理員" + +#: ../xfce4-about/main.c:85 +msgid "" +"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " +"and fast." +msgstr "Unix/Linux 桌面的現代化檔案管理員，旨在易用、快速。" + +#: ../xfce4-about/main.c:89 +msgid "Session Manager" +msgstr "工作階段管理員" + +#: ../xfce4-about/main.c:90 +msgid "" +"Restores your session on startup and allows you to shutdown the computer " +"from Xfce." +msgstr "啟動時還原您的工作階段，並讓您可以從 Xfce 關機。" + +#: ../xfce4-about/main.c:94 +msgid "Setting System" +msgstr "設定值系統" + +#: ../xfce4-about/main.c:95 +msgid "" +"Configuration system to control various aspects of the desktop like " +"appearance, display, keyboard and mouse settings." +msgstr "控制多項桌面層面的組態系統，像是外觀、顯示、鍵盤、滑鼠等設定值。" + +#: ../xfce4-about/main.c:99 +msgid "Application Finder" +msgstr "應用程式協尋器" + +#: ../xfce4-about/main.c:100 +msgid "" +"Shows the applications installed on your system in categories, so you can " +"quickly find and launch them." +msgstr "將安裝於您系統上的應用程式分類顯示，這樣您才能快速尋找並啟動它們。" + +#: ../xfce4-about/main.c:104 +msgid "Settings Daemon" +msgstr "設定值幕後程式" + +#: ../xfce4-about/main.c:105 +msgid "D-Bus-based configuration storage system." +msgstr "以 D-Bus 為基礎的組態儲存系統。" + +#: ../xfce4-about/main.c:112 +msgid "" +"Xfce is a collection of programs that together provide a full-featured " +"desktop environment. The following programs are part of the Xfce core:" +msgstr "Xfce 是個程式的集合，這些程式一同提供多功能的桌面環境。下列程式為 Xfce 的核心部份：" + +#: ../xfce4-about/main.c:136 +msgid "" +"Xfce is also a development platform providing several libraries, that help " +"programmers create applications that fit in well with the desktop " +"environment." +msgstr "Xfce 也是提供多種函式庫的開發平台，可以幫助程式開發者建立適用於本桌面環境的應用程式。" + +#: ../xfce4-about/main.c:142 +msgid "" +"Xfce components are licensed under free or open source licences; GPL or BSDL" +" for applications and LGPL or BSDL for libraries. Look at the documentation," +" the source code or the Xfce website (http://www.xfce.org) for more " +"information." +msgstr "Xfce 部件是以自由或開源的授權條款提供授權；GPL 或 BSDL 適用於應用程式，而 LGPL 或 BSDL 適用於函式庫。請查看文件、源碼或 Xfce 網站 (http://www.xfce.org) 取得更多資訊。" + +#: ../xfce4-about/main.c:149 +msgid "Thank you for your interest in Xfce." +msgstr "感謝您對 Xfce 有興趣。" + +#: ../xfce4-about/main.c:153 +msgid "The Xfce Development Team" +msgstr "Xfce 開發團隊" + +#: ../xfce4-about/main.c:262 +msgid "" +"If you know of anyone missing from this list; don't hesitate and file a bug " +"on ." +msgstr "若您發現清單中有些人沒有列出來，請不要猶豫在 提交一個臭蟲回報。" + +#: ../xfce4-about/main.c:266 +msgid "Thanks to all who helped making this software available!" +msgstr "感謝所有幫助製作出這個軟體的人！" + +#: ../xfce4-about/main.c:283 +msgid "" +"Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " +"components are copyrighted by their respective authors." +msgstr "Xfce 4 著作權所有者為 Olivier Fourdan (fourdan@xfce.org)。不同的部件是由其各自的作者擁有其著作權。" + +#: ../xfce4-about/main.c:288 +msgid "" +"The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " +"distributed under the terms of the GNU Library General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "libxfce4ui、libxfcegui4、libxfce4util、thunar-vfs 與 exo 套件是基於 Free Software Foundation 發布的 GNU Library General Public License 授權條款給予授權；不管是該授權的第 2 版，或 (根據您自己選擇) 的後續版本都可以。" + +#: ../xfce4-about/main.c:295 +msgid "" +"The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " +"xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are distributed " +"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." +msgstr "thunar、xfce4-appfinder、xfce-panel、xfce4-session、xfce4-settings、xfce-utils、xfconf、xfdeskop 與 xfwm4 套件是基於 Free Software Foundation 發布的 GNU General Public License 授權條款給予授權；不管是該授權的第 2 版，或 (根據您自己選擇) 的後續版本都可以。" + +#: ../xfce4-about/main.c:442 +#, c-format +msgid "Type '%s --help' for usage information." +msgstr "請輸入「%s --help」以瞭解用法資訊。" + +#: ../xfce4-about/main.c:448 +msgid "Unable to initialize GTK+." +msgstr "無法初始化 GTK+。" + +#: ../xfce4-about/main.c:457 +msgid "The Xfce development team. All rights reserved." +msgstr "Xfce 開發團隊。保留所有權利。" + +#: ../xfce4-about/main.c:458 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "請回報臭蟲至 <%s>。" + +#. I18N: date/time the translators list was updated +#: ../xfce4-about/main.c:461 +#, c-format +msgid "Translators list from %s." +msgstr "%s 的翻譯者清單。" + +#: ../xfce4-about/main.c:471 +msgid "Failed to load interface" +msgstr "無法載入介面" + +#. I18N: first %s will be replaced by the version, second by +#. * the name of the distribution (--with-vendor-info=NAME) +#: ../xfce4-about/main.c:485 +#, c-format +msgid "Version %s, distributed by %s" +msgstr "版本 %s，透過 %s 散布" + +#. I18N: %s will be replaced by the Xfce version number +#: ../xfce4-about/main.c:489 +#, c-format +msgid "Version %s" +msgstr "版本 %s" + +#. { N_("Project Lead"), +#. xfce_contributors_lead +#. }, +#: ../xfce4-about/contributors.h:121 +msgid "Core developers" +msgstr "核心開發者" + +#: ../xfce4-about/contributors.h:124 +msgid "Active contributors" +msgstr "活躍的開發者" + +#: ../xfce4-about/contributors.h:127 +msgid "Servers maintained by" +msgstr "伺服器維護者" + +#: ../xfce4-about/contributors.h:130 +msgid "Goodies supervision" +msgstr "好物監督" + +#: ../xfce4-about/contributors.h:133 +msgid "Translations supervision" +msgstr "翻譯監督" + +#: ../xfce4-about/contributors.h:136 +msgid "Translators" +msgstr "翻譯者" + +#: ../xfce4-about/contributors.h:139 +msgid "Previous contributors" +msgstr "之前的貢獻者" + +#: ../xfce4-about/xfce4-about.desktop.in.h:1 +msgid "About Xfce" +msgstr "關於 Xfce" + +#: ../xfce4-about/xfce4-about.desktop.in.h:2 +msgid "Information about the Xfce Desktop Environment" +msgstr "有關 Xfce 桌面環境的資訊" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:1 +msgid "About the Xfce Desktop Environment" +msgstr "關於 Xfce 桌面環境" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:2 +msgid "About" +msgstr "關於" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:3 +msgid "Credits" +msgstr "鳴謝" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:4 +msgid "GPL" +msgstr "GPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:5 +msgid "LGPL" +msgstr "LGPL" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:6 +msgid "BSD" +msgstr "BSD" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:7 +msgid "Copyright" +msgstr "著作權所有" + +#: ../xfce4-about/xfce4-about-dialog.glade.h:8 +msgid "License" +msgstr "授權" diff -Nru libxfce4ui-4.8.1/README libxfce4ui-4.12.1/README --- libxfce4ui-4.8.1/README 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/README 2015-02-28 14:58:54.000000000 +0000 @@ -2,7 +2,7 @@ =========== This is libxfce4ui, the replacement of the old libxfcegui4 library. It is used -to share commonly used Xfce widgets amoung the Xfce applications. +to share commonly used Xfce widgets among the Xfce applications. Required packages @@ -10,9 +10,9 @@ Libxfce4ui depends on the following packages: - - GTK+ 2.10.0 or above - - GLib 2.12.0 or above - - Libxfce4util 4.4.0 or above + - GTK+ 2.24.0 or above + - GLib 2.30.0 or above + - Libxfce4util 4.12.0 or above diff -Nru libxfce4ui-4.8.1/test-driver libxfce4ui-4.12.1/test-driver --- libxfce4ui-4.8.1/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/test-driver 2015-03-15 18:14:47.000000000 +0000 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# 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 . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru libxfce4ui-4.8.1/TODO libxfce4ui-4.12.1/TODO --- libxfce4ui-4.8.1/TODO 2011-12-23 16:12:53.000000000 +0000 +++ libxfce4ui-4.12.1/TODO 2015-02-18 18:28:03.000000000 +0000 @@ -1,3 +1,3 @@ - * Implement the GtkBuildable interface into XfceTitelDialog + * Implement the GtkBuildable interface into XfceTitleDialog and add the needed code for GtkBuilder and Glade 3.5 to recognize it. diff -Nru libxfce4ui-4.8.1/xfce4-about/about-dialog-ui.h libxfce4ui-4.12.1/xfce4-about/about-dialog-ui.h --- libxfce4ui-4.8.1/xfce4-about/about-dialog-ui.h 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/about-dialog-ui.h 2015-03-15 18:15:01.000000000 +0000 @@ -0,0 +1,731 @@ +/* automatically generated from xfce4-about-dialog.glade */ +#ifdef __SUNPRO_C +#pragma align 4 (xfce_about_dialog_ui) +#endif +#ifdef __GNUC__ +static const char xfce_about_dialog_ui[] __attribute__ ((__aligned__ (4))) = +#else +static const char xfce_about_dialog_ui[] = +#endif +{ + "About the Xfce Desktop Environment550600xfce4-logonormalTruevertical2True<" + "property name=\"can_focus\">True6TrueTrue6<" + "property name=\"hscrollbar_policy\">automaticautomaticetched-inTrueTrueFalseword33Falseabout-buf" + "ferTrueAbout" + "FalseTrueTrue6automaticautomaticetche" + "d-inTrueTrueFalseword33Falsecredits-buffe" + "r1TrueCredits1FalseTrue" + "6automaticauto" + "maticetched-inTrueTrue" + "Falseword33False" + "vendor-buffer<" + "/child>2TrueVendor2False<" + "child>True6vertical6TrueTrueautomaticautomaticetched-inTrueTrueFalseword33Falsecopyright-buffer0True6startGPLTrueTrueTrueFalseFalse0" + "LGPLTrueTrueTrueFalseF" + "alse1BSDT" + "rueTrueTrueFalseFalse2False" + "13TrueCopyright" + "3False1" + "Trueend" + "gtk-help" + "TrueTrueTrueTru" + "eFalseFalse0<" + "/property>Truegtk-closeTrueTrueTrueTrueFalseFalse1Falseend0help-buttonclose-button5License<" + "/property>True500300normalTruevertical2TrueTrue6automati" + "cautomaticetched-inTrueTrueFalseword<" + "property name=\"justification\">center33False<" + "packing>1Trueendgtk-closeTrueTrueTrueTrueFalseFalse" + "0Falseend0li" + "cense-close-buttonGNU GENERAL PUBLIC LICENSE\n\nVersion 2, June 1991\n\nCo" + "pyright (C) 1989, 1991 Free Software Foundation, Inc. \n51 Franklin St" + "reet, Fifth Floor, Boston, MA 02110-1301, USA\n\nEveryone is permitted" + " to copy and distribute verbatim copies of this license document, but c" + "hanging it is not allowed.\n\nPreamble\n\nThe licenses for most softwar" + "e are designed to take away your freedom to share and change it. By con" + "trast, the GNU General Public License is intended to guarantee your fre" + "edom to share and change free software--to make sure the software is fr" + "ee for all its users. This General Public License applies to most of th" + "e Free Software Foundation\'s software and to any other program whose a" + "uthors commit to using it. (Some other Free Software Foundation softwar" + "e is covered by the GNU Lesser General Public License instead.) You can" + " apply it to your programs, too.\n\nWhen we speak of free software, we " + "are referring to freedom, not price. Our General Public Licenses are de" + "signed to make sure that you have the freedom to distribute copies of f" + "ree software (and charge for this service if you wish), that you receiv" + "e source code or can get it if you want it, that you can change the sof" + "tware or use pieces of it in new free programs; and that you know you c" + "an do these things.\n\nTo protect your rights, we need to make restrict" + "ions that forbid anyone to deny you these rights or to ask you to surre" + "nder the rights. These restrictions translate to certain responsibiliti" + "es for you if you distribute copies of the software, or if you modify i" + "t.\n\nFor example, if you distribute copies of such a program, whether " + "gratis or for a fee, you must give the recipients all the rights that y" + "ou have. You must make sure that they, too, receive or can get the sour" + "ce code. And you must show them these terms so they know their rights.\n" + "\nWe protect your rights with two steps: (1) copyright the software, an" + "d (2) offer you this license which gives you legal permission to copy, " + "distribute and/or modify the software.\n\nAlso, for each author\'s prot" + "ection and ours, we want to make certain that everyone understands that" + " there is no warranty for this free software. If the software is modifi" + "ed by someone else and passed on, we want its recipients to know that w" + "hat they have is not the original, so that any problems introduced by o" + "thers will not reflect on the original authors\' reputations.\n\nFinall" + "y, any free program is threatened constantly by software patents. We wi" + "sh to avoid the danger that redistributors of a free program will indiv" + "idually obtain patent licenses, in effect making the program proprietar" + "y. To prevent this, we have made it clear that any patent must be licen" + "sed for everyone\'s free use or not licensed at all.\n\nThe precise ter" + "ms and conditions for copying, distribution and modification follow.\nT" + "ERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n\n0. Th" + "is License applies to any program or other work which contains a notice" + " placed by the copyright holder saying it may be distributed under the " + "terms of this General Public License. The \"Program\", below, refers to" + " any such program or work, and a \"work based on the Program\" means ei" + "ther the Program or any derivative work under copyright law: that is to" + " say, a work containing the Program or a portion of it, either verbatim" + " or with modifications and/or translated into another language. (Herein" + "after, translation is included without limitation in the term \"modific" + "ation\".) Each licensee is addressed as \"you\".\n\nActivities other th" + "an copying, distribution and modification are not covered by this Licen" + "se; they are outside its scope. The act of running the Program is not r" + "estricted, and the output from the Program is covered only if its conte" + "nts constitute a work based on the Program (independent of having been " + "made by running the Program). Whether that is true depends on what the " + "Program does.\n\n1. You may copy and distribute verbatim copies of the " + "Program\'s source code as you receive it, in any medium, provided that " + "you conspicuously and appropriately publish on each copy an appropriate" + " copyright notice and disclaimer of warranty; keep intact all the notic" + "es that refer to this License and to the absence of any warranty; and g" + "ive any other recipients of the Program a copy of this License along wi" + "th the Program.\n\nYou may charge a fee for the physical act of transfe" + "rring a copy, and you may at your option offer warranty protection in e" + "xchange for a fee.\n\n2. You may modify your copy or copies of the Prog" + "ram or any portion of it, thus forming a work based on the Program, and" + " copy and distribute such modifications or work under the terms of Sect" + "ion 1 above, provided that you also meet all of these conditions:\n\n " + " a) You must cause the modified files to carry prominent notices stati" + "ng that you changed the files and the date of any change. \n b) You " + "must cause any work that you distribute or publish, that in whole or in" + " part contains or is derived from the Program or any part thereof, to b" + "e licensed as a whole at no charge to all third parties under the terms" + " of this License. \n c) If the modified program normally reads comma" + "nds interactively when run, you must cause it, when started running for" + " such interactive use in the most ordinary way, to print or display an " + "announcement including an appropriate copyright notice and a notice tha" + "t there is no warranty (or else, saying that you provide a warranty) an" + "d that users may redistribute the program under these conditions, and t" + "elling the user how to view a copy of this License. (Exception: if the " + "Program itself is interactive but does not normally print such an annou" + "ncement, your work based on the Program is not required to print an ann" + "ouncement.) \n\nThese requirements apply to the modified work as a whol" + "e. If identifiable sections of that work are not derived from the Progr" + "am, and can be reasonably considered independent and separate works in " + "themselves, then this License, and its terms, do not apply to those sec" + "tions when you distribute them as separate works. But when you distribu" + "te the same sections as part of a whole which is a work based on the Pr" + "ogram, the distribution of the whole must be on the terms of this Licen" + "se, whose permissions for other licensees extend to the entire whole, a" + "nd thus to each and every part regardless of who wrote it.\n\nThus, it " + "is not the intent of this section to claim rights or contest your right" + "s to work written entirely by you; rather, the intent is to exercise th" + "e right to control the distribution of derivative or collective works b" + "ased on the Program.\n\nIn addition, mere aggregation of another work n" + "ot based on the Program with the Program (or with a work based on the P" + "rogram) on a volume of a storage or distribution medium does not bring " + "the other work under the scope of this License.\n\n3. You may copy and " + "distribute the Program (or a work based on it, under Section 2) in obje" + "ct code or executable form under the terms of Sections 1 and 2 above pr" + "ovided that you also do one of the following:\n\n a) Accompany it wi" + "th the complete corresponding machine-readable source code, which must " + "be distributed under the terms of Sections 1 and 2 above on a medium cu" + "stomarily used for software interchange; or, \n b) Accompany it with" + " a written offer, valid for at least three years, to give any third par" + "ty, for a charge no more than your cost of physically performing source" + " distribution, a complete machine-readable copy of the corresponding so" + "urce code, to be distributed under the terms of Sections 1 and 2 above " + "on a medium customarily used for software interchange; or, \n c) Acc" + "ompany it with the information you received as to the offer to distribu" + "te corresponding source code. (This alternative is allowed only for non" + "commercial distribution and only if you received the program in object " + "code or executable form with such an offer, in accord with Subsection b" + " above.) \n\nThe source code for a work means the preferred form of the" + " work for making modifications to it. For an executable work, complete " + "source code means all the source code for all modules it contains, plus" + " any associated interface definition files, plus the scripts used to co" + "ntrol compilation and installation of the executable. However, as a spe" + "cial exception, the source code distributed need not include anything t" + "hat is normally distributed (in either source or binary form) with the " + "major components (compiler, kernel, and so on) of the operating system " + "on which the executable runs, unless that component itself accompanies " + "the executable.\n\nIf distribution of executable or object code is made" + " by offering access to copy from a designated place, then offering equi" + "valent access to copy the source code from the same place counts as dis" + "tribution of the source code, even though third parties are not compell" + "ed to copy the source along with the object code.\n\n4. You may not cop" + "y, modify, sublicense, or distribute the Program except as expressly pr" + "ovided under this License. Any attempt otherwise to copy, modify, subli" + "cense or distribute the Program is void, and will automatically termina" + "te your rights under this License. However, parties who have received c" + "opies, or rights, from you under this License will not have their licen" + "ses terminated so long as such parties remain in full compliance.\n\n5." + " You are not required to accept this License, since you have not signed" + " it. However, nothing else grants you permission to modify or distribut" + "e the Program or its derivative works. These actions are prohibited by " + "law if you do not accept this License. Therefore, by modifying or distr" + "ibuting the Program (or any work based on the Program), you indicate yo" + "ur acceptance of this License to do so, and all its terms and condition" + "s for copying, distributing or modifying the Program or works based on " + "it.\n\n6. Each time you redistribute the Program (or any work based on " + "the Program), the recipient automatically receives a license from the o" + "riginal licensor to copy, distribute or modify the Program subject to t" + "hese terms and conditions. You may not impose any further restrictions " + "on the recipients\' exercise of the rights granted herein. You are not " + "responsible for enforcing compliance by third parties to this License.\n" + "\n7. If, as a consequence of a court judgment or allegation of patent i" + "nfringement or for any other reason (not limited to patent issues), con" + "ditions are imposed on you (whether by court order, agreement or otherw" + "ise) that contradict the conditions of this License, they do not excuse" + " you from the conditions of this License. If you cannot distribute so a" + "s to satisfy simultaneously your obligations under this License and any" + " other pertinent obligations, then as a consequence you may not distrib" + "ute the Program at all. For example, if a patent license would not perm" + "it royalty-free redistribution of the Program by all those who receive " + "copies directly or indirectly through you, then the only way you could " + "satisfy both it and this License would be to refrain entirely from dist" + "ribution of the Program.\n\nIf any portion of this section is held inva" + "lid or unenforceable under any particular circumstance, the balance of " + "the section is intended to apply and the section as a whole is intended" + " to apply in other circumstances.\n\nIt is not the purpose of this sect" + "ion to induce you to infringe any patents or other property right claim" + "s or to contest validity of any such claims; this section has the sole " + "purpose of protecting the integrity of the free software distribution s" + "ystem, which is implemented by public license practices. Many people ha" + "ve made generous contributions to the wide range of software distribute" + "d through that system in reliance on consistent application of that sys" + "tem; it is up to the author/donor to decide if he or she is willing to " + "distribute software through any other system and a licensee cannot impo" + "se that choice.\n\nThis section is intended to make thoroughly clear wh" + "at is believed to be a consequence of the rest of this License.\n\n8. I" + "f the distribution and/or use of the Program is restricted in certain c" + "ountries either by patents or by copyrighted interfaces, the original c" + "opyright holder who places the Program under this License may add an ex" + "plicit geographical distribution limitation excluding those countries, " + "so that distribution is permitted only in or among countries not thus e" + "xcluded. In such case, this License incorporates the limitation as if w" + "ritten in the body of this License.\n\n9. The Free Software Foundation " + "may publish revised and/or new versions of the General Public License f" + "rom time to time. Such new versions will be similar in spirit to the pr" + "esent version, but may differ in detail to address new problems or conc" + "erns.\n\nEach version is given a distinguishing version number. If the " + "Program specifies a version number of this License which applies to it " + "and \"any later version\", you have the option of following the terms a" + "nd conditions either of that version or of any later version published " + "by the Free Software Foundation. If the Program does not specify a vers" + "ion number of this License, you may choose any version ever published b" + "y the Free Software Foundation.\n\n10. If you wish to incorporate parts" + " of the Program into other free programs whose distribution conditions " + "are different, write to the author to ask for permission. For software " + "which is copyrighted by the Free Software Foundation, write to the Free" + " Software Foundation; we sometimes make exceptions for this. Our decisi" + "on will be guided by the two goals of preserving the free status of all" + " derivatives of our free software and of promoting the sharing and reus" + "e of software generally.\n\nNO WARRANTY\n\n11. BECAUSE THE PROGRAM IS L" + "ICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EX" + "TENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITI" + "NG THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS " + "IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDI" + "NG, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND F" + "ITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND " + "PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECT" + "IVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTI" + "ON.\n\n12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO I" + "N WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY " + "AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FO" + "R DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL " + "DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDI" + "NG BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR" + " LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM T" + "O OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY " + "HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. GNU LIBRARY GENERAL PUBLIC LICENSE\n\nVersion 2, June 1991\n\nCop" + "yright (C) 1991 Free Software Foundation, Inc.\n51 Franklin St, Fifth F" + "loor, Boston, MA 02110-1301, USA\n\nEveryone is permitted to copy and " + "distribute verbatim copies of this license document, but changing it is" + " not allowed.\n\n[This is the first released version of the library GPL" + ". It is numbered 2 because it goes with version 2 of the ordinary GPL.]" + "\n\nPreamble\n\nThe licenses for most software are designed to take awa" + "y your freedom to share and change it. By contrast, the GNU General Pub" + "lic Licenses are intended to guarantee your freedom to share and change" + " free software--to make sure the software is free for all its users.\n\n" + "This license, the Library General Public License, applies to some speci" + "ally designated Free Software Foundation software, and to any other lib" + "raries whose authors decide to use it. You can use it for your librarie" + "s, too.\n\nWhen we speak of free software, we are referring to freedom," + " not price. Our General Public Licenses are designed to make sure that " + "you have the freedom to distribute copies of free software (and charge " + "for this service if you wish), that you receive source code or can get " + "it if you want it, that you can change the software or use pieces of it" + " in new free programs; and that you know you can do these things.\n\nTo" + " protect your rights, we need to make restrictions that forbid anyone t" + "o deny you these rights or to ask you to surrender the rights. These re" + "strictions translate to certain responsibilities for you if you distrib" + "ute copies of the library, or if you modify it.\n\nFor example, if you " + "distribute copies of the library, whether gratis or for a fee, you must" + " give the recipients all the rights that we gave you. You must make sur" + "e that they, too, receive or can get the source code. If you link a pro" + "gram with the library, you must provide complete object files to the re" + "cipients so that they can relink them with the library, after making ch" + "anges to the library and recompiling it. And you must show them these t" + "erms so they know their rights.\n\nOur method of protecting your rights" + " has two steps: (1) copyright the library, and (2) offer you this licen" + "se which gives you legal permission to copy, distribute and/or modify t" + "he library.\n\nAlso, for each distributor\'s protection, we want to mak" + "e certain that everyone understands that there is no warranty for this " + "free library. If the library is modified by someone else and passed on," + " we want its recipients to know that what they have is not the original" + " version, so that any problems introduced by others will not reflect on" + " the original authors\' reputations.\n\nFinally, any free program is th" + "reatened constantly by software patents. We wish to avoid the danger th" + "at companies distributing free software will individually obtain patent" + " licenses, thus in effect transforming the program into proprietary sof" + "tware. To prevent this, we have made it clear that any patent must be l" + "icensed for everyone\'s free use or not licensed at all.\n\nMost GNU so" + "ftware, including some libraries, is covered by the ordinary GNU Genera" + "l Public License, which was designed for utility programs. This license" + ", the GNU Library General Public License, applies to certain designated" + " libraries. This license is quite different from the ordinary one; be s" + "ure to read it in full, and don\'t assume that anything in it is the sa" + "me as in the ordinary license.\n\nThe reason we have a separate public " + "license for some libraries is that they blur the distinction we usually" + " make between modifying or adding to a program and simply using it. Lin" + "king a program with a library, without changing the library, is in some" + " sense simply using the library, and is analogous to running a utility " + "program or application program. However, in a textual and legal sense, " + "the linked executable is a combined work, a derivative of the original " + "library, and the ordinary General Public License treats it as such.\n\n" + "Because of this blurred distinction, using the ordinary General Public " + "License for libraries did not effectively promote software sharing, bec" + "ause most developers did not use the libraries. We concluded that weake" + "r conditions might promote sharing better.\n\nHowever, unrestricted lin" + "king of non-free programs would deprive the users of those programs of " + "all benefit from the free status of the libraries themselves. This Libr" + "ary General Public License is intended to permit developers of non-free" + " programs to use free libraries, while preserving your freedom as a use" + "r of such programs to change the free libraries that are incorporated i" + "n them. (We have not seen how to achieve this as regards changes in hea" + "der files, but we have achieved it as regards changes in the actual fun" + "ctions of the Library.) The hope is that this will lead to faster devel" + "opment of free libraries.\n\nThe precise terms and conditions for copyi" + "ng, distribution and modification follow. Pay close attention to the di" + "fference between a \"work based on the library\" and a \"work that uses" + " the library\". The former contains code derived from the library, whil" + "e the latter only works together with the library.\n\nNote that it is p" + "ossible for a library to be covered by the ordinary General Public Lice" + "nse rather than by this special one.\nTERMS AND CONDITIONS FOR COPYING," + " DISTRIBUTION AND MODIFICATION\n\n0. This License Agreement applies to " + "any software library which contains a notice placed by the copyright ho" + "lder or other authorized party saying it may be distributed under the t" + "erms of this Library General Public License (also called \"this License" + "\"). Each licensee is addressed as \"you\".\n\nA \"library\" means a co" + "llection of software functions and/or data prepared so as to be conveni" + "ently linked with application programs (which use some of those functio" + "ns and data) to form executables.\n\nThe \"Library\", below, refers to " + "any such software library or work which has been distributed under thes" + "e terms. A \"work based on the Library\" means either the Library or an" + "y derivative work under copyright law: that is to say, a work containin" + "g the Library or a portion of it, either verbatim or with modifications" + " and/or translated straightforwardly into another language. (Hereinafte" + "r, translation is included without limitation in the term \"modificatio" + "n\".)\n\n\"Source code\" for a work means the preferred form of the wor" + "k for making modifications to it. For a library, complete source code m" + "eans all the source code for all modules it contains, plus any associat" + "ed interface definition files, plus the scripts used to control compila" + "tion and installation of the library.\n\nActivities other than copying," + " distribution and modification are not covered by this License; they ar" + "e outside its scope. The act of running a program using the Library is " + "not restricted, and output from such a program is covered only if its c" + "ontents constitute a work based on the Library (independent of the use " + "of the Library in a tool for writing it). Whether that is true depends " + "on what the Library does and what the program that uses the Library doe" + "s.\n\n1. You may copy and distribute verbatim copies of the Library\'s " + "complete source code as you receive it, in any medium, provided that yo" + "u conspicuously and appropriately publish on each copy an appropriate c" + "opyright notice and disclaimer of warranty; keep intact all the notices" + " that refer to this License and to the absence of any warranty; and dis" + "tribute a copy of this License along with the Library.\n\nYou may charg" + "e a fee for the physical act of transferring a copy, and you may at you" + "r option offer warranty protection in exchange for a fee.\n\n2. You may" + " modify your copy or copies of the Library or any portion of it, thus f" + "orming a work based on the Library, and copy and distribute such modifi" + "cations or work under the terms of Section 1 above, provided that you a" + "lso meet all of these conditions:\n\n * a) The modified work must it" + "self be a software library.\n * b) You must cause the files modified" + " to carry prominent notices stating that you changed the files and the " + "date of any change.\n * c) You must cause the whole of the work to b" + "e licensed at no charge to all third parties under the terms of this Li" + "cense.\n * d) If a facility in the modified Library refers to a func" + "tion or a table of data to be supplied by an application program that u" + "ses the facility, other than as an argument passed when the facility is" + " invoked, then you must make a good faith effort to ensure that, in the" + " event an application does not supply such function or table, the facil" + "ity still operates, and performs whatever part of its purpose remains m" + "eaningful.\n\n (For example, a function in a library to compute sq" + "uare roots has a purpose that is entirely well-defined independent of t" + "he application. Therefore, Subsection 2d requires that any application-" + "supplied function or table used by this function must be optional: if t" + "he application does not supply it, the square root function must still " + "compute square roots.)\n\nThese requirements apply to the modified work" + " as a whole. If identifiable sections of that work are not derived from" + " the Library, and can be reasonably considered independent and separate" + " works in themselves, then this License, and its terms, do not apply to" + " those sections when you distribute them as separate works. But when yo" + "u distribute the same sections as part of a whole which is a work based" + " on the Library, the distribution of the whole must be on the terms of " + "this License, whose permissions for other licensees extend to the entir" + "e whole, and thus to each and every part regardless of who wrote it.\n\n" + "Thus, it is not the intent of this section to claim rights or contest y" + "our rights to work written entirely by you; rather, the intent is to ex" + "ercise the right to control the distribution of derivative or collectiv" + "e works based on the Library.\n\nIn addition, mere aggregation of anoth" + "er work not based on the Library with the Library (or with a work based" + " on the Library) on a volume of a storage or distribution medium does n" + "ot bring the other work under the scope of this License.\n\n3. You may " + "opt to apply the terms of the ordinary GNU General Public License inste" + "ad of this License to a given copy of the Library. To do this, you must" + " alter all the notices that refer to this License, so that they refer t" + "o the ordinary GNU General Public License, version 2, instead of to thi" + "s License. (If a newer version than version 2 of the ordinary GNU Gener" + "al Public License has appeared, then you can specify that version inste" + "ad if you wish.) Do not make any other change in these notices.\n\nOnce" + " this change is made in a given copy, it is irreversible for that copy," + " so the ordinary GNU General Public License applies to all subsequent c" + "opies and derivative works made from that copy.\n\nThis option is usefu" + "l when you wish to copy part of the code of the Library into a program " + "that is not a library.\n\n4. You may copy and distribute the Library (o" + "r a portion or derivative of it, under Section 2) in object code or exe" + "cutable form under the terms of Sections 1 and 2 above provided that yo" + "u accompany it with the complete corresponding machine-readable source " + "code, which must be distributed under the terms of Sections 1 and 2 abo" + "ve on a medium customarily used for software interchange.\n\nIf distrib" + "ution of object code is made by offering access to copy from a designat" + "ed place, then offering equivalent access to copy the source code from " + "the same place satisfies the requirement to distribute the source code," + " even though third parties are not compelled to copy the source along w" + "ith the object code.\n\n5. A program that contains no derivative of any" + " portion of the Library, but is designed to work with the Library by be" + "ing compiled or linked with it, is called a \"work that uses the Librar" + "y\". Such a work, in isolation, is not a derivative work of the Library" + ", and therefore falls outside the scope of this License.\n\nHowever, li" + "nking a \"work that uses the Library\" with the Library creates an exec" + "utable that is a derivative of the Library (because it contains portion" + "s of the Library), rather than a \"work that uses the library\". The ex" + "ecutable is therefore covered by this License. Section 6 states terms f" + "or distribution of such executables.\n\nWhen a \"work that uses the Lib" + "rary\" uses material from a header file that is part of the Library, th" + "e object code for the work may be a derivative work of the Library even" + " though the source code is not. Whether this is true is especially sign" + "ificant if the work can be linked without the Library, or if the work i" + "s itself a library. The threshold for this to be true is not precisely " + "defined by law.\n\nIf such an object file uses only numerical parameter" + "s, data structure layouts and accessors, and small macros and small inl" + "ine functions (ten lines or less in length), then the use of the object" + " file is unrestricted, regardless of whether it is legally a derivative" + " work. (Executables containing this object code plus portions of the Li" + "brary will still fall under Section 6.)\n\nOtherwise, if the work is a " + "derivative of the Library, you may distribute the object code for the w" + "ork under the terms of Section 6. Any executables containing that work " + "also fall under Section 6, whether or not they are linked directly with" + " the Library itself.\n\n6. As an exception to the Sections above, you m" + "ay also compile or link a \"work that uses the Library\" with the Libra" + "ry to produce a work containing portions of the Library, and distribute" + " that work under terms of your choice, provided that the terms permit m" + "odification of the work for the customer\'s own use and reverse enginee" + "ring for debugging such modifications.\n\nYou must give prominent notic" + "e with each copy of the work that the Library is used in it and that th" + "e Library and its use are covered by this License. You must supply a co" + "py of this License. If the work during execution displays copyright not" + "ices, you must include the copyright notice for the Library among them," + " as well as a reference directing the user to the copy of this License." + " Also, you must do one of these things:\n\n * a) Accompany the work " + "with the complete corresponding machine-readable source code for the Li" + "brary including whatever changes were used in the work (which must be d" + "istributed under Sections 1 and 2 above); and, if the work is an execut" + "able linked with the Library, with the complete machine-readable \"work" + " that uses the Library\", as object code and/or source code, so that th" + "e user can modify the Library and then relink to produce a modified exe" + "cutable containing the modified Library. (It is understood that the use" + "r who changes the contents of definitions files in the Library will not" + " necessarily be able to recompile the application to use the modified d" + "efinitions.)\n * b) Accompany the work with a written offer, valid f" + "or at least three years, to give the same user the materials specified " + "in Subsection 6a, above, for a charge no more than the cost of performi" + "ng this distribution.\n * c) If distribution of the work is made by " + "offering access to copy from a designated place, offer equivalent acces" + "s to copy the above specified materials from the same place.\n * d) " + "Verify that the user has already received a copy of these materials or " + "that you have already sent this user a copy.\n\nFor an executable, the " + "required form of the \"work that uses the Library\" must include any da" + "ta and utility programs needed for reproducing the executable from it. " + "However, as a special exception, the source code distributed need not i" + "nclude anything that is normally distributed (in either source or binar" + "y form) with the major components (compiler, kernel, and so on) of the " + "operating system on which the executable runs, unless that component it" + "self accompanies the executable.\n\nIt may happen that this requirement" + " contradicts the license restrictions of other proprietary libraries th" + "at do not normally accompany the operating system. Such a contradiction" + " means you cannot use both them and the Library together in an executab" + "le that you distribute.\n\n7. You may place library facilities that are" + " a work based on the Library side-by-side in a single library together " + "with other library facilities not covered by this License, and distribu" + "te such a combined library, provided that the separate distribution of " + "the work based on the Library and of the other library facilities is ot" + "herwise permitted, and provided that you do these two things:\n\n * " + "a) Accompany the combined library with a copy of the same work based on" + " the Library, uncombined with any other library facilities. This must b" + "e distributed under the terms of the Sections above.\n * b) Give pro" + "minent notice with the combined library of the fact that part of it is " + "a work based on the Library, and explaining where to find the accompany" + "ing uncombined form of the same work.\n\n8. You may not copy, modify, s" + "ublicense, link with, or distribute the Library except as expressly pro" + "vided under this License. Any attempt otherwise to copy, modify, sublic" + "ense, link with, or distribute the Library is void, and will automatica" + "lly terminate your rights under this License. However, parties who have" + " received copies, or rights, from you under this License will not have " + "their licenses terminated so long as such parties remain in full compli" + "ance.\n\n9. You are not required to accept this License, since you have" + " not signed it. However, nothing else grants you permission to modify o" + "r distribute the Library or its derivative works. These actions are pro" + "hibited by law if you do not accept this License. Therefore, by modifyi" + "ng or distributing the Library (or any work based on the Library), you " + "indicate your acceptance of this License to do so, and all its terms an" + "d conditions for copying, distributing or modifying the Library or work" + "s based on it.\n\n10. Each time you redistribute the Library (or any wo" + "rk based on the Library), the recipient automatically receives a licens" + "e from the original licensor to copy, distribute, link with or modify t" + "he Library subject to these terms and conditions. You may not impose an" + "y further restrictions on the recipients\' exercise of the rights grant" + "ed herein. You are not responsible for enforcing compliance by third pa" + "rties to this License.\n\n11. If, as a consequence of a court judgment " + "or allegation of patent infringement or for any other reason (not limit" + "ed to patent issues), conditions are imposed on you (whether by court o" + "rder, agreement or otherwise) that contradict the conditions of this Li" + "cense, they do not excuse you from the conditions of this License. If y" + "ou cannot distribute so as to satisfy simultaneously your obligations u" + "nder this License and any other pertinent obligations, then as a conseq" + "uence you may not distribute the Library at all. For example, if a pate" + "nt license would not permit royalty-free redistribution of the Library " + "by all those who receive copies directly or indirectly through you, the" + "n the only way you could satisfy both it and this License would be to r" + "efrain entirely from distribution of the Library.\n\nIf any portion of " + "this section is held invalid or unenforceable under any particular circ" + "umstance, the balance of the section is intended to apply, and the sect" + "ion as a whole is intended to apply in other circumstances.\n\nIt is no" + "t the purpose of this section to induce you to infringe any patents or " + "other property right claims or to contest validity of any such claims; " + "this section has the sole purpose of protecting the integrity of the fr" + "ee software distribution system which is implemented by public license " + "practices. Many people have made generous contributions to the wide ran" + "ge of software distributed through that system in reliance on consisten" + "t application of that system; it is up to the author/donor to decide if" + " he or she is willing to distribute software through any other system a" + "nd a licensee cannot impose that choice.\n\nThis section is intended to" + " make thoroughly clear what is believed to be a consequence of the rest" + " of this License.\n\n12. If the distribution and/or use of the Library " + "is restricted in certain countries either by patents or by copyrighted " + "interfaces, the original copyright holder who places the Library under " + "this License may add an explicit geographical distribution limitation e" + "xcluding those countries, so that distribution is permitted only in or " + "among countries not thus excluded. In such case, this License incorpora" + "tes the limitation as if written in the body of this License.\n\n13. Th" + "e Free Software Foundation may publish revised and/or new versions of t" + "he Library General Public License from time to time. Such new versions " + "will be similar in spirit to the present version, but may differ in det" + "ail to address new problems or concerns.\n\nEach version is given a dis" + "tinguishing version number. If the Library specifies a version number o" + "f this License which applies to it and \"any later version\", you have " + "the option of following the terms and conditions either of that version" + " or of any later version published by the Free Software Foundation. If " + "the Library does not specify a license version number, you may choose a" + "ny version ever published by the Free Software Foundation.\n\n14. If yo" + "u wish to incorporate parts of the Library into other free programs who" + "se distribution conditions are incompatible with these, write to the au" + "thor to ask for permission. For software which is copyrighted by the Fr" + "ee Software Foundation, write to the Free Software Foundation; we somet" + "imes make exceptions for this. Our decision will be guided by the two g" + "oals of preserving the free status of all derivatives of our free softw" + "are and of promoting the sharing and reuse of software generally.\n\nNO" + " WARRANTY\n\n15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE " + "IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE L" + "AW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/O" + "R OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY K" + "IND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IM" + "PLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOS" + "E. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS " + "WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF AL" + "L NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n16. IN NO EVENT UNLESS " + "REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT H" + "OLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRAR" + "Y AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENER" + "AL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE" + " OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF " + "DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR TH" + "IRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTW" + "ARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIB" + "ILITY OF SUCH DAMAGES.Redistribution and use in " + "source and binary forms, with or without modification, are permitted pr" + "ovided that the following conditions are met:\n\n1. Redistributions of " + "source code must retain the above copyright notice, this list of condit" + "ions and the following disclaimer.\n\n2. Redistributions in binary form" + " must reproduce the above copyright notice, this list of conditions and" + " the following disclaimer in the documentation and/or other materials p" + "rovided with the distribution.\n\n3. Neither the name of the organizati" + "on nor the names of its contributors may be used to endorse or promote " + "products derived from this software without specific prior written perm" + "ission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTR" + "IBUTORS \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT" + " NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS " + "FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGH" + "T HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL" + ", SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMI" + "TED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA," + " OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY" + " OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDIN" + "G NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SO" + "FTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +}; + +static const unsigned xfce_about_dialog_ui_length = 50017u; + diff -Nru libxfce4ui-4.8.1/xfce4-about/contributors.h libxfce4ui-4.12.1/xfce4-about/contributors.h --- libxfce4ui-4.8.1/xfce4-about/contributors.h 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/contributors.h 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2010 Xfce Development Team + * + * 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. + */ + +#include +#include + +typedef struct +{ + const gchar *name; + const gchar *email; +} +ContributorInfo; + +typedef struct +{ + const gchar *name; + const ContributorInfo *contributors; +} +ContributorGroup; + +static const ContributorInfo xfce_contributors_core[] = +{ + { "Andrzej Radecki", "ndrwrdck@gmail.com" }, + { "Eric Koegel", "eric@xfce.org" }, + { "Harald Judt", "hjudt@xfce.org" }, + { "Landry Breuil", "landry@xfce.org" }, + { "Nick Schermer", "nick@xfce.org" }, + { "Olivier Fourdan", "fourdan@xfce.org" }, + { "Sean Davis", "bluesabre@xfce.org" }, + { "Simon Steinbeiß", "simon@xfce.org" }, + { "Peter de Ridder", "peter@xfce.org" }, + { NULL, NULL} +}; + +static const ContributorInfo xfce_contributors_active[] = +{ + { "Jannis Pohlmann", "jannis@xfce.org" }, + { "Mike Massonnet", "mmassonnet@gmail.com" }, + { "Silvio Knizek", "killermoehre@gmx.net" }, + { "Steve Dodier-Lazaro", "sidi@xfce.org" }, + { "Yves-Alexis Perez", "corsac@debian.org" }, + { "Guido Berhoerster", "guido+xfce@berhoerster.name" }, + { NULL, NULL } +}; + +static const ContributorInfo xfce_contributors_server[] = +{ + { "Jean-François Wauthy", "pollux@xfce.org" }, + { "Nick Schermer", "nick@xfce.org" }, + { "Samuel Verstraete", "elangelo@xfce.org" }, + { NULL, NULL } +}; + +static const ContributorInfo xfce_contributors_goodies_supervision[] = +{ + { "Harald Judt", "hjudt@xfce.org" }, + { "Landry Breuil", "landry@xfce.org" }, + { NULL, NULL } +}; + +static const ContributorInfo xfce_contributors_translators_supervision[] = +{ + { "Mike Massonnet", "mmassonnet@gmail.com" }, + { "Nick Schermer", "nick@xfce.org" }, + { NULL, NULL } +}; + +static const ContributorInfo xfce_contributors_previous[] = +{ + { "Ali Abdallah", "aliov@xfce.org" }, + { "Auke Kok", "sofar@foo-projects.org" }, + { "Benedikt Meurer", "benny@xfce.org" }, + { "Bernhard Walle", "bernhard.walle@gmx.de" }, + { "Biju Chacko", "botsie@xfce.org" }, + { "Brian J. Tarricone", "kelnos@xfce.org" }, + { "Craig Betts", "craig.betts@dfrc.nasa.gov" }, + { "Daichi Kawahata", "daichi@xfce.org" }, + { "Danny Milosavljevic", "dannym@xfce.org" }, + { "Darren Salt", "linux@youmustbejoking.demon.co.uk" }, + { "David Mohr", "squisher@xfce.org" }, + { "Edscott Wilson García", "edscott@xfce.org" }, + { "Eduard Roccatello", "eduard@xfce.org" }, + { "Ejvend Nielsen", "prophet@sphere-x.net" }, + { "Enrico Tröger", "enrico.troeger@uvena.de" }, + { "Erik Harrison", "erikharrison@xfce.org" }, + { "Erik Touve", "etouve@earthlink.net" }, + { "François Le Clainche", "fleclainche@wanadoo.fr" }, + { "Jasper Huijsmans", "jasper@xfce.org" }, + { "Jean-François Wauthy", "pollux@xfce.org" }, + { "Jens Guballa", "j.guballa@t-online.de" }, + { "Jens Luedicke", "jens@irs-net.com" }, + { "Joakim Andreasson", "joakim.andreasson@gmx.net" }, + { "Jérôme Guelfucci", "jeromeg@xfce.org" }, + { "Karsten Luetkewitz", "phrep@plskthx.org" }, + { "Lionel Le Folgoc", "mrpouit@gmail.com" }, + { "Martin Loschwitz", "madkiss@debian.org" }, + { "Maximilian Schleiss", "maximilian@xfce.org" }, + { "Michael Mosier", "michael@spyonit.com" }, + { "Mickaël Graf", "korbinus@xfce.org" }, + { "Pau Rul·lan Ferragut", "paurullan@bulma.net" }, + { "Stephan Arts", "stephan@xfce.org" }, + { "Thomas Leonard", "tal00r@ecs.soton.ac.uk" }, + { "Tobias Henle", "tobias@page23.de" }, + { "Xavier Maillard", "zedek@fxgsproject.org" }, + { NULL, NULL } +}; + +static const ContributorGroup xfce_contributors[] = +{ + /*{ N_("Project Lead"), + xfce_contributors_lead + },*/ + { N_("Core developers"), + xfce_contributors_core + }, + { N_("Active contributors"), + xfce_contributors_active + }, + { N_("Servers maintained by"), + xfce_contributors_server + }, + { N_("Goodies supervision"), + xfce_contributors_goodies_supervision + }, + { N_("Translations supervision"), + xfce_contributors_translators_supervision + }, + { N_("Translators"), + NULL /* data from translators.h will be used here */ + }, + { N_("Previous contributors"), + xfce_contributors_previous + } +}; diff -Nru libxfce4ui-4.8.1/xfce4-about/main.c libxfce4ui-4.12.1/xfce4-about/main.c --- libxfce4ui-4.8.1/xfce4-about/main.c 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/main.c 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,533 @@ +/* + * Copyright (C) 2015 Xfce Development Team + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_STDLIB_H +#include +#endif + +#include +#include +#include + +#include "contributors.h" +#include "translators.h" +#include "about-dialog-ui.h" + +#define MARGIN 20 + + + +typedef struct +{ + const gchar *name; + const gchar *display_name; + const gchar *description; +} +AboutModules; + + + +static gboolean opt_version = FALSE; +static GOptionEntry opt_entries[] = +{ + { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version, N_("Version information"), NULL }, + { NULL } +}; + + + +static void +xfce_about_about (GtkTextBuffer *buffer) +{ + guint i; + AboutModules *info; + GtkTextTag *bold; + GtkTextTag *indent; + GtkTextIter end; + gchar *str; + static AboutModules xfce_about_info[] = + { + { "xfwm4", + N_("Window Manager"), + N_("Handles the placement of windows on the screen.") + }, + { "xfce4-panel", + N_("Panel"), + N_("Program launchers, window buttons, applications menu, " + "workspace switcher and more.") + }, + { "xfdesktop", + N_("Desktop Manager"), + N_("Sets the background color or image with optional application menu " + "or icons for minimized applications or launchers, devices and folders.") + }, + { "thunar", + N_("File Manager "), + N_("A modern file manager for the Unix/Linux desktop, aiming to " + "be easy-to-use and fast.") + }, + { "xfce4-session", + N_("Session Manager"), + N_("Restores your session on startup and allows you to shutdown " + "the computer from Xfce.") + }, + { "xfce4-settings", + N_("Setting System"), + N_("Configuration system to control various aspects of the desktop " + "like appearance, display, keyboard and mouse settings.") + }, + { "xfce4-appfinder", + N_("Application Finder"), + N_("Shows the applications installed on your system in categories, " + "so you can quickly find and launch them.") + }, + { "xfconf", + N_("Settings Daemon"), + N_("D-Bus-based configuration storage system.") + } + }; + + g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); + + gtk_text_buffer_insert_at_cursor (buffer, + _("Xfce is a collection of programs that together provide a " + "full-featured desktop environment. The following programs " + "are part of the Xfce core:"), -1); + gtk_text_buffer_get_end_iter (buffer, &end); + + bold = gtk_text_buffer_create_tag (buffer, "bold", + "weight", PANGO_WEIGHT_BOLD, NULL); + + indent = gtk_text_buffer_create_tag (buffer, "indent", + "left-margin", MARGIN, NULL); + + for (i = 0; i < G_N_ELEMENTS (xfce_about_info); i++) + { + info = xfce_about_info + i; + + str = g_strdup_printf ("\n\n%s (%s)\n", _(info->display_name), info->name); + gtk_text_buffer_insert_with_tags (buffer, &end, str, -1, bold, NULL); + g_free (str); + + gtk_text_buffer_insert_with_tags (buffer, &end, _(info->description), -1, indent, NULL); + } + + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert (buffer, &end, + _("Xfce is also a development platform providing several libraries, " + "that help programmers create applications that fit in well " + "with the desktop environment."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert (buffer, &end, + _("Xfce components are licensed under free or open source " + "licences; GPL or BSDL for applications and LGPL or BSDL for " + "libraries. Look at the documentation, the source code or the " + "Xfce website (http://www.xfce.org) for more information."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert (buffer, &end, + _("Thank you for your interest in Xfce."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n\n\t- ", -1); + gtk_text_buffer_insert (buffer, &end, + _("The Xfce Development Team"), -1); + + gtk_text_buffer_insert (buffer, &end, "\n", -1); +} + + + +static void +xfce_about_credits_translators (GtkTextBuffer *buffer, + GtkTextIter *end, + GtkTextTag *email) +{ + guint i; + GtkTextTag *italic; + GtkTextTag *language; + const TranslatorInfo *member; + const TranslatorTeam *team; + gchar *str; + GtkTextTag *coordinator; + + language = gtk_text_buffer_create_tag (buffer, "language", + "weight", PANGO_WEIGHT_BOLD, + "left-margin", MARGIN, + "indent", -MARGIN, NULL); + + coordinator = gtk_text_buffer_create_tag (buffer, "italic", + "style", PANGO_STYLE_ITALIC, NULL); + + for (i = 0; i < G_N_ELEMENTS (xfce_translators); i++) + { + team = xfce_translators + i; + + str = g_strdup_printf ("%s [%s]:\n", team->name, team->code); + gtk_text_buffer_insert_with_tags (buffer, end, str, -1, language, NULL); + g_free (str); + + for (member = team->members; member->name != NULL; member++) + { + italic = member->is_coordinator ? coordinator : NULL; + + gtk_text_buffer_insert_with_tags (buffer, end, "\t", -1, italic, NULL); + gtk_text_buffer_insert_with_tags (buffer, end, member->name, -1, italic, NULL); + gtk_text_buffer_insert_with_tags (buffer, end, " <", -1, italic, NULL); + gtk_text_buffer_insert_with_tags (buffer, end, member->email, -1, email, italic, NULL); + gtk_text_buffer_insert_with_tags (buffer, end, ">\n", -1, italic, NULL); + + } + + gtk_text_buffer_insert (buffer, end, "\n", -1); + } +} + + + +static void +xfce_about_credits (GtkTextBuffer *buffer) +{ + guint i; + GtkTextTag *email; + GtkTextTag *title; + GtkTextTag *indent; + GtkTextIter end; + const ContributorGroup *group; + const ContributorInfo *user; + + g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); + + email = gtk_text_buffer_create_tag (buffer, "email", + "foreground", "blue", + "underline", PANGO_UNDERLINE_SINGLE, NULL); + + title = gtk_text_buffer_create_tag (buffer, "title", + "scale", 1.1, + "weight", PANGO_WEIGHT_BOLD, NULL); + + indent = gtk_text_buffer_create_tag (buffer, "indent", + "left-margin", MARGIN, + "indent", -MARGIN, NULL); + + gtk_text_buffer_get_end_iter (buffer, &end); + + for (i = 0; i < G_N_ELEMENTS (xfce_contributors); i++) + { + group = xfce_contributors + i; + + gtk_text_buffer_insert_with_tags (buffer, &end, _(group->name), -1, title, NULL); + gtk_text_buffer_insert (buffer, &end, "\n", -1); + + if (group->contributors != NULL) + { + for (user = group->contributors; user->name != NULL; user++) + { + gtk_text_buffer_insert_with_tags (buffer, &end, user->name, -1, indent, NULL); + gtk_text_buffer_insert (buffer, &end, " <", -1); + gtk_text_buffer_insert_with_tags (buffer, &end, user->email, -1, email, NULL); + gtk_text_buffer_insert (buffer, &end, ">\n", -1); + } + } + else + { + /* add the translators */ + xfce_about_credits_translators (buffer, &end, email); + } + + gtk_text_buffer_insert (buffer, &end, "\n", -1); + } + + gtk_text_buffer_insert (buffer, &end, + _("If you know of anyone missing from this list; don't hesitate and " + "file a bug on ."), -1); + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert_with_tags (buffer, &end, + _("Thanks to all who helped making this software available!"), -1, title, NULL); + + gtk_text_buffer_insert (buffer, &end, "\n", -1); +} + + + +static void +xfce_about_copyright (GtkTextBuffer *buffer) +{ + GtkTextIter end; + + g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); + + gtk_text_buffer_get_end_iter (buffer, &end); + + gtk_text_buffer_insert (buffer, &end, + _("Xfce 4 is copyright Olivier Fourdan (fourdan@xfce.org). The different " + "components are copyrighted by their respective authors."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert (buffer, &end, + _("The libxfce4ui, libxfcegui4, libxfce4util, thunar-vfs and exo packages are " + "distributed under the terms of the GNU Library General Public License as " + "published by the Free Software Foundation; either version 2 of the License, or " + "(at your option) any later version."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n\n", -1); + gtk_text_buffer_insert (buffer, &end, + _("The packages thunar, xfce4-appfinder, xfce4-panel, xfce4-session, " + "xfce4-settings, xfce-utils, xfconf, xfdesktop and xfwm4 are " + "distributed 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."), -1); + + gtk_text_buffer_insert (buffer, &end, "\n", -1); +} + + + +#ifdef VENDOR_INFO +static void +xfce_about_vendor (GtkBuilder *builder) +{ + gchar *contents; + gchar *filename; + GObject *object; + gsize length; + + g_return_if_fail (GTK_IS_BUILDER (builder)); + + filename = g_build_filename (DATADIR, "vendorinfo", NULL); + if (g_file_get_contents (filename, &contents, &length, NULL)) + { + if (length > 0) + { + if (g_utf8_validate(contents, length, NULL)) + { + object = gtk_builder_get_object (builder, "vendor-buffer"); + gtk_text_buffer_set_text (GTK_TEXT_BUFFER (object), contents, length); + + object = gtk_builder_get_object (builder, "vendor-label"); + gtk_label_set_text (GTK_LABEL (object), VENDOR_INFO); + + object = gtk_builder_get_object (builder, "vendor-tab"); + gtk_widget_show (GTK_WIDGET (object)); + } + else + { + g_critical ("\"%s\" is not UTF-8 valid", filename); + } + } + + g_free (contents); + } + else + { + g_message ("No vendor information found in \"%s\".", filename); + } + + g_free (filename); +} +#endif + + + +static void +xfce_about_license (GtkBuilder *builder, + GObject *buffer) +{ + GObject *dialog; + GObject *object; + static gboolean initial = TRUE; + + g_return_if_fail (GTK_IS_BUILDER (builder)); + g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); + + object = gtk_builder_get_object (builder, "license-textview"); + gtk_text_view_set_buffer (GTK_TEXT_VIEW (object), GTK_TEXT_BUFFER (buffer)); + + dialog = gtk_builder_get_object (builder, "license-dialog"); + if (initial) + { + g_signal_connect (G_OBJECT (dialog), "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), NULL); + + object = gtk_builder_get_object (builder, "license-close-button"); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (gtk_widget_hide), dialog); + + object = gtk_builder_get_object (builder, "window"); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (object)); + + initial = FALSE; + } + + gtk_widget_show (GTK_WIDGET (dialog)); +} + + + +static void +xfce_about_license_gpl (GtkBuilder *builder) +{ + xfce_about_license (builder, + gtk_builder_get_object (builder, "gpl-buffer")); +} + + + +static void +xfce_about_license_lgpl (GtkBuilder *builder) +{ + xfce_about_license (builder, + gtk_builder_get_object (builder, "lgpl-buffer")); +} + + + +static void +xfce_about_license_bsd (GtkBuilder *builder) +{ + xfce_about_license (builder, + gtk_builder_get_object (builder, "bsd-buffer")); +} + + + +static void +xfce_about_help (GtkWidget *button, + GtkWidget *dialog) +{ + g_return_if_fail (GTK_IS_BUTTON (button)); + xfce_dialog_show_help (GTK_WINDOW (dialog), + NULL, NULL, NULL); +} + + + +gint +main (gint argc, + gchar **argv) +{ + GtkBuilder *builder; + GError *error = NULL; + GObject *dialog; + GObject *object; + gchar *version; + + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + + if (G_UNLIKELY (!gtk_init_with_args (&argc, &argv, NULL, opt_entries, PACKAGE, &error))) + { + if (G_LIKELY (error != NULL)) + { + g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message); + g_print (_("Type '%s --help' for usage information."), G_LOG_DOMAIN); + g_print ("\n"); + + g_error_free (error); + } + else + g_error (_("Unable to initialize GTK+.")); + + return EXIT_FAILURE; + } + + if (G_UNLIKELY (opt_version)) + { + g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ()); + g_print ("%s\n", "Copyright (c) 2008-2015"); + g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); + g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT); + g_print ("\n"); + /* I18N: date/time the translators list was updated */ + g_print (_("Translators list from %s."), TRANSLATORS_H_STAMP); + g_print ("\n"); + + return EXIT_SUCCESS; + } + + builder = gtk_builder_new (); + if (!gtk_builder_add_from_string (builder, xfce_about_dialog_ui, + xfce_about_dialog_ui_length, &error)) + { + xfce_dialog_show_error (NULL, error, _("Failed to load interface")); + g_error_free (error); + g_object_unref (G_OBJECT (builder)); + + return EXIT_FAILURE; + } + + dialog = gtk_builder_get_object (builder, "window"); + g_signal_connect_swapped (G_OBJECT (dialog), "delete-event", + G_CALLBACK (gtk_main_quit), NULL); + +#ifdef VENDOR_INFO + /* I18N: first %s will be replaced by the version, second by + * the name of the distribution (--with-vendor-info=NAME) */ + version = g_strdup_printf (_("Version %s, distributed by %s"), + xfce_version_string (), VENDOR_INFO); +#else + /* I18N: %s will be replaced by the Xfce version number */ + version = g_strdup_printf (_("Version %s"), xfce_version_string ()); +#endif + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), version); + g_free (version); + + object = gtk_builder_get_object (builder, "about-buffer"); + xfce_about_about (GTK_TEXT_BUFFER (object)); + + object = gtk_builder_get_object (builder, "credits-buffer"); + xfce_about_credits (GTK_TEXT_BUFFER (object)); + + object = gtk_builder_get_object (builder, "copyright-buffer"); + xfce_about_copyright (GTK_TEXT_BUFFER (object)); + +#ifdef VENDOR_INFO + xfce_about_vendor (builder); +#endif + + object = gtk_builder_get_object (builder, "gpl-button"); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (xfce_about_license_gpl), builder); + + object = gtk_builder_get_object (builder, "lgpl-button"); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (xfce_about_license_lgpl), builder); + + object = gtk_builder_get_object (builder, "bsd-button"); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (xfce_about_license_bsd), builder); + + object = gtk_builder_get_object (builder, "help-button"); + g_signal_connect (G_OBJECT (object), "clicked", + G_CALLBACK (xfce_about_help), dialog); + + object = gtk_builder_get_object (builder, "close-button"); + g_signal_connect_swapped (G_OBJECT (object), "clicked", + G_CALLBACK (gtk_main_quit), NULL); + + gtk_widget_show (GTK_WIDGET (dialog)); + + gtk_main (); + + g_object_unref (G_OBJECT (builder)); + + return EXIT_SUCCESS; +} diff -Nru libxfce4ui-4.8.1/xfce4-about/Makefile.am libxfce4ui-4.12.1/xfce4-about/Makefile.am --- libxfce4ui-4.8.1/xfce4-about/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/Makefile.am 2013-10-04 08:51:42.000000000 +0000 @@ -0,0 +1,58 @@ + +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"xfce4-about\" \ + -DDATADIR=\"$(datadir)/xfce4\" \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + $(PLATFORM_CPPFLAGS) + +bin_PROGRAMS = \ + xfce4-about + +xfce4_about_built_sources = \ + about-dialog-ui.h + +xfce4_about_SOURCES = \ + $(xfce4_about_built_sources) \ + contributors.h \ + translators.h \ + main.c + +xfce4_about_CFLAGS = \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(GTK2_CFLAGS) \ + $(PLATFORM_CFLAGS) + +xfce4_about_LDADD = \ + $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \ + $(LIBXFCE4UTIL_LIBS) \ + $(GTK2_LIBS) + +xfce4_about_DEPENDENCIES = \ + $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la + +desktopdir = $(datadir)/applications +desktop_in_files = xfce4-about.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +DISTCLEANFILES = \ + $(desktop_DATA) + +if MAINTAINER_MODE + +about-dialog-ui.h: $(srcdir)/xfce4-about-dialog.glade Makefile + $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=xfce_about_dialog_ui $< >$@ + +BUILT_SOURCES = \ + $(xfce4_about_built_sources) + +DISTCLEANFILES += \ + $(xfce4_about_built_sources) + +endif + +EXTRA_DIST = \ + $(desktop_in_files) \ + xfce4-about-dialog.glade + diff -Nru libxfce4ui-4.8.1/xfce4-about/Makefile.in libxfce4ui-4.12.1/xfce4-about/Makefile.in --- libxfce4ui-4.8.1/xfce4-about/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/Makefile.in 2015-03-15 18:14:47.000000000 +0000 @@ -0,0 +1,831 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +bin_PROGRAMS = xfce4-about$(EXEEXT) +@MAINTAINER_MODE_TRUE@am__append_1 = \ +@MAINTAINER_MODE_TRUE@ $(xfce4_about_built_sources) + +subdir = xfce4-about +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" +PROGRAMS = $(bin_PROGRAMS) +am__objects_1 = +am_xfce4_about_OBJECTS = $(am__objects_1) xfce4_about-main.$(OBJEXT) +xfce4_about_OBJECTS = $(am_xfce4_about_OBJECTS) +am__DEPENDENCIES_1 = +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +xfce4_about_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xfce4_about_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(xfce4_about_SOURCES) +DIST_SOURCES = $(xfce4_about_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +DATA = $(desktop_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLADEUI_CATALOGDIR = @GLADEUI_CATALOGDIR@ +GLADEUI_CFLAGS = @GLADEUI_CFLAGS@ +GLADEUI_LIBS = @GLADEUI_LIBS@ +GLADEUI_MODULEDIR = @GLADEUI_MODULEDIR@ +GLADEUI_PIXMAPDIR = @GLADEUI_PIXMAPDIR@ +GLADEUI_REQUIRED_VERSION = @GLADEUI_REQUIRED_VERSION@ +GLADEUI_VERSION = @GLADEUI_VERSION@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ +GOBJECT_LIBS = @GOBJECT_LIBS@ +GOBJECT_REQUIRED_VERSION = @GOBJECT_REQUIRED_VERSION@ +GOBJECT_VERSION = @GOBJECT_VERSION@ +GREP = @GREP@ +GTK2_CFLAGS = @GTK2_CFLAGS@ +GTK2_LIBS = @GTK2_LIBS@ +GTK2_REQUIRED_VERSION = @GTK2_REQUIRED_VERSION@ +GTK2_VERSION = @GTK2_VERSION@ +GTK3_CFLAGS = @GTK3_CFLAGS@ +GTK3_LIBS = @GTK3_LIBS@ +GTK3_REQUIRED_VERSION = @GTK3_REQUIRED_VERSION@ +GTK3_VERSION = @GTK3_VERSION@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GTK_DOC_EXTRA_CFLAGS = @GTK_DOC_EXTRA_CFLAGS@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSM_CFLAGS = @LIBSM_CFLAGS@ +LIBSM_LDFLAGS = @LIBSM_LDFLAGS@ +LIBSM_LIBS = @LIBSM_LIBS@ +LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@ +LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@ +LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@ +LIBSTARTUP_NOTIFICATION_VERSION = @LIBSTARTUP_NOTIFICATION_VERSION@ +LIBTOOL = @LIBTOOL@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ +LIBXFCE4KBD_PRIVATE_VERINFO = @LIBXFCE4KBD_PRIVATE_VERINFO@ +LIBXFCE4KBD_PRIVATE_VERSION_API = @LIBXFCE4KBD_PRIVATE_VERSION_API@ +LIBXFCE4UI_VERINFO = @LIBXFCE4UI_VERINFO@ +LIBXFCE4UI_VERSION_API = @LIBXFCE4UI_VERSION_API@ +LIBXFCE4UI_VERSION_MAJOR = @LIBXFCE4UI_VERSION_MAJOR@ +LIBXFCE4UI_VERSION_MICRO = @LIBXFCE4UI_VERSION_MICRO@ +LIBXFCE4UI_VERSION_MINOR = @LIBXFCE4UI_VERSION_MINOR@ +LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@ +LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@ +LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@ +LIBXFCE4UTIL_VERSION = @LIBXFCE4UTIL_VERSION@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NO_UNDEFINED = @NO_UNDEFINED@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLATFORM_CFLAGS = @PLATFORM_CFLAGS@ +PLATFORM_CPPFLAGS = @PLATFORM_CPPFLAGS@ +PLATFORM_LDFLAGS = @PLATFORM_LDFLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XFCONF_CFLAGS = @XFCONF_CFLAGS@ +XFCONF_LIBS = @XFCONF_LIBS@ +XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@ +XFCONF_VERSION = @XFCONF_VERSION@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"xfce4-about\" \ + -DDATADIR=\"$(datadir)/xfce4\" \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + $(PLATFORM_CPPFLAGS) + +xfce4_about_built_sources = \ + about-dialog-ui.h + +xfce4_about_SOURCES = \ + $(xfce4_about_built_sources) \ + contributors.h \ + translators.h \ + main.c + +xfce4_about_CFLAGS = \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(GTK2_CFLAGS) \ + $(PLATFORM_CFLAGS) + +xfce4_about_LDADD = \ + $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la \ + $(LIBXFCE4UTIL_LIBS) \ + $(GTK2_LIBS) + +xfce4_about_DEPENDENCIES = \ + $(top_builddir)/libxfce4ui/libxfce4ui-$(LIBXFCE4UI_VERSION_API).la + +desktopdir = $(datadir)/applications +desktop_in_files = xfce4-about.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +DISTCLEANFILES = $(desktop_DATA) $(am__append_1) +@MAINTAINER_MODE_TRUE@BUILT_SOURCES = \ +@MAINTAINER_MODE_TRUE@ $(xfce4_about_built_sources) + +EXTRA_DIST = \ + $(desktop_in_files) \ + xfce4-about-dialog.glade + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xfce4-about/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu xfce4-about/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +xfce4-about$(EXEEXT): $(xfce4_about_OBJECTS) $(xfce4_about_DEPENDENCIES) $(EXTRA_xfce4_about_DEPENDENCIES) + @rm -f xfce4-about$(EXEEXT) + $(AM_V_CCLD)$(xfce4_about_LINK) $(xfce4_about_OBJECTS) $(xfce4_about_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_about-main.Po@am__quote@ + +.c.o: +@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 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@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 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +xfce4_about-main.o: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_about_CFLAGS) $(CFLAGS) -MT xfce4_about-main.o -MD -MP -MF $(DEPDIR)/xfce4_about-main.Tpo -c -o xfce4_about-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_about-main.Tpo $(DEPDIR)/xfce4_about-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xfce4_about-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_about_CFLAGS) $(CFLAGS) -c -o xfce4_about-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + +xfce4_about-main.obj: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_about_CFLAGS) $(CFLAGS) -MT xfce4_about-main.obj -MD -MP -MF $(DEPDIR)/xfce4_about-main.Tpo -c -o xfce4_about-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_about-main.Tpo $(DEPDIR)/xfce4_about-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xfce4_about-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_about_CFLAGS) $(CFLAGS) -c -o xfce4_about-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(PROGRAMS) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-desktopDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA + +.MAKE: all check install install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-desktopDATA + +@INTLTOOL_DESKTOP_RULE@ + +@MAINTAINER_MODE_TRUE@about-dialog-ui.h: $(srcdir)/xfce4-about-dialog.glade Makefile +@MAINTAINER_MODE_TRUE@ $(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=xfce_about_dialog_ui $< >$@ + +# 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 libxfce4ui-4.8.1/xfce4-about/translators.h libxfce4ui-4.12.1/xfce4-about/translators.h --- libxfce4ui-4.8.1/xfce4-about/translators.h 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/translators.h 2015-03-15 18:11:26.000000000 +0000 @@ -0,0 +1,895 @@ +/* + * Copyright (C) 2010 Xfce Development Team + * + * 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. + */ + + +#include +#include + +#define TRANSLATORS_H_STAMP "2015-03-15 16:44:46" +#define ATSIGN "@" +#define DOTSIGN "." + +typedef struct +{ + const gchar *name; + const gchar *email; + guint is_coordinator : 1; +} +TranslatorInfo; + +typedef struct +{ + const gchar *name; + const gchar *code; + const TranslatorInfo *members; +} +TranslatorTeam; + + +/* Amharic */ +static const TranslatorInfo xfce_translators_am[] = +{ + { "Belay", "belaytekalign" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Tegegne Tefera", "tefera" ATSIGN "mekuria" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Arabic */ +static const TranslatorInfo xfce_translators_ar[] = +{ + { "عبدالله رضوان", "abbodmar" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "كريم أولاد الشلحة", "herr" DOTSIGN "linux88" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "abdXelrhman", "abdxelrhman" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "محمد الحرقان", "malham1" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ahmadzxc", "ahmad" DOTSIGN "almomani5" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Amine", "amine" ATSIGN "linuxac" DOTSIGN "org", FALSE }, + { "M. Fawwaz Orabi", "mfawwaz93" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "M.hanny Sabbagh", "hannysabbagh" ATSIGN "hotmail" DOTSIGN "com", FALSE }, + { "Mohsen", "linuxer9" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Noureddin Khatat", "noureddin" ATSIGN "barid" DOTSIGN "com", FALSE }, + { "Simohamed", "mohamed" DOTSIGN "sakhri" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Asturian */ +static const TranslatorInfo xfce_translators_ast[] = +{ + { "Enolp", "enolp" ATSIGN "softastur" DOTSIGN "org", FALSE }, + { "Iñigo Varela", "malditoastur" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Tornes Llume", "l" DOTSIGN "lumex03" DOTSIGN "tornes" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Belarusian */ +static const TranslatorInfo xfce_translators_be[] = +{ + { "Andrei Zakharevich", "andrej" ATSIGN "zahar" DOTSIGN "ws", FALSE }, + { "Mikalai Udodau", "crom-a" ATSIGN "tut" DOTSIGN "by", FALSE }, + { "Mike Gelfand", "mikedld" ATSIGN "mikedld" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Bulgarian */ +static const TranslatorInfo xfce_translators_bg[] = +{ + { "Gazarrr", "gazarrr" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Georgi Georgiev", "georgiev_1994" ATSIGN "abv" DOTSIGN "bg", FALSE }, + { "Kiril Kirilov", "cybercop_montana" ATSIGN "abv" DOTSIGN "bg", FALSE }, + { "Krasimir Chonov", "mk2616" ATSIGN "abv" DOTSIGN "bg", FALSE }, + { "Milen Milev", "fanfolet" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Valentin Tunev", "hdbuster" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Bengali */ +static const TranslatorInfo xfce_translators_bn[] = +{ + { "Jamil Ahmed", "itsjamil" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Catalan */ +static const TranslatorInfo xfce_translators_ca[] = +{ + { "Alavios", "registres" ATSIGN "lavios" DOTSIGN "cat", FALSE }, + { "Carles Muñoz Gorriz", "carlesmu" ATSIGN "internautas" DOTSIGN "org", FALSE }, + { "Frangor", "frangor" ATSIGN "frangor" DOTSIGN "info", FALSE }, + { "Harald Servat", "redcrash" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Joan Montané", "joan" ATSIGN "montane" DOTSIGN "cat", FALSE }, + { "Lebrush", "lebrush" ATSIGN "xplosio" DOTSIGN "net", FALSE }, + { "Paul Garden", "kiari62" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Roger Pueyo Centelles", "xfce" ATSIGN "rogerpueyo" DOTSIGN "com", FALSE }, + { "Sandandmercury", "sandandmercury" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Czech */ +static const TranslatorInfo xfce_translators_cs[] = +{ + { "Alois Nešpor", "info" ATSIGN "aloisnespor" DOTSIGN "info", FALSE }, + { "Franti3ek", "frantisek" DOTSIGN "komarek" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Fri", "pavelfric" ATSIGN "seznam" DOTSIGN "cz", FALSE }, + { "Libor Schejbal", "libor" DOTSIGN "schejbal" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Michal Várady", "miko" DOTSIGN "vaji" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Per Kongstad", "p_kongstad" ATSIGN "op" DOTSIGN "pl", FALSE }, + { "Radim Kolář", "kolar" DOTSIGN "radim" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Robert Hartl", "hartl" DOTSIGN "robert" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Danish */ +static const TranslatorInfo xfce_translators_da[] = +{ + { "Aputsiaĸ Niels Janussen", "aj" ATSIGN "isit" DOTSIGN "gl", FALSE }, + { "Chris Darnell", "chris" ATSIGN "cedeel" DOTSIGN "com", FALSE }, + { "Erik Schmidt", "erischmi" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kris Thomsen", "lakristho" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Morten Juhl-Johansen Zölde-Fejér", "mjjzf" ATSIGN "syntaktisk" DOTSIGN "dk", FALSE }, + { "Per Kongstad", "p_kongstad" ATSIGN "op" DOTSIGN "pl", FALSE }, + { NULL, NULL } +}; + + +/* German */ +static const TranslatorInfo xfce_translators_de[] = +{ + { "Chris Leick", "c" DOTSIGN "leick" ATSIGN "vollbio" DOTSIGN "de", FALSE }, + { "Christoph Mende", "angelos" ATSIGN "gentoo" DOTSIGN "org", FALSE }, + { "Christoph Wickert", "christoph" DOTSIGN "wickert" ATSIGN "googlemail" DOTSIGN "com", FALSE }, + { "David Mohr", "david" ATSIGN "mcbf" DOTSIGN "net", FALSE }, + { "Detlef Riekenberg", "wine" DOTSIGN "dev" ATSIGN "web" DOTSIGN "de", FALSE }, + { "Fabian Nowak", "timystery" ATSIGN "arcor" DOTSIGN "de", FALSE }, + { "Georg Eckert", "eckert" DOTSIGN "georg" ATSIGN "gmx" DOTSIGN "de", FALSE }, + { "Harald Judt", "h" DOTSIGN "judt" ATSIGN "gmx" DOTSIGN "at", FALSE }, + { "Jakob Kramer", "jakob" DOTSIGN "kramer" ATSIGN "gmx" DOTSIGN "de", FALSE }, + { "Jannis Pohlmann", "jannis" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Johannes Lips", "johannes" DOTSIGN "lips" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mario Blättermann", "mario" DOTSIGN "blaettermann" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mark Trompell", "mark" ATSIGN "foresightlinux" DOTSIGN "org", FALSE }, + { "Michael Spahn", "any0n3" ATSIGN "fedoraproject" DOTSIGN "org", FALSE }, + { "Paul Seyfert", "pseyfert" ATSIGN "mathphys" DOTSIGN "fsk" DOTSIGN "uni-heidelberg" DOTSIGN "de", FALSE }, + { "Raphael Groner", "raphgro" ATSIGN "web" DOTSIGN "de", FALSE }, + { "Roland Kübert", "roland" ATSIGN "upic" DOTSIGN "de", FALSE }, + { "Simon Steinbeiss", "ochosi" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Thomas Schütz", "xfce" ATSIGN "thschuetz" DOTSIGN "de", FALSE }, + { "Tobias Bannert", "tobannert" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Uwe Krause", "derhorst" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Greek */ +static const TranslatorInfo xfce_translators_el[] = +{ + { "Efstathios Iosifidis", "iefstathios" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Evaggelos Balaskas", "ebalaskas" ATSIGN "ebalaskas" DOTSIGN "gr", FALSE }, + { "Forfolias", "forfolias" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gapan", "vlahavas" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Georgios Stefanakis", "nonviotale" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Jani Kotsionis", "ikotsionis" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Klearchos-Angelos Gkountras", "kleagkou" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Loathingkernel", "zeronebones" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Madits", "dimitsas" DOTSIGN "markos" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mario Andonoudiou", "supermodmusic" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Spiros Georgaras", "sng" ATSIGN "hellug" DOTSIGN "gr", FALSE }, + { "Spyros", "spyros_stravoravdis" ATSIGN "hotmail" DOTSIGN "com", FALSE }, + { "Stavros Giannouris", "stavrosg" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* English (Australia) */ +static const TranslatorInfo xfce_translators_en_AU[] = +{ + { "Michael Findlay", "keltoiboy" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* English (Great Britain) */ +static const TranslatorInfo xfce_translators_en_GB[] = +{ + { "Jeff Bailes", "thepizzaking" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Noskcaj", "noskcaj" ATSIGN "ubuntu" DOTSIGN "com", FALSE }, + { "Readmanr", "robert_readman" ATSIGN "hotmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Esperanto */ +static const TranslatorInfo xfce_translators_eo[] = +{ + { "Aleksandr Ponomarenko", "davian818" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Edsono", "edsono" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Spanish */ +static const TranslatorInfo xfce_translators_es[] = +{ + { "Abel Martín", "abel" DOTSIGN "martin" DOTSIGN "ruiz" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Adolfo Jayme Barrientos", "fitoschido" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Andres Sanchez", "afsanchez93" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "César Enrique García", "cquike" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "David Segura Monroy", "davidseg" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Edwinpm5", "edwinpm5" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Francisco Javier Serrador", "fserrador" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gabrieltandil", "gabriel" DOTSIGN "tandil" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gonzalo Lagos", "xalo" DOTSIGN "em" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Hernan Gabriel Alvarez Guerra", "hernan" DOTSIGN "alvarez" DOTSIGN "guerra" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ignacio Velasco", "elega" ATSIGN "elega" DOTSIGN "com" DOTSIGN "ar", FALSE }, + { "Javier Sánchez Reinosa", "donoban" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Lbazan", "bazanluis20" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Manolo Díaz", "diaz" DOTSIGN "manolo" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "MC", "correomc2000-ing" ATSIGN "yahoo" DOTSIGN "es", FALSE }, + { "Pablo Lezaeta", "prflr88" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pharamir", "pamirmatos" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sergio García", "oigres200" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "The Idiot", "brian" DOTSIGN "peraza" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Estonian */ +static const TranslatorInfo xfce_translators_et[] = +{ + { "Allar Kiristaja", "aquastus" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mattias Põldaru", "mahfiaz" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Basque */ +static const TranslatorInfo xfce_translators_eu[] = +{ + { "Asier Iturralde Sarasola", "asier" DOTSIGN "iturralde" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Piarres Beobide", "pi" ATSIGN "beobide" DOTSIGN "net", FALSE }, + { NULL, NULL } +}; + + +/* Persian */ +static const TranslatorInfo xfce_translators_fa[] = +{ + { "Mehdi Esmaeelpour", "ariarat" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Finnish */ +static const TranslatorInfo xfce_translators_fi[] = +{ + { "Flammie Pirinen", "flammie" ATSIGN "iki" DOTSIGN "fi", FALSE }, + { "Jari Rahkonen", "jari" DOTSIGN "rahkonen" ATSIGN "pp1" DOTSIGN "inet" DOTSIGN "fi", FALSE }, + { "Jarno Liimatainen", "jarliim" ATSIGN "iki" DOTSIGN "fi", FALSE }, + { "Jiri Grönroos", "jiri" DOTSIGN "gronroos" ATSIGN "iki" DOTSIGN "fi", FALSE }, + { "Juhani Numminen", "juhaninumminen0" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Lasse Liehu", "larso" ATSIGN "gmx" DOTSIGN "com", FALSE }, + { "Pasi Lallinaho", "pasi" ATSIGN "shimmerproject" DOTSIGN "org", FALSE }, + { "Tapio Väisänen", "tapio" DOTSIGN "vaeisaenen" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Tero Mononen", "tero" ATSIGN "mononen" DOTSIGN "eu", FALSE }, + { NULL, NULL } +}; + + +/* French */ +static const TranslatorInfo xfce_translators_fr[] = +{ + { "Anthony Jorion", "pingax" ATSIGN "frugalware" DOTSIGN "fr", FALSE }, + { "Benoit Thibaud", "frombenny" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Douart Patrick", "patrick" DOTSIGN "2" ATSIGN "laposte" DOTSIGN "net", FALSE }, + { "Durand-Favreau Arnaud", "biginoz" ATSIGN "free" DOTSIGN "fr", FALSE }, + { "Fevrier", "jean-philippe" DOTSIGN "guerard" ATSIGN "tigreraye" DOTSIGN "org", FALSE }, + { "Filorin", "guillaume" DOTSIGN "ber17" ATSIGN "laposte" DOTSIGN "net", FALSE }, + { "Glaville", "laville" DOTSIGN "guillaume" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Iliyas Jorio", "inv" DOTSIGN "jorio" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Jc Jc1", "jc1" DOTSIGN "quebecos" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Jean-Philippe Fleury", "contact" ATSIGN "jpfleury" DOTSIGN "net", FALSE }, + { "Jérôme Guelfucci", "jeromeg" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Louis Moureaux", "m_louis30" ATSIGN "yahoo" DOTSIGN "com", FALSE }, + { "Mario Gervais", "gervais" DOTSIGN "mario" ATSIGN "ymail" DOTSIGN "com", FALSE }, + { "Maximilian Schleiss", "maximilian" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Mike Massonnet", "mmassonnet" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Pedwo51", "pedwo51" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pierre Albiero", "trepalum" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pingax", "pingax" ATSIGN "frugalware" DOTSIGN "org", FALSE }, + { "Remi Andruccioli", "remi" DOTSIGN "andruccioli" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Steve Dodier", "sidnioulz" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Urien Desterres", "urien" DOTSIGN "desterres" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Xavier Devlamynck", "magicrhesus" ATSIGN "ouranos" DOTSIGN "be", FALSE }, + { "Yannick Le Guen", "leguen" DOTSIGN "yannick" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Galician */ +static const TranslatorInfo xfce_translators_gl[] = +{ + { "Leandro Regueiro", "leandro" DOTSIGN "regueiro" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Hebrew */ +static const TranslatorInfo xfce_translators_he[] = +{ + { "GenghisKhan", "genghiskhan" ATSIGN "gmx" DOTSIGN "ca", FALSE }, + { "Hezy Amiel", "open" ATSIGN "hezyamiel" DOTSIGN "com", FALSE }, + { "Nick Vurgaft", "slipperygate" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Yaron Shahrabani", "sh" DOTSIGN "yaron" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Croatian */ +static const TranslatorInfo xfce_translators_hr[] = +{ + { "Denis Štogl", "denisstogl" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Edin Veskovic", "edin" DOTSIGN "veskovic" ATSIGN "openmailbox" DOTSIGN "org", FALSE }, + { "Ivica Kolić", "ikoli" ATSIGN "yahoo" DOTSIGN "com", FALSE }, + { "Petar Koretić", "petar" DOTSIGN "koretic" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Hungarian */ +static const TranslatorInfo xfce_translators_hu[] = +{ + { "Gabor Kelemen", "kelemeng" ATSIGN "gnome" DOTSIGN "hu", FALSE }, + { "Gyönki Bendegúz", "gyonkibendeguz" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Imre Benedek", "nucleo" ATSIGN "indamail" DOTSIGN "hu", FALSE }, + { "László Horváth", "leslie" DOTSIGN "translate" ATSIGN "yahoo" DOTSIGN "co" DOTSIGN "uk", FALSE }, + { "Nagy Gábor", "jackson" DOTSIGN "gabor" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Indonesian */ +static const TranslatorInfo xfce_translators_id[] = +{ + { "Andhika Padmawan", "andhika" DOTSIGN "padmawan" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ardjuna", "asyura" DOTSIGN "x" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Zaenal", "zaenal1234" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Icelandic */ +static const TranslatorInfo xfce_translators_is[] = +{ + { "Kristófer Arnþórsson", "kristoferarnthors" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sveinn í Felli", "sveinki" ATSIGN "nett" DOTSIGN "is", FALSE }, + { "Theódór S. Andrésson", "husgafl" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Italian */ +static const TranslatorInfo xfce_translators_it[] = +{ + { "Amigamagic", "debianmaverick" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Andreazube", "andreazuben" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Crazyaxe", "angerangel" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Cristian Marchi", "cri" DOTSIGN "penta" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Edoardo Maria Elidoro", "edoardo" DOTSIGN "elidoro" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Enrico Polesel", "polesel" ATSIGN "poisson" DOTSIGN "phc" DOTSIGN "unipi" DOTSIGN "it", FALSE }, + { "Francesco Groccia", "frgroccia" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gianluca Foddis", "gianluca" DOTSIGN "foddis" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Leonardo Totaro", "elleti" DOTSIGN "brainvision" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Milozzy", "marco" DOTSIGN "sting" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Salvatorexfce", "salvatorexfce" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Winebar", "vs" DOTSIGN "winebar" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Japanese */ +static const TranslatorInfo xfce_translators_ja[] = +{ + { "Hchenmisc", "hao" DOTSIGN "chen" DOTSIGN "jobs" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Masato Hashimoto", "hashimo" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Nobuhiro Iwamatsu", "iwamatsu" ATSIGN "nigauri" DOTSIGN "org", FALSE }, + { NULL, NULL } +}; + + +/* Kazakh */ +static const TranslatorInfo xfce_translators_kk[] = +{ + { "Baurzhan Muftakhidinov", "baurthefirst" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Korean */ +static const TranslatorInfo xfce_translators_ko[] = +{ + { "BAK Chan-Jin", "yeoulongg" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Jasonjang", "hl1sxa" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kentarch", "bkrhlim" ATSIGN "aol" DOTSIGN "com", FALSE }, + { "Lego37yoon", "lego37yoon" ATSIGN "outlook" DOTSIGN "com", FALSE }, + { "Seong-ho Cho", "darkcircle" DOTSIGN "0426" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sungjin Gang", "potopro" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sung Jin Gang", "ujuc" ATSIGN "ujuc" DOTSIGN "kr", FALSE }, + { NULL, NULL } +}; + + +/* Lithuanian */ +static const TranslatorInfo xfce_translators_lt[] = +{ + { "Algimantas Margevičius", "margevicius" DOTSIGN "algimantas" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ričardas Vasiulis", "ricardas" DOTSIGN "v" ATSIGN "inbox" DOTSIGN "lt", FALSE }, + { NULL, NULL } +}; + + +/* Latvian */ +static const TranslatorInfo xfce_translators_lv[] = +{ + { "Gatis Kalniņš <> ", FALSE }, + { "Rihards Prieditis", "rprieditis" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Malay */ +static const TranslatorInfo xfce_translators_ms[] = +{ + { "Abuyop", "abuyop" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ceghap", "hello" ATSIGN "ceghap" DOTSIGN "com", FALSE }, + { "Mohd. Nadzrin Sapari", "terjemah" DOTSIGN "puretech" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Norwegian Bokmål */ +static const TranslatorInfo xfce_translators_nb[] = +{ + { "Allan Nordhøy", "comradekingu" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Haarek", "haarektrans" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kevin Brubeck Unhammer", "javkalas" ATSIGN "mm" DOTSIGN "st", FALSE }, + { "Papparonny", "ronny" ATSIGN "olufsen" DOTSIGN "org", FALSE }, + { "Takoi", "thomas" DOTSIGN "amland" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Terje Uriansrud", "terje" ATSIGN "uriansrud" DOTSIGN "net", FALSE }, + { NULL, NULL } +}; + + +/* Dutch (Flemish) */ +static const TranslatorInfo xfce_translators_nl[] = +{ + { "Auke Kok", "sofar" ATSIGN "foo-projects" DOTSIGN "org", FALSE }, + { "Nick Schermer", "nickschermer" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pjotr Anon", "pliniusminor" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pjotr Vertaalt", "pjotrvertaalt" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Timo Verbeek", "timoverbeek10" ATSIGN "hotmail" DOTSIGN "com", FALSE }, + { "Vincent Tunru", "projects" ATSIGN "vinnl" DOTSIGN "nl", FALSE }, + { NULL, NULL } +}; + + +/* Norwegian Nynorsk */ +static const TranslatorInfo xfce_translators_nn[] = +{ + { "Eivind Ødegård", "gingermig" ATSIGN "yahoo" DOTSIGN "no", FALSE }, + { "Kevin Brubeck Unhammer", "javkalas" ATSIGN "mm" DOTSIGN "st", FALSE }, + { NULL, NULL } +}; + + +/* Occitan */ +static const TranslatorInfo xfce_translators_oc[] = +{ + { "Cedric31", "cvalmary" ATSIGN "yahoo" DOTSIGN "fr", FALSE }, + { NULL, NULL } +}; + + +/* Panjabi */ +static const TranslatorInfo xfce_translators_pa[] = +{ + { "A S Alam", "apreet" DOTSIGN "alam" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Polish */ +static const TranslatorInfo xfce_translators_pl[] = +{ + { "Adam Stachowicz", "saibamenppl" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Cyryl Sochacki", "cyrylsochacki" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Dawid", "hoek" ATSIGN "hoek" DOTSIGN "pl", FALSE }, + { "Elder", "elderlinx" ATSIGN "riseup" DOTSIGN "net", FALSE }, + { "Elzear", "babciaroziazpogwizdowa" ATSIGN "wp" DOTSIGN "pl", FALSE }, + { "Emanuel Borówko", "trzynastak" ATSIGN "o2" DOTSIGN "pl", FALSE }, + { "Ireneusz Gierlach", "irek" DOTSIGN "gierlach" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Jakub Waśko", "javazlaz" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kamil Polczak", "elderlinx" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Marcin Romańczuk", "abjsyn" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Michał Jeż", "michal" DOTSIGN "je2u" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Michał Olber", "michal" DOTSIGN "olber" ATSIGN "osworld" DOTSIGN "pl", FALSE }, + { "Pawel10", "pawelklimek102" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Piotr Sokół", "psokol" ATSIGN "jabster" DOTSIGN "pl", FALSE }, + { "Piotr Strębski", "strebski" ATSIGN "o2" DOTSIGN "pl", FALSE }, + { "Tomasz Chudyk", "chudyk" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Portuguese */ +static const TranslatorInfo xfce_translators_pt[] = +{ + { "Alexandre Fidalgo", "alexandremagnos15" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Nuno Miguel", "nunomgue" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sérgio Marques", "smarquespt" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Portuguese (Brazilian) */ +static const TranslatorInfo xfce_translators_pt_BR[] = +{ + { "André Miranda", "andreldm1989" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Cleber de Souza Corrêa", "cscorrea" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Enrico Nicoletto", "enrico" DOTSIGN "br" ATSIGN "gmx" DOTSIGN "co" DOTSIGN "uk", FALSE }, + { "Henrique P. Machado", "zehrique" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Joelso Andrade", "kosmofilo" ATSIGN "ymail" DOTSIGN "com", FALSE }, + { "Michael Martins", "michaelfm21" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Miguel Frasson", "mvsfrasson" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mtobias", "marcelo" DOTSIGN "tobbias" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Neliton Pereira Junior", "nelitonpjr" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Og Maciel", "ogmaciel" ATSIGN "gnome" DOTSIGN "org", FALSE }, + { "Rafael Ferreira", "rafael" DOTSIGN "f" DOTSIGN "f1" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Rafael Neri", "rafepel" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sérgio Cipolla", "secipolla" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Tomas Schertel", "tschertel" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Victor Gonçalves", "hotcyv" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Vladimir Melo", "vladimirmelo" DOTSIGN "psi" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Romanian */ +static const TranslatorInfo xfce_translators_ro[] = +{ + { "Mișu Moldovan", "dumol" ATSIGN "xfce" DOTSIGN "org", FALSE }, + { "Strainu", "xfce" ATSIGN "strainu" DOTSIGN "ro", FALSE }, + { NULL, NULL } +}; + + +/* Russian */ +static const TranslatorInfo xfce_translators_ru[] = +{ + { "026rus", "026rus" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "AK", "ak099" ATSIGN "mail" DOTSIGN "ru", FALSE }, + { "Aleksandr Ponomarenko", "davian818" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Aleksandr Sorokin", "equusa" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "AlexanderFilev", "ifillrok" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Alexander Matveyev", "a" DOTSIGN "s" DOTSIGN "matveyev" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Alexandr Boltris", "ua2fgb" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Alexey Batiuk", "alexey" DOTSIGN "batiuk" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Alex Z", "ad_user" ATSIGN "lavabit" DOTSIGN "com", FALSE }, + { "Andres Kovtunos", "kovtunos" ATSIGN "yandex" DOTSIGN "ru", FALSE }, + { "Andrey Ivankov", "andrey" DOTSIGN "ivankov" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Artem Zolochevskiy", "artem" DOTSIGN "zolochevskiy" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Brdassign", "dmitriy" DOTSIGN "borodiy" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Claque", "cpt-alatriste" ATSIGN "ya" DOTSIGN "ru", FALSE }, + { "Denis Koryavov", "dkoryavov" ATSIGN "yandex" DOTSIGN "ru", FALSE }, + { "Dmitrij Smirnov", "arch" ATSIGN "cnc-parts" DOTSIGN "info", FALSE }, + { "Dmitriy Kudryashov", "overmailed" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kyrill Detinov", "lazy" DOTSIGN "kent" ATSIGN "opensuse" DOTSIGN "org", FALSE }, + { "Lowrider", "pams" ATSIGN "imail" DOTSIGN "ru", FALSE }, + { "Roman K", "mrdoctorwho" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sergey Alyoshin", "alyoshin" DOTSIGN "s" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sergey Shlyapugin", "shlyapugin" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Someniatko", "someniatko" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Styopa Semenukha", "semenukha" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Velisarus", "velisarus" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Vlad Vasilev", "lortwer" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Sinhala */ +static const TranslatorInfo xfce_translators_si[] = +{ + { "Akila Wajirasena", "akila" DOTSIGN "wajirasena" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Anandawardhana", "anandawardhana" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Danishka Navin", "danishka" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kalpa Pathum Welivitigoda", "callkalpa" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kasundigital", "kasunindika" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Kpgtharaka", "kpgtharaka" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Prabath Galagamage", "gprabath" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Slovak */ +static const TranslatorInfo xfce_translators_sk[] = +{ + { "Marek Hlava", "headsvk" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Michal Löffler", "lofflermichalloffler" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Peter Bubelíny", "p" DOTSIGN "bubeliny" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Robert Hartl", "hartl" DOTSIGN "robert" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Slavko", "linux" ATSIGN "slavino" DOTSIGN "sk", FALSE }, + { "Tomáš Vadina", "kyberdev" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Slovenian */ +static const TranslatorInfo xfce_translators_sl[] = +{ + { "Ansich", "mojmejlzaforume" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Anthonmanix", "anthon" DOTSIGN "manix" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Dražen M", "drazen" ATSIGN "ubuntu" DOTSIGN "si", FALSE }, + { "Gašper Tomažič", "gasper" ATSIGN "gmx" DOTSIGN "com", FALSE }, + { "Holden87", "latinovic87" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Klemen Košir", "klemen913" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Nenad Latinović", "nenadlatinovic" ATSIGN "lavabit" DOTSIGN "com", FALSE }, + { "Rok Kepa", "rokkepa" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sasa Batistic", "sasa" DOTSIGN "batistic" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Uros Preloznik", "uros00" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Albanian */ +static const TranslatorInfo xfce_translators_sq[] = +{ + { "Ard1t", "ardit" DOTSIGN "dani" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Besnik Bleta", "besnik" ATSIGN "programeshqip" DOTSIGN "org", FALSE }, + { "Erlin Hysenbelliu", "erlinh91" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Serbian */ +static const TranslatorInfo xfce_translators_sr[] = +{ + { "Мирослав Николић", "miroslavnikolic" ATSIGN "rocketmail" DOTSIGN "com", FALSE }, + { "Саша Петровић", "salepetronije" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Harald Judt", "h" DOTSIGN "judt" ATSIGN "gmx" DOTSIGN "at", FALSE }, + { "Mpopovic", "gpopac" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Swedish */ +static const TranslatorInfo xfce_translators_sv[] = +{ + { "Alex Nordlund", "deep" DOTSIGN "alexander" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Bittin", "cs_bittin" ATSIGN "msn" DOTSIGN "com", FALSE }, + { "Daniel Nylander", "po" ATSIGN "danielnylander" DOTSIGN "se", FALSE }, + { "Elefterios Lundell", "winnie666" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "FredN", "fredrik" ATSIGN "nyqvist" DOTSIGN "biz", FALSE }, + { "Kim Svensson", "ks6g10" ATSIGN "soton" DOTSIGN "ac" DOTSIGN "uk", FALSE }, + { "PavelNicklasson", "pavelnicklasson" ATSIGN "bahnhof" DOTSIGN "se", FALSE }, + { "Peterdenk", "peter" ATSIGN "skypay" DOTSIGN "se", FALSE }, + { "Rickard Larsson", "larsson" ATSIGN "odus" DOTSIGN "se", FALSE }, + { NULL, NULL } +}; + + +/* Telugu */ +static const TranslatorInfo xfce_translators_te[] = +{ + { "వీవెన్", "veeven" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "ప్రవీణ్ ఇళ్ళ", "mail2ipn" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Thai */ +static const TranslatorInfo xfce_translators_th[] = +{ + { "Theppitak Karoonboonyanan", "theppitak" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Turkish */ +static const TranslatorInfo xfce_translators_tr[] = +{ + { "Akın Ömeroğlu", "akin" ATSIGN "pardus" DOTSIGN "org" DOTSIGN "tr", FALSE }, + { "Ali Polatel", "ali" DOTSIGN "polatel" ATSIGN "ozguryazilim" DOTSIGN "com" DOTSIGN "tr", FALSE }, + { "Alper Tekinalp", "alper" DOTSIGN "tekinalp" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Askar05", "asirkaraman" ATSIGN "yahoo" DOTSIGN "de", FALSE }, + { "Aybuke", "aybuke" DOTSIGN "147" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Aydan Taşdemir", "aydantasdemir" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ayhan YALÇINSOY", "ayhanyalcinsoy" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Caner Gural", "cgural" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ertuğrul HAZAR", "ertugrulhazar" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Farukuzun", "farukuzun" ATSIGN "mail" DOTSIGN "com", FALSE }, + { "Fatih Erdem", "93" DOTSIGN "fatiherdem" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gökhan Kılınç", "kilincgokhan" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gökmen Görgen", "gkmngrgn" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ilker Dagli", "ilker" ATSIGN "ilkerdagli" DOTSIGN "info", FALSE }, + { "Martinamca", "martinamca" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Mustafa Tekkoyun", "mustafa" DOTSIGN "tekkoyun" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Natavan Mirzayeva", "mirzayevanatavan" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Necdet Yücel", "necdetyucel" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Osman Karagöz", "osmank3" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Samed Beyribey", "beyribey" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Server Acim", "serveracim" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Utku Aydın", "utkuaydin" ATSIGN "archlinux" DOTSIGN "org" DOTSIGN "tr", FALSE }, + { "Utku Berberoğlu", "utku" DOTSIGN "berber" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Volkangezer", "volkangezer" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Yakup", "mutouk" ATSIGN "yandex" DOTSIGN "ru", FALSE }, + { "Zafer Eren", "zaferern" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Zeki", "zeki" DOTSIGN "ozguryazilim" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Özgür Kuru", "ozgur" ATSIGN "ozgurkuru" DOTSIGN "net", FALSE }, + { NULL, NULL } +}; + + +/* Uyghur */ +static const TranslatorInfo xfce_translators_ug[] = +{ + { "Abduqadir Abliz", "sahran" DOTSIGN "ug" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Gheyret Kenji", "gheyret" ATSIGN "yahoo" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Ukrainian */ +static const TranslatorInfo xfce_translators_uk[] = +{ + { "Andriy Matkovsky", "sidius" DOTSIGN "ua" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Dmitry Nikitin", "luckas_fb" ATSIGN "mail" DOTSIGN "ru", FALSE }, + { "Oleksandr Natalenko", "pfactum" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Olexandr Nesterenko", "olexn" ATSIGN "ukr" DOTSIGN "net", FALSE }, + { "Pavlo Bilyak", "jpavlo11" ATSIGN "ukr" DOTSIGN "net", FALSE }, + { "Yarema aka Knedlyk", "yupadmin" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Zubr139", "zubr139" ATSIGN "ukr" DOTSIGN "net", FALSE }, + { NULL, NULL } +}; + + +/* Uzbek */ +static const TranslatorInfo xfce_translators_uz[] = +{ + { "Umidjon Almasov", "u" DOTSIGN "almasov" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Vietnamese */ +static const TranslatorInfo xfce_translators_vi[] = +{ + { "Crziter", "crziter" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Duy Truong Nguyen", "truongap" DOTSIGN "ars" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ppanhh", "ppanhh" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Vinh Nguyen", "kureikain" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Chinese (China) */ +static const TranslatorInfo xfce_translators_zh_CN[] = +{ + { "Chipong Luo", "chipong" DOTSIGN "luo" ATSIGN "yahoo" DOTSIGN "com", FALSE }, + { "Greensea", "gs" ATSIGN "bbxy" DOTSIGN "net", FALSE }, + { "Hunt Xu", "mhuntxu" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Qianqian Fang", "fangqq" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Xianhao", "qinghao1" ATSIGN "foxmail" DOTSIGN "com", FALSE }, + { "玉堂白鹤", "yjwork" ATSIGN "qq" DOTSIGN "com", FALSE }, + { "周潇波", "zhouxiaobo" DOTSIGN "500" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "白铭骢", "jeffbaichina" ATSIGN "members" DOTSIGN "fsf" DOTSIGN "org", FALSE }, + { NULL, NULL } +}; + + +/* Chinese (Hong Kong) */ +static const TranslatorInfo xfce_translators_zh_HK[] = +{ + { "Walter Cheuk", "wwycheuk" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "文豪 卫", "waimanho2765galois" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* Chinese (Taiwan) */ +static const TranslatorInfo xfce_translators_zh_TW[] = +{ + { "Cheng-Chia Tseng", "pswo10680" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Chia-Han Lee", "gloomysaga" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ethan42411", "jrpropo10282003" ATSIGN "yahoo" DOTSIGN "com" DOTSIGN "tw", FALSE }, + { "Jeff Huang", "s8321414" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Pei Yi Chen", "cpyimail" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Ruei-Yuan Lu", "rueiyuan" DOTSIGN "lu" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Sofyalai", "sofyalai" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { "Walter Cheuk", "wwycheuk" ATSIGN "gmail" DOTSIGN "com", FALSE }, + { NULL, NULL } +}; + + +/* teams list, sorted alphabetically by language name */ +static const TranslatorTeam xfce_translators[] = +{ + { "Albanian", "sq", xfce_translators_sq }, + { "Amharic", "am", xfce_translators_am }, + { "Arabic", "ar", xfce_translators_ar }, + { "Asturian", "ast", xfce_translators_ast }, + { "Basque", "eu", xfce_translators_eu }, + { "Belarusian", "be", xfce_translators_be }, + { "Bengali", "bn", xfce_translators_bn }, + { "Bulgarian", "bg", xfce_translators_bg }, + { "Catalan", "ca", xfce_translators_ca }, + { "Chinese (China)", "zh_CN", xfce_translators_zh_CN }, + { "Chinese (Hong Kong)", "zh_HK", xfce_translators_zh_HK }, + { "Chinese (Taiwan)", "zh_TW", xfce_translators_zh_TW }, + { "Croatian", "hr", xfce_translators_hr }, + { "Czech", "cs", xfce_translators_cs }, + { "Danish", "da", xfce_translators_da }, + { "Dutch (Flemish)", "nl", xfce_translators_nl }, + { "English (Australia)", "en_AU", xfce_translators_en_AU }, + { "English (Great Britain)", "en_GB", xfce_translators_en_GB }, + { "Esperanto", "eo", xfce_translators_eo }, + { "Estonian", "et", xfce_translators_et }, + { "Finnish", "fi", xfce_translators_fi }, + { "French", "fr", xfce_translators_fr }, + { "Galician", "gl", xfce_translators_gl }, + { "German", "de", xfce_translators_de }, + { "Greek", "el", xfce_translators_el }, + { "Hebrew", "he", xfce_translators_he }, + { "Hungarian", "hu", xfce_translators_hu }, + { "Icelandic", "is", xfce_translators_is }, + { "Indonesian", "id", xfce_translators_id }, + { "Italian", "it", xfce_translators_it }, + { "Japanese", "ja", xfce_translators_ja }, + { "Kazakh", "kk", xfce_translators_kk }, + { "Korean", "ko", xfce_translators_ko }, + { "Latvian", "lv", xfce_translators_lv }, + { "Lithuanian", "lt", xfce_translators_lt }, + { "Malay", "ms", xfce_translators_ms }, + { "Norwegian Bokmål", "nb", xfce_translators_nb }, + { "Norwegian Nynorsk", "nn", xfce_translators_nn }, + { "Occitan", "oc", xfce_translators_oc }, + { "Panjabi", "pa", xfce_translators_pa }, + { "Persian", "fa", xfce_translators_fa }, + { "Polish", "pl", xfce_translators_pl }, + { "Portuguese", "pt", xfce_translators_pt }, + { "Portuguese (Brazilian)", "pt_BR", xfce_translators_pt_BR }, + { "Romanian", "ro", xfce_translators_ro }, + { "Russian", "ru", xfce_translators_ru }, + { "Serbian", "sr", xfce_translators_sr }, + { "Sinhala", "si", xfce_translators_si }, + { "Slovak", "sk", xfce_translators_sk }, + { "Slovenian", "sl", xfce_translators_sl }, + { "Spanish", "es", xfce_translators_es }, + { "Swedish", "sv", xfce_translators_sv }, + { "Telugu", "te", xfce_translators_te }, + { "Thai", "th", xfce_translators_th }, + { "Turkish", "tr", xfce_translators_tr }, + { "Ukrainian", "uk", xfce_translators_uk }, + { "Uyghur", "ug", xfce_translators_ug }, + { "Uzbek", "uz", xfce_translators_uz }, + { "Vietnamese", "vi", xfce_translators_vi }, +}; diff -Nru libxfce4ui-4.8.1/xfce4-about/xfce4-about.desktop.in libxfce4ui-4.12.1/xfce4-about/xfce4-about.desktop.in --- libxfce4ui-4.8.1/xfce4-about/xfce4-about.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/xfce4-about.desktop.in 2012-05-03 22:30:28.000000000 +0000 @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=xfce4-about +Icon=help-about +StartupNotify=false +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +_Name=About Xfce +_Comment=Information about the Xfce Desktop Environment diff -Nru libxfce4ui-4.8.1/xfce4-about/xfce4-about-dialog.glade libxfce4ui-4.12.1/xfce4-about/xfce4-about-dialog.glade --- libxfce4ui-4.8.1/xfce4-about/xfce4-about-dialog.glade 1970-01-01 00:00:00.000000000 +0000 +++ libxfce4ui-4.12.1/xfce4-about/xfce4-about-dialog.glade 2015-03-08 12:34:35.000000000 +0000 @@ -0,0 +1,577 @@ + + + + + + + About the Xfce Desktop Environment + 550 + 600 + xfce4-logo + normal + + + True + vertical + 2 + + + True + True + 6 + + + True + True + 6 + automatic + automatic + etched-in + + + True + True + False + word + 3 + 3 + False + about-buffer + + + + + + + True + About + + + False + + + + + True + True + 6 + automatic + automatic + etched-in + + + True + True + False + word + 3 + 3 + False + credits-buffer + + + + + 1 + + + + + True + Credits + + + 1 + False + + + + + True + 6 + automatic + automatic + etched-in + + + True + True + False + word + 3 + 3 + False + vendor-buffer + + + + + 2 + + + + + True + Vendor + + + 2 + False + + + + + True + 6 + vertical + 6 + + + True + True + automatic + automatic + etched-in + + + True + True + False + word + 3 + 3 + False + copyright-buffer + + + + + 0 + + + + + True + 6 + start + + + GPL + True + True + True + + + False + False + 0 + + + + + LGPL + True + True + True + + + False + False + 1 + + + + + BSD + True + True + True + + + False + False + 2 + + + + + False + 1 + + + + + 3 + + + + + True + Copyright + + + 3 + False + + + + + 1 + + + + + True + end + + + gtk-help + True + True + True + True + + + False + False + 0 + True + + + + + gtk-close + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + help-button + close-button + + + + 5 + License + True + 500 + 300 + normal + + + True + vertical + 2 + + + True + True + 6 + automatic + automatic + etched-in + + + True + True + False + word + center + 3 + 3 + False + + + + + 1 + + + + + True + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + license-close-button + + + + + + + GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + + GNU LIBRARY GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1991 Free Software Foundation, Inc. +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is numbered 2 because it goes with version 2 of the ordinary GPL.] + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. + +This license, the Library General Public License, applies to some specially designated Free Software Foundation software, and to any other libraries whose authors decide to use it. You can use it for your libraries, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library, or if you modify it. + +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link a program with the library, you must provide complete object files to the recipients so that they can relink them with the library, after making changes to the library and recompiling it. And you must show them these terms so they know their rights. + +Our method of protecting your rights has two steps: (1) copyright the library, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the library. + +Also, for each distributor's protection, we want to make certain that everyone understands that there is no warranty for this free library. If the library is modified by someone else and passed on, we want its recipients to know that what they have is not the original version, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that companies distributing free software will individually obtain patent licenses, thus in effect transforming the program into proprietary software. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License, which was designed for utility programs. This license, the GNU Library General Public License, applies to certain designated libraries. This license is quite different from the ordinary one; be sure to read it in full, and don't assume that anything in it is the same as in the ordinary license. + +The reason we have a separate public license for some libraries is that they blur the distinction we usually make between modifying or adding to a program and simply using it. Linking a program with a library, without changing the library, is in some sense simply using the library, and is analogous to running a utility program or application program. However, in a textual and legal sense, the linked executable is a combined work, a derivative of the original library, and the ordinary General Public License treats it as such. + +Because of this blurred distinction, using the ordinary General Public License for libraries did not effectively promote software sharing, because most developers did not use the libraries. We concluded that weaker conditions might promote sharing better. + +However, unrestricted linking of non-free programs would deprive the users of those programs of all benefit from the free status of the libraries themselves. This Library General Public License is intended to permit developers of non-free programs to use free libraries, while preserving your freedom as a user of such programs to change the free libraries that are incorporated in them. (We have not seen how to achieve this as regards changes in header files, but we have achieved it as regards changes in the actual functions of the Library.) The hope is that this will lead to faster development of free libraries. + +The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, while the latter only works together with the library. + +Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License Agreement applies to any software library which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Library General Public License (also called "this License"). Each licensee is addressed as "you". + +A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. + +The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) + +"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. + +1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + * a) The modified work must itself be a software library. + * b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. + * c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. + * d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. + + (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. + +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. + +This option is useful when you wish to copy part of the code of the Library into a program that is not a library. + +4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. + +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. + +5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. + +However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. + +When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. + +If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) + +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. + +6. As an exception to the Sections above, you may also compile or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. + +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: + + * a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) + * b) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. + * c) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. + * d) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. + +For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. + +7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: + + * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. + * b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. + +8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. + +10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of the Library General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +