diff -Nru gdm-2.32.1/aclocal.m4 gdm-3.0.0/aclocal.m4 --- gdm-2.32.1/aclocal.m4 2011-03-28 16:55:34.000000000 +0000 +++ gdm-3.0.0/aclocal.m4 2011-04-04 14:39:25.000000000 +0000 @@ -19,10399 +19,1724 @@ 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'.])]) -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH([gconf-source], - AC_HELP_STRING([--with-gconf-source=sourceaddress], - [Config database for installing schema files.]), - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) +# 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. - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi +# 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 +]) - AC_ARG_WITH([gconf-schema-file-dir], - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], - [Directory for installing schema files.]), - [GCONF_SCHEMA_FILE_DIR="$withval"],) +# _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], []) - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) +# 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]))]) - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 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. + +# 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/../..'. # -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 +# 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. # -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 +# $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 # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# 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. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# 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. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# 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. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +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` +]) -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# AM_CONDITIONAL -*- Autoconf -*- -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 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 - AC_MSG_RESULT(no) + $1_TRUE='#' + $1_FALSE= fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +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])]) - gt_cv_have_gettext=no +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# serial 10 - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - 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 and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - -if test "$gdu_cv_have_gdu" = "yes"; then - AC_MSG_RESULT([yes]) - ifelse([$2],,[:],[$2]) -else - AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi - -GNOME_DOC_DEFINES -]) - - -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 - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $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; }'` - ] - 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 - -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 - - 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 $< [$]@' - -_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) - -# 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 - -# 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) - -IT_PO_SUBDIR([po]) - -]) - - -# 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])]) -] -) - -# 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], ...) - - -# 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 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. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 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. -# -# 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. -]) - -# serial 57 LT_INIT - - -# 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])]) - - -# _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_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 - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# 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], []) - - -# _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-%%"` -]) - - -# _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_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 -]) -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 - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# 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 - -_LT_CC_BASENAME([$compiler]) - -# 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 - ;; -esac - -# 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_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' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# 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' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _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 - - - -# 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. - - -# _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 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _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_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _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_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])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _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 -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# 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)])]) - - -# 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 -]) - - -# _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"`']) - - -# _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_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 -]) - - -# _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 -]) - - -# _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)])])]) - - -# _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])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _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 - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# 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 - -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' - -# 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\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# 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\\\\\\"" - ;; - 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 - -# 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_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]] - - -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 - -Report bugs to ." - -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) 2010 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 - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -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 "$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 - - -# _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 - - 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 -# 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 - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_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 - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # 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) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -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 - - -# 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], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# 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)], - [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 - - -# _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)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -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)])])])])]) - -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 - -# 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_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 - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _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_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_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]) - - 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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; 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 "$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 -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# 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\"`' - 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_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_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 - -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' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -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_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]) - -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 - - 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.])]) - -# _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 - -# 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* - ;; - -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* - ;; - -*-*-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 - ;; -sparc*-*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*) LD="${LD-ld} -m elf64_sparc" ;; - *) - 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 - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _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]) - -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 - ]) - ]) - -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 - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -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 \$oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -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" - # 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* -]) - -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_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" -]) - -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_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; - ;; - - 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; - ;; - - 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 - ;; - - 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"`func_fallback_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 -]) -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_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" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#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 - -/* 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; - - 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_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= - - 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= - ;; - - 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 - ]) - ;; - - *) - 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 - - 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\" - - 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) - ]) - - 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 - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - 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 - -# 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 "$_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_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_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 - - # 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)]) - -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_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_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" - 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 - -case $host_os in -aix3*) - version_type=linux - 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 - 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 - ;; - -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 - ;; - -bsdi[[45]]*) - version_type=linux - 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 - 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 - ;; - -freebsd1*) - dynamic_linker=no - ;; - -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[[123]]*) 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 - ;; - -gnu*) - version_type=linux - 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 - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux - 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 - 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 "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux - 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 - ;; - -# This must be Linux ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux - 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 - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # 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="$sys_lib_dlsearch_path_spec $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 - 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*) - 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 - ;; - -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 - ;; - -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 - 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 "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux - 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 - 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 - 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' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux - 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 - ;; - -uts4*) - version_type=linux - 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 - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -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_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_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 - -*** 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 - -# 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], []) - - -# _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) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# 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 - -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 &1 /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 - ;; - -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 - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -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)$' - ;; - -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 - ;; - -# This must be Linux 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 - ;; - -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*) - 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 - ;; - -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*` - ;; - 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 - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -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 -fi - -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 - -_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 - 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" -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 -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 - -# 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], []) - -# _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' - -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_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 - - -# 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 - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; 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 - - _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 - - -# _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 - -# 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]]' - -# 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 - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# 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'" - -# 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'" - -# 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 - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # 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};"\ -" /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]" - 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'" - - # 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 - - # 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 - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* 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} -}; - -/* 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 - 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 - 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 "$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 - -# 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_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 - - -# _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)= - -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' - - 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 - ;; - - 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 - ;; - - 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' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - 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 - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - 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 - ;; - - 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 - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - 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']) - ;; - - 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)= - ;; - - 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 - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - 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 - ;; - - *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' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' - ;; - 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 "$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 - ;; - - 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' - ;; - - 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' - ;; - - 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' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) - # 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\ 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,' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *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' - ;; - - 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' - ;; - - 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' - ;; - - 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' - ;; - - 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 - ;; - - 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' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which 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 - -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) - -# -# 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_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 - - -# _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 - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) ;; - *) - _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_flag_spec_ld, $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 "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # 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_use_gnu_ld_interface=yes - ;; - 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 - ;; - - 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 - ;; - - 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'] - - 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 - ;; - - 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 - ;; - - 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' - ;; - - 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' - - 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)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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 - ;; - - 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. - -_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 - ;; - - 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 - -*** 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 - ;; - - 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 - ;; - - *) - 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 "$_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 - ;; - - 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 - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # 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. - - _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,' - - 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 - - _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 - ;; - - 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 - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - 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(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 - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - 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 - ;; - - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - # 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 - ;; - - # 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 - ;; - - # 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 - ;; - - 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' - 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' - 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' - ;; - - 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_flag_spec_ld, $1)='+b $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 - ;; - - 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)=: - - 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' - - # 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 - ;; - - 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' - 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 - ;; - - 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 - ;; - - *nto* | *qnx*) - ;; - - 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 - fi - ;; - - 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' - ;; - - 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)=: - ;; - - 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' - 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' - ;; - 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??? - ;; - 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 - ;; - - 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' - ;; - 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_flag_spec_ld], [1], - [[If ld is used when linking, 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]) - - 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_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _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 - -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_flag_spec_ld, $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 - -# Source file extension for C++ test sources. -ac_ext=cpp - -# 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 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;" - - # Code to be used in simple link tests - 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 - - # 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_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]) - - 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 - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # 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' - - _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}' - - # 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= - - # 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 - - # 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 - GXX=no - with_gnu_ld=no - wlarc= - fi - - # 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 - - # 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 - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # 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. - - _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,' - - 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 - - _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 - ;; - - 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 - ;; - - 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 - - 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 - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - 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 - ;; - - freebsd[[12]]*) - # 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 - ;; - - 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)=: - - 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 - - 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 - ;; - - 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' - - # 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 - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - 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_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"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # 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 - - _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' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $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. - # - # 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 - - # 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' - - # 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 - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - 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 - ;; - - 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::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - 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 - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - 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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # 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)=: - - # 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $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 - ;; - - 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' - - _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' - - # 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' - - # 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' - - # 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' - - # 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_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 - ;; - - 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 - ;; - - 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) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - 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 - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _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 - -# _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)= - -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 -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -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 - - 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 $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # 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= - ;; - - *.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 - - 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 - ;; - - *) ;; # Ignore the rest. - - 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 - -# 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)= - ;; - -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 - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -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 - ;; - 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 -]) - -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_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_flag_spec_ld, $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 - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 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 - - # 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_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]) - - 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)="$G77" - _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_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 "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_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 -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_flag_spec_ld, $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 - -# 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 - -# 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 "$_lt_disable_FC" != 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 - - # 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_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - 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" - - ## 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" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _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 - -# 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 {}" - -# 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 - -# 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]) - -# 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 - -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 - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _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 - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# 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 - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# 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 -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _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]) -]) - - -# _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]) -]) - -# _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]) -]) - -# _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 - -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. # - -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 - -# 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_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']) - -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_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_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 - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _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 - ;; - * ) # 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 - -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 - -# 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])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _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 -]) - - -# _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_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_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_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# 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 - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -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.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -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 - -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) - - _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]) -]) - -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($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _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) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -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], []) - - - -# _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) - -_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])]) - -# 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.]) -]) - -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.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _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], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# 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.]) -]) - -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])]) - -# 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. - -# serial 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# 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($@)))])]) - - -# 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_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])]) - - - -# 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])])])])]) - - -# 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])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# 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)])]))]) - - -# 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_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 -]) - -# 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. - -# @configure_input@ - -# serial 3293 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) - -# 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. - -# serial 5 lt~obsolete.m4 - -# 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. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([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])]) - -# 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. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) +# 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... -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]) -]) -# 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. +# _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. # -# 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. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -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 +# 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 -# 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]) +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=]) -# _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`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +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 -# _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 + 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 -# 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 + # 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 -pkg_failed=no -AC_MSG_CHECKING([for $1]) + 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]) +]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -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.]) +# 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 +]) -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 "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# 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 +]) -$$1_PKG_ERRORS +# Generate code to set up dependency tracking. -*- Autoconf -*- -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# 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. -_PKG_TEXT]) - ]) -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. +#serial 5 -_PKG_TEXT +# _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 -To get pkg-config, see .]) - ]) -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. +# 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"]) +]) + +# 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. -# 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 -]) - -# _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], []) +# serial 8 -# 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]))]) +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# 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. -# 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. +# serial 16 -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` +# 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. + +# 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 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]) + +# 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 + +_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 ]) -# AM_CONDITIONAL -*- Autoconf -*- +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])]) -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. + +# 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. + +# 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. -# 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= +# 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_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])]) +AC_SUBST(install_sh)]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# 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. -# serial 10 +# serial 2 -# 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... +# 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])]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -# _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. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# 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 +# 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. -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=]) +# serial 5 -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 +# 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 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 +] +) - 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]) +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - 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 +# Check to see how 'make' treats includes. -*- Autoconf -*- - # 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 +# 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. - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none +# serial 4 + +# 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([$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]) +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. -# 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 -]) - +# serial 6 -# 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='\' +# 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 -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +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])]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 -# _AM_OUTPUT_DEPENDENCY_COMMANDS +# AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ -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 +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# 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"]) +# 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 ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. +# 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. -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) +# 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 +]) -# Do all the work for Automake. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 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 16 +# serial 4 -# 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. +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# 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 +# _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)]) -# 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]) +# _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)])]) -# 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 +# _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])]) -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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 -]) +# 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 + +# 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 -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])]) +# 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 -# 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. + 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)]) -# 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) 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. -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# serial 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # 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 +# 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 -AC_SUBST(install_sh)]) +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # 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 2 + +# _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. +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 + + # 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 + +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 + +# 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. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -# 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])]) +AC_PREREQ([2.50]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +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]) +]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# 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 +# 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. -# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) # ---------------------------------- -# 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 -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +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]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +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 -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# 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 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]) -# serial 4 +# _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`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# 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 -]) +# _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 -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# 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. +# +# 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 -# serial 6 +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# 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])]) -]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +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 "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +$$1_PKG_ERRORS -# serial 6 +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# 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)]) +_PKG_TEXT]) + ]) +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 -# 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 " +To get pkg-config, see .]) + ]) else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# 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. +dnl AM_GCONF_SOURCE_2 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl -# 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 -]) +AC_DEFUN([AM_GCONF_SOURCE_2], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi -# Helper functions for option handling. -*- Autoconf -*- + AC_ARG_WITH([gconf-source], + AC_HELP_STRING([--with-gconf-source=sourceaddress], + [Config database for installing schema files.]), + [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) -# Copyright (C) 2001, 2002, 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. + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -# serial 4 + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + AC_ARG_WITH([gconf-schema-file-dir], + AC_HELP_STRING([--with-gconf-schema-file-dir=dir], + [Directory for installing schema files.]), + [GCONF_SCHEMA_FILE_DIR="$withval"],) -# _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)]) + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -# _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)])]) + AC_ARG_ENABLE(schemas-install, + AC_HELP_STRING([--disable-schemas-install], + [Disable the schemas installation]), + [case ${enableval} in + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +]) -# _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) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# 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. +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) + +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# serial 5 + gt_cv_have_gettext=no -# 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 + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# 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 + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" - # 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 + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi - 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 don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=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. + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# serial 1 + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# 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 -]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# 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. + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + 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 and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# 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])]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + # We need to process the po/ directory. + POSUB=po -# serial 2 + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# Check how to create a tarball. -*- Autoconf -*- +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# Copyright (C) 2004, 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. + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# serial 2 + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -# _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. -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 + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) - # 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 + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) - # 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 +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) + +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -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_include([m4/gnome-doc-utils.m4]) +m4_include([m4/intltool.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) m4_include([acinclude.m4]) diff -Nru gdm-2.32.1/common/Makefile.in gdm-3.0.0/common/Makefile.in --- gdm-2.32.1/common/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/common/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -43,8 +43,11 @@ subdir = common DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -173,8 +176,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/configure gdm-3.0.0/configure --- gdm-2.32.1/configure 2011-03-28 16:55:35.000000000 +0000 +++ gdm-3.0.0/configure 2011-04-04 14:39:26.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gdm 2.32.1. +# Generated by GNU Autoconf 2.68 for gdm 3.0.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='gdm' PACKAGE_TARNAME='gdm' -PACKAGE_VERSION='2.32.1' -PACKAGE_STRING='gdm 2.32.1' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='gdm 3.0.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdm' PACKAGE_URL='' @@ -697,8 +697,6 @@ CHECK_CFLAGS GLIB_GENMARSHAL PLUGIN_LIBTOOL_FLAGS -APPLET_LIBS -APPLET_CFLAGS SIMPLE_CHOOSER_LIBS SIMPLE_CHOOSER_CFLAGS HAVE_LIBXKLAVIER @@ -1005,8 +1003,6 @@ LIBXKLAVIER_LIBS SIMPLE_CHOOSER_CFLAGS SIMPLE_CHOOSER_LIBS -APPLET_CFLAGS -APPLET_LIBS CHECK_CFLAGS CHECK_LIBS' @@ -1551,7 +1547,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 gdm 2.32.1 to adapt to many kinds of systems. +\`configure' configures gdm 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1625,7 +1621,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gdm 2.32.1:";; + short | recursive ) echo "Configuration of gdm 3.0.0:";; esac cat <<\_ACEOF @@ -1777,9 +1773,6 @@ C compiler flags for SIMPLE_CHOOSER, overriding pkg-config SIMPLE_CHOOSER_LIBS linker flags for SIMPLE_CHOOSER, overriding pkg-config - APPLET_CFLAGS - C compiler flags for APPLET, overriding pkg-config - APPLET_LIBS linker flags for APPLET, overriding pkg-config CHECK_CFLAGS C compiler flags for CHECK, overriding pkg-config CHECK_LIBS linker flags for CHECK, overriding pkg-config @@ -1850,7 +1843,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gdm configure 2.32.1 +gdm configure 3.0.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2394,7 +2387,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gdm $as_me 2.32.1, which was +It was created by gdm $as_me 3.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3212,7 +3205,7 @@ # Define the identity of the package. PACKAGE='gdm' - VERSION='2.32.1' + VERSION='3.0.0' cat >>confdefs.h <<_ACEOF @@ -8955,6 +8948,10 @@ $RM -r conftest* +## 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... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -17289,8 +17286,8 @@ DBUS_GLIB_REQUIRED_VERSION=0.74 -GLIB_REQUIRED_VERSION=2.22.0 -GTK_REQUIRED_VERSION=2.20.0 +GLIB_REQUIRED_VERSION=2.27.4 +GTK_REQUIRED_VERSION=2.91.1 PANGO_REQUIRED_VERSION=1.3.0 SCROLLKEEPER_REQUIRED_VERSION=0.1.4 GCONF_REQUIRED_VERSION=2.31.3 @@ -17300,6 +17297,7 @@ #FONTCONFIG_REQUIRED_VERSION=2.6.0 FONTCONFIG_REQUIRED_VERSION=2.5.0 UPOWER_REQUIRED_VERSION=0.9.0 +ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.5 @@ -17635,10 +17633,12 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= \$GLIB_REQUIRED_VERSION gio-2.0 >= \$GLIB_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -17646,6 +17646,7 @@ pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -17660,10 +17661,12 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= \$GLIB_REQUIRED_VERSION gio-2.0 >= \$GLIB_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -17671,6 +17674,7 @@ pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -17694,11 +17698,13 @@ DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION " 2>&1` else DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION " 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -17707,6 +17713,7 @@ as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION ) were not met: $DAEMON_PKG_ERRORS @@ -17946,12 +17953,12 @@ pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau\""; } >&5 - ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau xrandr\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xau xrandr") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null` + pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau xrandr" 2>/dev/null` else pkg_failed=yes fi @@ -17962,12 +17969,12 @@ pkg_cv_XLIB_LIBS="$XLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau\""; } >&5 - ($PKG_CONFIG --exists --print-errors "x11 xau") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xau xrandr\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11 xau xrandr") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null` + pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau xrandr" 2>/dev/null` else pkg_failed=yes fi @@ -17987,9 +17994,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xau" 2>&1` + XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xau xrandr" 2>&1` else - XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xau" 2>&1` + XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xau xrandr" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XLIB_PKG_ERRORS" >&5 @@ -18487,7 +18494,7 @@ if test "x$no_x" = xyes; then as_fn_error $? "\"no (requires X development libraries)\"" "$LINENO" 5 else - XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS" + XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext -lXrandr $X_EXTRA_LIBS" XLIB_CFLAGS=$X_CFLAGS fi elif test $pkg_failed = untried; then @@ -18986,7 +18993,7 @@ if test "x$no_x" = xyes; then as_fn_error $? "\"no (requires X development libraries)\"" "$LINENO" 5 else - XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS" + XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext -lXrandr $X_EXTRA_LIBS" XLIB_CFLAGS=$X_CFLAGS fi else @@ -19008,14 +19015,14 @@ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -19027,14 +19034,14 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION \""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -19055,16 +19062,16 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION " 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED_VERSION ) were not met: $GTK_PKG_ERRORS @@ -19111,14 +19118,14 @@ pkg_cv_CANBERRA_GTK_CFLAGS="$CANBERRA_GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED_VERSION \""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -19130,14 +19137,14 @@ pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk >= \$LIBCANBERRA_GTK_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra-gtk3 >= \$LIBCANBERRA_GTK_REQUIRED_VERSION \""; } >&5 - ($PKG_CONFIG --exists --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION " 2>/dev/null` else pkg_failed=yes @@ -19158,16 +19165,16 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION " 2>&1` else - CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + CANBERRA_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CANBERRA_GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + as_fn_error $? "Package requirements (libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION ) were not met: $CANBERRA_GTK_PKG_ERRORS @@ -19405,24 +19412,27 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gtk+-3.0 >= \$GTK_REQUIRED_VERSION gconf-2.0 >= \$GCONF_REQUIRED_VERSION fontconfig >= \$FONTCONFIG_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION x11 \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SIMPLE_GREETER_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 " 2>/dev/null` else @@ -19436,24 +19446,27 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gtk+-3.0 >= \$GTK_REQUIRED_VERSION gconf-2.0 >= \$GCONF_REQUIRED_VERSION fontconfig >= \$FONTCONFIG_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION x11 \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SIMPLE_GREETER_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 " 2>/dev/null` else @@ -19476,16 +19489,18 @@ fi if test $_pkg_short_errors_supported = yes; then SIMPLE_GREETER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 " 2>&1` else SIMPLE_GREETER_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 " 2>&1` fi @@ -19493,9 +19508,10 @@ echo "$SIMPLE_GREETER_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 ) were not met: @@ -19631,18 +19647,18 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gtk+-3.0 >= \$GTK_REQUIRED_VERSION gconf-2.0 >= \$GCONF_REQUIRED_VERSION \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SIMPLE_CHOOSER_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION " 2>/dev/null` else @@ -19656,18 +19672,18 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gtk+-3.0 >= \$GTK_REQUIRED_VERSION gconf-2.0 >= \$GCONF_REQUIRED_VERSION \""; } >&5 ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SIMPLE_CHOOSER_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION " 2>/dev/null` else @@ -19690,12 +19706,12 @@ fi if test $_pkg_short_errors_supported = yes; then SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION " 2>&1` else SIMPLE_CHOOSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION " 2>&1` fi @@ -19703,7 +19719,7 @@ echo "$SIMPLE_CHOOSER_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION ) were not met: @@ -19742,118 +19758,6 @@ - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5 -$as_echo_n "checking for APPLET... " >&6; } - -if test -n "$APPLET_CFLAGS"; then - pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= \$GNOME_PANEL_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$APPLET_LIBS"; then - pkg_cv_APPLET_LIBS="$APPLET_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= \$GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= \$GNOME_PANEL_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION" 2>&1` - else - APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$APPLET_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION) were not met: - -$APPLET_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 APPLET_CFLAGS -and APPLET_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 APPLET_CFLAGS -and APPLET_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 - APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS - APPLET_LIBS=$pkg_cv_APPLET_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version" @@ -24062,7 +23966,7 @@ #AC_SUBST(DEBIAN_DATESTAMP) #AC_SUBST(DEBIAN_DATE) -ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/simple-greeter/Makefile gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile gui/user-switch-applet/Makefile utils/Makefile data/gdm.conf data/Makefile data/faces/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile" +ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/simple-greeter/Makefile gui/simple-chooser/Makefile utils/Makefile data/gdm.conf data/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile" cat >confcache <<\_ACEOF @@ -24659,7 +24563,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gdm $as_me 2.32.1, which was +This file was extended by gdm $as_me 3.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24725,7 +24629,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gdm config.status 2.32.1 +gdm config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -25241,13 +25145,10 @@ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;; "gui/simple-greeter/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-greeter/Makefile" ;; - "gui/simple-greeter/libnotificationarea/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-greeter/libnotificationarea/Makefile" ;; "gui/simple-chooser/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-chooser/Makefile" ;; - "gui/user-switch-applet/Makefile") CONFIG_FILES="$CONFIG_FILES gui/user-switch-applet/Makefile" ;; "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; "data/gdm.conf") CONFIG_FILES="$CONFIG_FILES data/gdm.conf" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/faces/Makefile") CONFIG_FILES="$CONFIG_FILES data/faces/Makefile" ;; "data/greeter-autostart/Makefile") CONFIG_FILES="$CONFIG_FILES data/greeter-autostart/Makefile" ;; "data/greeter-autostart/at-spi-registryd-wrapper.desktop.in") CONFIG_FILES="$CONFIG_FILES data/greeter-autostart/at-spi-registryd-wrapper.desktop.in" ;; "data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;; diff -Nru gdm-2.32.1/configure.ac gdm-3.0.0/configure.ac --- gdm-2.32.1/configure.ac 2011-03-28 16:52:11.000000000 +0000 +++ gdm-3.0.0/configure.ac 2011-04-04 14:38:52.000000000 +0000 @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) AC_INIT([gdm], - [2.32.1], + [3.0.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm]) AC_CONFIG_SRCDIR([daemon/gdm-manager.c]) @@ -40,8 +40,8 @@ dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 -GLIB_REQUIRED_VERSION=2.22.0 -GTK_REQUIRED_VERSION=2.20.0 +GLIB_REQUIRED_VERSION=2.27.4 +GTK_REQUIRED_VERSION=2.91.1 PANGO_REQUIRED_VERSION=1.3.0 SCROLLKEEPER_REQUIRED_VERSION=0.1.4 GCONF_REQUIRED_VERSION=2.31.3 @@ -51,6 +51,7 @@ #FONTCONFIG_REQUIRED_VERSION=2.6.0 FONTCONFIG_REQUIRED_VERSION=2.5.0 UPOWER_REQUIRED_VERSION=0.9.0 +ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.5 EXTRA_COMPILE_WARNINGS(yes) @@ -70,29 +71,30 @@ dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION ) AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -PKG_CHECK_MODULES(XLIB, x11 xau, , +PKG_CHECK_MODULES(XLIB, x11 xau xrandr, , [AC_PATH_XTRA if test "x$no_x" = xyes; then AC_MSG_ERROR("no (requires X development libraries)") else - XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS" + XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext -lXrandr $X_EXTRA_LIBS" XLIB_CFLAGS=$X_CFLAGS fi]) AC_SUBST(XLIB_CFLAGS) AC_SUBST(XLIB_LIBS) PKG_CHECK_MODULES(GTK, - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION ) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) PKG_CHECK_MODULES(CANBERRA_GTK, - libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION + libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED_VERSION ) AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) @@ -120,9 +122,10 @@ PKG_CHECK_MODULES(SIMPLE_GREETER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION x11 ) SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm" @@ -143,19 +146,12 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION ) AC_SUBST(SIMPLE_CHOOSER_CFLAGS) AC_SUBST(SIMPLE_CHOOSER_LIBS) -PKG_CHECK_MODULES(APPLET, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION) -AC_SUBST(APPLET_CFLAGS) -AC_SUBST(APPLET_LIBS) - PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version" AC_SUBST(PLUGIN_LIBTOOL_FLAGS) @@ -1400,13 +1396,10 @@ docs/Makefile gui/Makefile gui/simple-greeter/Makefile -gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile -gui/user-switch-applet/Makefile utils/Makefile data/gdm.conf data/Makefile -data/faces/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile diff -Nru gdm-2.32.1/daemon/gdm-factory-slave.c gdm-3.0.0/daemon/gdm-factory-slave.c --- gdm-2.32.1/daemon/gdm-factory-slave.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-factory-slave.c 2011-04-04 14:37:16.000000000 +0000 @@ -438,14 +438,6 @@ } static void -on_greeter_layout_selected (GdmGreeterServer *greeter_server, - const char *text, - GdmFactorySlave *slave) -{ - gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); -} - -static void on_greeter_user_selected (GdmGreeterServer *greeter_server, const char *text, GdmFactorySlave *slave) @@ -538,10 +530,6 @@ G_CALLBACK (on_greeter_language_selected), slave); g_signal_connect (slave->priv->greeter_server, - "layout-selected", - G_CALLBACK (on_greeter_layout_selected), - slave); - g_signal_connect (slave->priv->greeter_server, "user-selected", G_CALLBACK (on_greeter_user_selected), slave); diff -Nru gdm-2.32.1/daemon/gdm-greeter-server.c gdm-3.0.0/daemon/gdm-greeter-server.c --- gdm-2.32.1/daemon/gdm-greeter-server.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-greeter-server.c 2011-04-04 14:37:16.000000000 +0000 @@ -77,7 +77,6 @@ SESSION_SELECTED, HOSTNAME_SELECTED, LANGUAGE_SELECTED, - LAYOUT_SELECTED, USER_SELECTED, CANCELLED, CONNECTED, @@ -275,13 +274,6 @@ } void -gdm_greeter_server_default_layout_name_changed (GdmGreeterServer *greeter_server, - const char *layout_name) -{ - send_dbus_string_signal (greeter_server, "DefaultLayoutNameChanged", layout_name); -} - -void gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server, const char *session_name) { @@ -512,33 +504,6 @@ } static DBusHandlerResult -handle_select_layout (GdmGreeterServer *greeter_server, - DBusConnection *connection, - DBusMessage *message) -{ - DBusMessage *reply; - DBusError error; - const char *text; - - dbus_error_init (&error); - if (! dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &text, - DBUS_TYPE_INVALID)) { - g_warning ("ERROR: %s", error.message); - } - - g_debug ("GreeterServer: SelectLayout: %s", text); - - reply = dbus_message_new_method_return (message); - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); - - g_signal_emit (greeter_server, signals [LAYOUT_SELECTED], 0, text); - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static DBusHandlerResult handle_select_user (GdmGreeterServer *greeter_server, DBusConnection *connection, DBusMessage *message) @@ -667,8 +632,6 @@ return handle_select_hostname (greeter_server, connection, message); } else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectLanguage")) { return handle_select_language (greeter_server, connection, message); - } else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectLayout")) { - return handle_select_layout (greeter_server, connection, message); } else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectUser")) { return handle_select_user (greeter_server, connection, message); } else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "Cancel")) { @@ -756,9 +719,6 @@ " \n" " \n" " \n" - " \n" - " \n" - " \n" " \n" " \n" " \n" @@ -1207,17 +1167,6 @@ G_TYPE_NONE, 1, G_TYPE_STRING); - signals [LAYOUT_SELECTED] = - g_signal_new ("layout-selected", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GdmGreeterServerClass, layout_selected), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, - G_TYPE_STRING); signals [USER_SELECTED] = g_signal_new ("user-selected", G_OBJECT_CLASS_TYPE (object_class), diff -Nru gdm-2.32.1/daemon/gdm-greeter-server.h gdm-3.0.0/daemon/gdm-greeter-server.h --- gdm-2.32.1/daemon/gdm-greeter-server.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-greeter-server.h 2011-04-04 14:37:16.000000000 +0000 @@ -57,8 +57,6 @@ const char *hostname); void (* language_selected) (GdmGreeterServer *greeter_server, const char *name); - void (* layout_selected) (GdmGreeterServer *greeter_server, - const char *name); void (* user_selected) (GdmGreeterServer *greeter_server, const char *name); void (* cancelled) (GdmGreeterServer *greeter_server); @@ -91,8 +89,6 @@ const char *text); void gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server, const char *text); -void gdm_greeter_server_default_layout_name_changed (GdmGreeterServer *greeter_server, - const char *text); void gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server, const char *text); diff -Nru gdm-2.32.1/daemon/gdm-greeter-session.c gdm-3.0.0/daemon/gdm-greeter-session.c --- gdm-2.32.1/daemon/gdm-greeter-session.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-greeter-session.c 2011-04-04 14:37:16.000000000 +0000 @@ -148,7 +148,7 @@ GObject *object; object = g_object_new (GDM_TYPE_GREETER_SESSION, - "command", BINDIR "/gnome-session --autostart="DATADIR"/gdm/autostart/LoginWindow/", + "command", BINDIR "/gnome-session --session gdm --autostart="DATADIR"/gdm/autostart/LoginWindow/", "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH, "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE, "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS", diff -Nru gdm-2.32.1/daemon/gdm-product-slave.c gdm-3.0.0/daemon/gdm-product-slave.c --- gdm-2.32.1/daemon/gdm-product-slave.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-product-slave.c 2011-04-04 14:37:16.000000000 +0000 @@ -773,28 +773,6 @@ } static void -on_relay_layout_selected (GdmProductSlave *slave, - DBusMessage *message) -{ - DBusError error; - const char *text; - dbus_bool_t res; - - dbus_error_init (&error); - res = dbus_message_get_args (message, - &error, - DBUS_TYPE_STRING, &text, - DBUS_TYPE_INVALID); - if (res) { - g_debug ("GdmProductSlave: Layout selected %s", text); - gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); - } else { - g_warning ("Unable to get arguments: %s", error.message); - dbus_error_free (&error); - } -} - -static void on_relay_user_selected (GdmProductSlave *slave, DBusMessage *message) { @@ -1018,8 +996,6 @@ on_relay_session_selected (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "LanguageSelected")) { on_relay_language_selected (slave, message); - } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "LayoutSelected")) { - on_relay_layout_selected (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "UserSelected")) { on_relay_user_selected (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "OpenSession")) { diff -Nru gdm-2.32.1/daemon/gdm-session.c gdm-3.0.0/daemon/gdm-session.c --- gdm-2.32.1/daemon/gdm-session.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session.c 2011-04-04 14:37:16.000000000 +0000 @@ -52,7 +52,6 @@ SESSION_DIED, SELECTED_USER_CHANGED, DEFAULT_LANGUAGE_NAME_CHANGED, - DEFAULT_LAYOUT_NAME_CHANGED, DEFAULT_SESSION_NAME_CHANGED, LAST_SIGNAL }; @@ -167,15 +166,6 @@ } void -gdm_session_select_layout (GdmSession *session, - const char *text) -{ - g_return_if_fail (GDM_IS_SESSION (session)); - - GDM_SESSION_GET_IFACE (session)->select_layout (session, text); -} - -void gdm_session_select_user (GdmSession *session, const char *text) { @@ -470,17 +460,6 @@ G_TYPE_NONE, 1, G_TYPE_STRING); - signals [DEFAULT_LAYOUT_NAME_CHANGED] = - g_signal_new ("default-layout-name-changed", - iface_type, - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GdmSessionIface, default_layout_name_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, - G_TYPE_STRING); signals [DEFAULT_SESSION_NAME_CHANGED] = g_signal_new ("default-session-name-changed", iface_type, @@ -677,15 +656,6 @@ } void -_gdm_session_default_layout_name_changed (GdmSession *session, - const char *layout_name) -{ - g_return_if_fail (GDM_IS_SESSION (session)); - - g_signal_emit (session, signals [DEFAULT_LAYOUT_NAME_CHANGED], 0, layout_name); -} - -void _gdm_session_default_session_name_changed (GdmSession *session, const char *session_name) { diff -Nru gdm-2.32.1/daemon/gdm-session-direct.c gdm-3.0.0/daemon/gdm-session-direct.c --- gdm-2.32.1/daemon/gdm-session-direct.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-direct.c 2011-04-04 14:37:16.000000000 +0000 @@ -74,8 +74,6 @@ char *saved_session; char *selected_language; char *saved_language; - char *selected_layout; - char *saved_layout; char *selected_user; char *user_x11_authority_file; @@ -613,49 +611,6 @@ return setlocale (LC_MESSAGES, NULL); } -static char * -get_system_default_layout (GdmSessionDirect *session) -{ - char *result = NULL; -#ifdef HAVE_LIBXKLAVIER - static XklEngine *engine = NULL; - - if (engine == NULL) { - Display *display = XOpenDisplay (session->priv->display_name); - if (display != NULL) { - engine = xkl_engine_get_instance (display); - } - /* do NOT call XCloseDisplay (display) here; - * xkl_engine_get_instance() is a singleton which saves the display */ - } - - if (engine != NULL) { - XklConfigRec *config = xkl_config_rec_new (); - if (xkl_config_rec_get_from_server (config, engine) && config->layouts && config->layouts[0]) { - if (config->variants && config->variants[0] && config->variants[0][0]) - result = g_strdup_printf("%s\t%s", config->layouts[0], config->variants[0]); - else - result = g_strdup (config->layouts[0]); - } - g_object_unref (config); - } -#endif - - if (!result) - result = g_strdup ("us"); - return result; -} - -static const char * -get_default_layout_name (GdmSessionDirect *session) -{ - if (!session->priv->saved_layout) { - session->priv->saved_layout = get_system_default_layout (session); - } - - return session->priv->saved_layout; -} - static const char * get_fallback_session_name (GdmSessionDirect *session_direct) { @@ -754,8 +709,6 @@ { _gdm_session_default_language_name_changed (GDM_SESSION (session), get_default_language_name (session)); - _gdm_session_default_layout_name_changed (GDM_SESSION (session), - get_default_layout_name (session)); _gdm_session_default_session_name_changed (GDM_SESSION (session), get_default_session_name (session)); } @@ -776,9 +729,6 @@ g_free (impl->priv->saved_language); impl->priv->saved_language = NULL; - - g_free (impl->priv->saved_layout); - impl->priv->saved_layout = NULL; } static DBusHandlerResult @@ -1185,39 +1135,6 @@ } static DBusHandlerResult -gdm_session_direct_handle_saved_layout_name_read (GdmSessionDirect *session, - DBusConnection *connection, - DBusMessage *message) -{ - DBusMessage *reply; - DBusError error; - const char *layout_name; - - dbus_error_init (&error); - if (! dbus_message_get_args (message, &error, - DBUS_TYPE_STRING, &layout_name, - DBUS_TYPE_INVALID)) { - g_warning ("ERROR: %s", error.message); - } - - reply = dbus_message_new_method_return (message); - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); - - if (strcmp (layout_name, - get_default_layout_name (session)) != 0) { - g_free (session->priv->saved_layout); - session->priv->saved_layout = g_strdup (layout_name); - - _gdm_session_default_layout_name_changed (GDM_SESSION (session), - layout_name); - } - - - return DBUS_HANDLER_RESULT_HANDLED; -} - -static DBusHandlerResult gdm_session_direct_handle_saved_session_name_read (GdmSessionDirect *session, DBusConnection *connection, DBusMessage *message) @@ -1310,8 +1227,6 @@ return gdm_session_direct_handle_session_died (session, connection, message); } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedLanguageNameRead")) { return gdm_session_direct_handle_saved_language_name_read (session, connection, message); - } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedLayoutNameRead")) { - return gdm_session_direct_handle_saved_layout_name_read (session, connection, message); } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedSessionNameRead")) { return gdm_session_direct_handle_saved_session_name_read (session, connection, message); } @@ -1999,16 +1914,6 @@ } static const char * -get_layout_name (GdmSessionDirect *session) -{ - if (session->priv->selected_layout != NULL) { - return session->priv->selected_layout; - } - - return get_default_layout_name (session); -} - -static const char * get_session_name (GdmSessionDirect *session) { /* FIXME: test the session names before we use them? */ @@ -2071,13 +1976,6 @@ "GDM_LANG", get_language_name (session)); - if (strcmp (get_layout_name (session), - get_default_layout_name (session)) == 0) { - gdm_session_direct_set_environment_variable (session, - "GDM_KEYBOARD_LAYOUT", - get_layout_name (session)); - } - gdm_session_direct_set_environment_variable (session, "DISPLAY", session->priv->display_name); @@ -2179,12 +2077,6 @@ g_free (impl->priv->saved_language); impl->priv->saved_language = NULL; - g_free (impl->priv->selected_layout); - impl->priv->selected_layout = NULL; - - g_free (impl->priv->saved_layout); - impl->priv->saved_layout = NULL; - g_free (impl->priv->user_x11_authority_file); impl->priv->user_x11_authority_file = NULL; @@ -2316,24 +2208,6 @@ } static void -gdm_session_direct_select_layout (GdmSession *session, - const char *text) -{ - GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); - - g_free (impl->priv->selected_layout); - - if (strcmp (text, "__previous") == 0) { - impl->priv->selected_layout = NULL; - } else { - impl->priv->selected_layout = g_strdup (text); - } - - send_dbus_string_signal (impl, "SetLayoutName", - get_layout_name (impl)); -} - -static void _gdm_session_direct_set_display_id (GdmSessionDirect *session, const char *id) { @@ -2525,8 +2399,6 @@ g_free (session->priv->saved_session); g_free (session->priv->selected_language); g_free (session->priv->saved_language); - g_free (session->priv->selected_layout); - g_free (session->priv->saved_layout); g_free (session->priv->fallback_session_name); @@ -2605,7 +2477,6 @@ iface->answer_query = gdm_session_direct_answer_query; iface->select_session = gdm_session_direct_select_session; iface->select_language = gdm_session_direct_select_language; - iface->select_layout = gdm_session_direct_select_layout; iface->select_user = gdm_session_direct_select_user; } diff -Nru gdm-2.32.1/daemon/gdm-session.h gdm-3.0.0/daemon/gdm-session.h --- gdm-2.32.1/daemon/gdm-session.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session.h 2011-04-04 14:37:16.000000000 +0000 @@ -61,8 +61,6 @@ const char *text); void (* select_language) (GdmSession *session, const char *text); - void (* select_layout) (GdmSession *session, - const char *text); void (* select_session) (GdmSession *session, const char *text); void (* select_user) (GdmSession *session, @@ -114,8 +112,6 @@ void (* default_language_name_changed) (GdmSession *session, const char *text); - void (* default_layout_name_changed) (GdmSession *session, - const char *text); void (* default_session_name_changed) (GdmSession *session, const char *text); }; @@ -143,8 +139,6 @@ const char *session_name); void gdm_session_select_language (GdmSession *session, const char *language); -void gdm_session_select_layout (GdmSession *session, - const char *language); void gdm_session_select_user (GdmSession *session, const char *username); void gdm_session_cancel (GdmSession *session); diff -Nru gdm-2.32.1/daemon/gdm-session-private.h gdm-3.0.0/daemon/gdm-session-private.h --- gdm-2.32.1/daemon/gdm-session-private.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-private.h 2011-04-04 14:37:16.000000000 +0000 @@ -59,8 +59,6 @@ /* user settings read from ~/.dmrc / system defaults */ void _gdm_session_default_language_name_changed (GdmSession *session, const char *language_name); -void _gdm_session_default_layout_name_changed (GdmSession *session, - const char *layout_name); void _gdm_session_default_session_name_changed (GdmSession *session, const char *session_name); /* user is selected/changed internally */ diff -Nru gdm-2.32.1/daemon/gdm-session-relay.c gdm-3.0.0/daemon/gdm-session-relay.c --- gdm-2.32.1/daemon/gdm-session-relay.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-relay.c 2011-04-04 14:37:16.000000000 +0000 @@ -274,14 +274,6 @@ } static void -gdm_session_relay_select_layout (GdmSession *session, - const char *text) -{ - GdmSessionRelay *impl = GDM_SESSION_RELAY (session); - send_dbus_string_signal (impl, "LayoutSelected", text); -} - -static void gdm_session_relay_select_user (GdmSession *session, const char *text) { @@ -884,9 +876,6 @@ " \n" " \n" " \n" - " \n" - " \n" - " \n" " \n" " \n" " \n" @@ -1182,7 +1171,6 @@ iface->answer_query = gdm_session_relay_answer_query; iface->select_session = gdm_session_relay_select_session; iface->select_language = gdm_session_relay_select_language; - iface->select_layout = gdm_session_relay_select_layout; iface->select_user = gdm_session_relay_select_user; } diff -Nru gdm-2.32.1/daemon/gdm-session-settings.c gdm-3.0.0/daemon/gdm-session-settings.c --- gdm-2.32.1/daemon/gdm-session-settings.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-settings.c 2011-04-04 14:37:16.000000000 +0000 @@ -32,11 +32,14 @@ #include #include +#include + struct _GdmSessionSettingsPrivate { + ActUserManager *user_manager; + ActUser *user; char *session_name; char *language_name; - char *layout_name; }; static void gdm_session_settings_finalize (GObject *object); @@ -56,7 +59,7 @@ PROP_0 = 0, PROP_SESSION_NAME, PROP_LANGUAGE_NAME, - PROP_LAYOUT_NAME, + PROP_IS_LOADED }; G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT) @@ -95,11 +98,10 @@ NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property (object_class, PROP_LANGUAGE_NAME, param_spec); - param_spec = g_param_spec_string ("layout-name", "Keyboard Layout Name", - "The name of the keyboard layout", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_LAYOUT_NAME, param_spec); + + param_spec = g_param_spec_boolean ("is-loaded", NULL, NULL, + FALSE, G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_IS_LOADED, param_spec); } static void @@ -109,6 +111,8 @@ GDM_TYPE_SESSION_SETTINGS, GdmSessionSettingsPrivate); + settings->priv->user_manager = act_user_manager_get_default (); + } static void @@ -119,9 +123,12 @@ settings = GDM_SESSION_SETTINGS (object); + if (settings->priv->user != NULL) { + g_object_unref (settings->priv->user); + } + g_free (settings->priv->session_name); g_free (settings->priv->language_name); - g_free (settings->priv->layout_name); parent_class = G_OBJECT_CLASS (gdm_session_settings_parent_class); @@ -144,19 +151,6 @@ } void -gdm_session_settings_set_layout_name (GdmSessionSettings *settings, - const char *layout_name) -{ - g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings)); - - if (settings->priv->layout_name == NULL || - strcmp (settings->priv->layout_name, layout_name) != 0) { - settings->priv->layout_name = g_strdup (layout_name); - g_object_notify (G_OBJECT (settings), "layout-name"); - } -} - -void gdm_session_settings_set_session_name (GdmSessionSettings *settings, const char *session_name) { @@ -177,13 +171,6 @@ } char * -gdm_session_settings_get_layout_name (GdmSessionSettings *settings) -{ - g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), NULL); - return g_strdup (settings->priv->layout_name); -} - -char * gdm_session_settings_get_session_name (GdmSessionSettings *settings) { g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), NULL); @@ -205,10 +192,6 @@ gdm_session_settings_set_language_name (settings, g_value_get_string (value)); break; - case PROP_LAYOUT_NAME: - gdm_session_settings_set_layout_name (settings, g_value_get_string (value)); - break; - case PROP_SESSION_NAME: gdm_session_settings_set_session_name (settings, g_value_get_string (value)); break; @@ -237,8 +220,8 @@ g_value_set_string (value, settings->priv->language_name); break; - case PROP_LAYOUT_NAME: - g_value_set_string (value, settings->priv->layout_name); + case PROP_IS_LOADED: + g_value_set_boolean (value, gdm_session_settings_is_loaded (settings)); break; default: @@ -260,149 +243,121 @@ gboolean gdm_session_settings_is_loaded (GdmSessionSettings *settings) { - return settings->priv->session_name != NULL || - settings->priv->language_name != NULL || - settings->priv->layout_name != NULL; + if (settings->priv->user == NULL) { + return FALSE; + } + + return act_user_is_loaded (settings->priv->user); } -gboolean -gdm_session_settings_load (GdmSessionSettings *settings, - const char *username, - GError **error) +static void +load_settings_from_user (GdmSessionSettings *settings) { - GKeyFile *key_file; - GError *load_error; - gboolean is_loaded; - char *session_name; - char *language_name; - char *layout_name; - char *filename; - - g_return_val_if_fail (settings != NULL, FALSE); - g_return_val_if_fail (username != NULL, FALSE); - g_return_val_if_fail (!gdm_session_settings_is_loaded (settings), FALSE); - - filename = g_build_filename (GDM_CACHE_DIR, username, "dmrc", NULL); - - is_loaded = FALSE; - key_file = g_key_file_new (); + const char *session_name; + const char *language_name; - load_error = NULL; - if (!g_key_file_load_from_file (key_file, filename, - G_KEY_FILE_NONE, &load_error)) { - g_propagate_error (error, load_error); - goto out; + if (!act_user_is_loaded (settings->priv->user)) { + g_warning ("GdmSessionSettings: trying to load user settings from unloaded user"); + return; } - session_name = g_key_file_get_string (key_file, "Desktop", "Session", - &load_error); + session_name = act_user_get_x_session (settings->priv->user); + g_debug ("GdmSessionSettings: saved session is %s", session_name); if (session_name != NULL) { gdm_session_settings_set_session_name (settings, session_name); - g_free (session_name); - } else if (g_error_matches (load_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { - g_error_free (load_error); - load_error = NULL; - } else { - g_propagate_error (error, load_error); - goto out; } - language_name = g_key_file_get_string (key_file, "Desktop", "Language", - &load_error); + language_name = act_user_get_language (settings->priv->user); + g_debug ("GdmSessionSettings: saved language is %s", language_name); if (language_name != NULL) { gdm_session_settings_set_language_name (settings, language_name); - g_free (language_name); - } else if (g_error_matches (load_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { - g_error_free (load_error); - load_error = NULL; - } else { - g_propagate_error (error, load_error); - goto out; } - layout_name = g_key_file_get_string (key_file, "Desktop", "Layout", - &load_error); + g_object_notify (G_OBJECT (settings), "is-loaded"); +} + +static void +on_user_is_loaded_changed (ActUser *user, + GParamSpec *pspec, + GdmSessionSettings *settings) +{ + if (act_user_is_loaded (settings->priv->user)) { + load_settings_from_user (settings); + g_signal_handlers_disconnect_by_func (G_OBJECT (settings->priv->user), + G_CALLBACK (on_user_is_loaded_changed), + settings); + } +} + +gboolean +gdm_session_settings_load (GdmSessionSettings *settings, + const char *username) +{ + ActUser *old_user; + + g_return_val_if_fail (settings != NULL, FALSE); + g_return_val_if_fail (username != NULL, FALSE); + g_return_val_if_fail (!gdm_session_settings_is_loaded (settings), FALSE); + + if (settings->priv->user != NULL) { + old_user = settings->priv->user; - if (layout_name != NULL) { - gdm_session_settings_set_layout_name (settings, layout_name); - g_free (layout_name); - } else if (g_error_matches (load_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) { - g_error_free (load_error); - load_error = NULL; + g_signal_handlers_disconnect_by_func (G_OBJECT (settings->priv->user), + G_CALLBACK (on_user_is_loaded_changed), + settings); } else { - g_propagate_error (error, load_error); - goto out; + old_user = NULL; } - is_loaded = TRUE; -out: - g_key_file_free (key_file); - g_free (filename); + settings->priv->user = act_user_manager_get_user (settings->priv->user_manager, + username); + if (old_user != NULL) { + g_object_unref (old_user); + old_user = NULL; + } + + if (!act_user_is_loaded (settings->priv->user)) { + g_signal_connect (settings->priv->user, + "notify::is-loaded", + G_CALLBACK (on_user_is_loaded_changed), + settings); + return FALSE; + } + + load_settings_from_user (settings); - return is_loaded; + return TRUE; } gboolean gdm_session_settings_save (GdmSessionSettings *settings, - const char *home_directory, - GError **error) + const char *username) { - GKeyFile *key_file; - GError *file_error; - gboolean is_saved; - char *filename; - gsize length; - gchar *contents; + ActUser *user; g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), FALSE); - g_return_val_if_fail (home_directory != NULL, FALSE); + g_return_val_if_fail (username != NULL, FALSE); g_return_val_if_fail (gdm_session_settings_is_loaded (settings), FALSE); - filename = g_build_filename (home_directory, ".dmrc", NULL); - is_saved = FALSE; - key_file = g_key_file_new (); + user = act_user_manager_get_user (settings->priv->user_manager, + username); - file_error = NULL; - g_key_file_load_from_file (key_file, filename, - G_KEY_FILE_KEEP_COMMENTS | - G_KEY_FILE_KEEP_TRANSLATIONS, - NULL); - if (settings->priv->session_name != NULL) { - g_key_file_set_string (key_file, "Desktop", "Session", - settings->priv->session_name); + if (!act_user_is_loaded (user)) { + g_object_unref (user); + return FALSE; } - if (settings->priv->language_name != NULL) { - g_key_file_set_string (key_file, "Desktop", "Language", - settings->priv->language_name); - } - - if (settings->priv->layout_name != NULL) { - g_key_file_set_string (key_file, "Desktop", "Layout", - settings->priv->layout_name); - } - - contents = g_key_file_to_data (key_file, &length, &file_error); - - if (contents == NULL) { - g_propagate_error (error, file_error); - goto out; + if (settings->priv->session_name != NULL) { + act_user_set_x_session (user, settings->priv->session_name); } - if (!g_file_set_contents (filename, contents, length, &file_error)) { - g_free (contents); - g_propagate_error (error, file_error); - goto out; + if (settings->priv->language_name != NULL) { + act_user_set_language (user, settings->priv->language_name); } - g_free (contents); - - is_saved = TRUE; -out: - g_key_file_free (key_file); - g_free (filename); + g_object_unref (user); - return is_saved; + return TRUE; } diff -Nru gdm-2.32.1/daemon/gdm-session-settings.h gdm-3.0.0/daemon/gdm-session-settings.h --- gdm-2.32.1/daemon/gdm-session-settings.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-settings.h 2011-04-04 14:37:16.000000000 +0000 @@ -54,19 +54,14 @@ GdmSessionSettings *gdm_session_settings_new (void); gboolean gdm_session_settings_load (GdmSessionSettings *settings, - const char *username, - GError **error); + const char *username); gboolean gdm_session_settings_save (GdmSessionSettings *settings, - const char *home_directory, - GError **error); + const char *username); gboolean gdm_session_settings_is_loaded (GdmSessionSettings *settings); char *gdm_session_settings_get_language_name (GdmSessionSettings *settings); -char *gdm_session_settings_get_layout_name (GdmSessionSettings *settings); char *gdm_session_settings_get_session_name (GdmSessionSettings *settings); void gdm_session_settings_set_language_name (GdmSessionSettings *settings, const char *language_name); -void gdm_session_settings_set_layout_name (GdmSessionSettings *settings, - const char *layout_name); void gdm_session_settings_set_session_name (GdmSessionSettings *settings, const char *session_name); diff -Nru gdm-2.32.1/daemon/gdm-session-worker.c gdm-3.0.0/daemon/gdm-session-worker.c --- gdm-2.32.1/daemon/gdm-session-worker.c 2011-03-28 16:51:12.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-worker.c 2011-04-04 14:37:16.000000000 +0000 @@ -49,6 +49,7 @@ #include "ck-connector.h" #include "gdm-common.h" +#include "gdm-log.h" #include "gdm-session-worker.h" #include "gdm-marshal.h" @@ -92,6 +93,7 @@ GDM_SESSION_WORKER_STATE_AUTHENTICATED, GDM_SESSION_WORKER_STATE_AUTHORIZED, GDM_SESSION_WORKER_STATE_ACCREDITED, + GDM_SESSION_WORKER_STATE_ACCOUNT_DETAILS_SAVED, GDM_SESSION_WORKER_STATE_SESSION_OPENED, GDM_SESSION_WORKER_STATE_SESSION_STARTED, GDM_SESSION_WORKER_STATE_REAUTHENTICATED, @@ -125,7 +127,6 @@ int cred_flags; char **arguments; - GHashTable *environment; guint32 cancelled : 1; guint32 timed_out : 1; guint state_change_idle_id; @@ -591,9 +592,9 @@ attempt_to_load_user_settings (GdmSessionWorker *worker, const char *username) { + g_debug ("GdmSessionWorker: attempting to load user settings"); gdm_session_settings_load (worker->priv->user_settings, - username, - NULL); + username); } static void @@ -945,219 +946,6 @@ worker->priv->auditor = NULL; } -static gboolean -check_user_copy_file (const char *srcfile, - const char *destfile, - uid_t user, - gssize max_file_size) -{ - struct stat srcfileinfo; - struct stat destfileinfo; - - if (max_file_size < 0) { - max_file_size = G_MAXSIZE; - } - - /* Exists/Readable? */ - if (g_stat (srcfile, &srcfileinfo) < 0) { - g_debug ("File does not exist"); - return FALSE; - } - - /* Is newer than the file already in the cache? */ - if (destfile != NULL && g_stat (destfile, &destfileinfo) == 0) { - if (srcfileinfo.st_mtime <= destfileinfo.st_mtime) { - g_debug ("Destination file is newer"); - return FALSE; - } - } - - /* Is a regular file */ - if (G_UNLIKELY (!S_ISREG (srcfileinfo.st_mode))) { - g_debug ("File is not a regular file"); - return FALSE; - } - - /* Owned by user? */ - if (G_UNLIKELY (srcfileinfo.st_uid != user)) { - g_debug ("File is not owned by user"); - return FALSE; - } - - /* Size is kosher? */ - if (G_UNLIKELY (srcfileinfo.st_size > max_file_size)) { - g_debug ("File is too large"); - return FALSE; - } - - return TRUE; -} - -static gboolean -gdm_cache_copy_file (GdmSessionWorker *worker, - const char *userfilename, - const char *cachefilename) -{ - gboolean res; - - g_debug ("GdmSessionWorker: Checking if %s should be copied to cache %s", - userfilename, cachefilename); - - res = check_user_copy_file (userfilename, - cachefilename, - worker->priv->uid, - MAX_FILE_SIZE); - - if (res) { - GFile *src_file; - GFile *dst_file; - GError *error; - - src_file = g_file_new_for_path (userfilename); - dst_file = g_file_new_for_path (cachefilename); - - error = NULL; - res = g_file_copy (src_file, - dst_file, - G_FILE_COPY_OVERWRITE | - G_FILE_COPY_NOFOLLOW_SYMLINKS, - NULL, - NULL, - NULL, - &error); - - if (! res) { - g_warning ("Could not copy file to cache: %s", - error->message); - g_error_free (error); - } else { - g_debug ("Copy successful"); - } - - g_object_unref (src_file); - g_object_unref (dst_file); - } else { - g_debug ("Not copying file %s to cache", - userfilename); - } - return res; -} - -static char * -gdm_session_worker_create_cachedir (GdmSessionWorker *worker) -{ - struct stat statbuf; - char *cachedir; - int r; - - cachedir = g_build_filename (GDM_CACHE_DIR, - worker->priv->username, - NULL); - - /* Verify user cache directory exists, create if needed */ - r = g_stat (cachedir, &statbuf); - if (r < 0) { - g_debug ("Making user cache directory %s", cachedir); - g_mkdir (cachedir, - S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); - g_chmod (cachedir, - S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); - } - r = chown (cachedir, worker->priv->uid, worker->priv->gid); - if (r == -1) { - g_warning ("GdmSessionWorker: Error setting owner of cache directory: %s", - g_strerror (errno)); - } - - return cachedir; -} - -static void -gdm_session_worker_cache_userfiles (GdmSessionWorker *worker) -{ - struct passwd *passwd_entry; - char *cachedir; - char *cachefile; - char *userfile; - gboolean res; - - gdm_get_pwent_for_name (worker->priv->username, &passwd_entry); - if (passwd_entry == NULL) - return; - - cachedir = gdm_session_worker_create_cachedir (worker); - - g_debug ("Copying user dmrc file to cache"); - cachefile = g_build_filename (cachedir, "dmrc", NULL); - userfile = g_build_filename (passwd_entry->pw_dir, ".dmrc", NULL); - - gdm_cache_copy_file (worker, userfile, cachefile); - g_free (cachefile); - g_free (userfile); - - g_debug ("Copying user face file to cache"); - cachefile = g_build_filename (cachedir, - "face", - NULL); - - /* First, try "~/.face" */ - userfile = g_build_filename (passwd_entry->pw_dir, ".face", NULL); - res = gdm_cache_copy_file (worker, userfile, cachefile); - - /* Next, try "~/.face.icon" */ - if (!res) { - g_free (userfile); - userfile = g_build_filename (passwd_entry->pw_dir, - ".face.icon", - NULL); - res = gdm_cache_copy_file (worker, - userfile, - cachefile); - } - - /* Still nothing, try the user's personal GDM config */ - if (!res) { - char *tempfilename; - - tempfilename = g_build_filename (passwd_entry->pw_dir, - ".gnome", - "gdm", - NULL); - - g_debug ("Checking user's ~/.gnome/gdm file"); - res = check_user_copy_file (tempfilename, - NULL, - worker->priv->uid, - MAX_FILE_SIZE); - if (res) { - GKeyFile *keyfile; - - g_free (userfile); - - keyfile = g_key_file_new (); - g_key_file_load_from_file (keyfile, - userfile, - G_KEY_FILE_NONE, - NULL); - - userfile = g_key_file_get_string (keyfile, - "face", - "picture", - NULL); - res = gdm_cache_copy_file (worker, - userfile, - cachefile); - - g_key_file_free (keyfile); - } - g_free (tempfilename); - } - - g_free (cachedir); - g_free (cachefile); - g_free (userfile); -} - static void gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker, int status) @@ -1168,23 +956,6 @@ return; if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) { - pid_t pid; - - pid = fork (); - - if (pid == 0) { - if (setuid (worker->priv->uid) < 0) { - g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno)); - _exit (1); - } - - gdm_session_worker_cache_userfiles (worker); - _exit (0); - } - - if (pid > 0) { - gdm_wait_on_pid (pid); - } pam_close_session (worker->priv->pam_handle, 0); gdm_session_auditor_report_logout (worker->priv->auditor); } else { @@ -1291,8 +1062,8 @@ */ g_set_error (error, GDM_SESSION_WORKER_ERROR, - GDM_SESSION_WORKER_ERROR_AUTHENTICATING, - _("error initiating conversation with authentication system: %s"), + GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE, + _("error initiating conversation with authentication system - %s"), error_code == PAM_ABORT? _("general failure") : error_code == PAM_BUF_ERR? _("out of memory") : error_code == PAM_SYSTEM_ERR? _("application programmer error") : @@ -1403,7 +1174,15 @@ /* blocking call, does the actual conversation */ error_code = pam_authenticate (worker->priv->pam_handle, authentication_flags); - if (error_code != PAM_SUCCESS) { + if (error_code == PAM_AUTHINFO_UNAVAIL) { + g_debug ("GdmSessionWorker: authentication service unavailable"); + + g_set_error (error, + GDM_SESSION_WORKER_ERROR, + GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE, + "%s", pam_strerror (worker->priv->pam_handle, error_code)); + goto out; + } else if (error_code != PAM_SUCCESS) { g_debug ("GdmSessionWorker: authentication returned %d: %s", error_code, pam_strerror (worker->priv->pam_handle, error_code)); /* @@ -1492,15 +1271,32 @@ const char *key, const char *value) { - /* FIXME: maybe we should use use pam_putenv instead of our - * own hash table, so pam can override our choices if it knows - * better? - * - * See https://bugzilla.gnome.org/show_bug.cgi?id=627530 - */ - g_hash_table_replace (worker->priv->environment, - g_strdup (key), - g_strdup (value)); + int error_code; + char *environment_entry; + + if (value != NULL) { + environment_entry = g_strdup_printf ("%s=%s", key, value); + } else { + /* empty value means "remove from environment" */ + environment_entry = g_strdup (key); + } + + error_code = pam_putenv (worker->priv->pam_handle, + environment_entry); + + if (error_code != PAM_SUCCESS) { + g_warning ("cannot put %s in pam environment: %s\n", + environment_entry, + pam_strerror (worker->priv->pam_handle, error_code)); + } + g_free (environment_entry); +} + +static char * +gdm_session_worker_get_environment_variable (GdmSessionWorker *worker, + const char *key) +{ + return g_strdup (pam_getenv (worker->priv->pam_handle, key)); } static void @@ -1519,9 +1315,9 @@ static gboolean gdm_session_worker_environment_variable_is_set (GdmSessionWorker *worker, - const char *name) + const char *key) { - return g_hash_table_lookup (worker->priv->environment, name) != NULL; + return pam_getenv (worker->priv->pam_handle, key) != NULL; } static gboolean @@ -1739,58 +1535,10 @@ return ret; } -static void -gdm_session_worker_update_environment_from_pam (GdmSessionWorker *worker) -{ - char **environment; - gsize i; - - environment = pam_getenvlist (worker->priv->pam_handle); - - for (i = 0; environment[i] != NULL; i++) { - char **key_and_value; - - key_and_value = g_strsplit (environment[i], "=", 2); - - gdm_session_worker_set_environment_variable (worker, key_and_value[0], key_and_value[1]); - - g_strfreev (key_and_value); - } - - for (i = 0; environment[i]; i++) { - free (environment[i]); - } - - free (environment); -} - -static void -gdm_session_worker_fill_environment_array (const char *key, - const char *value, - GPtrArray *environment) -{ - char *variable; - - if (value == NULL) - return; - - variable = g_strdup_printf ("%s=%s", key, value); - - g_ptr_array_add (environment, variable); -} - static char ** gdm_session_worker_get_environment (GdmSessionWorker *worker) { - GPtrArray *environment; - - environment = g_ptr_array_new (); - g_hash_table_foreach (worker->priv->environment, - (GHFunc) gdm_session_worker_fill_environment_array, - environment); - g_ptr_array_add (environment, NULL); - - return (char **) g_ptr_array_free (environment, FALSE); + return pam_getenvlist (worker->priv->pam_handle); } static void @@ -1934,32 +1682,6 @@ return fd; } -static void -_save_user_settings (GdmSessionWorker *worker, - const char *home_dir) -{ - GError *error; - - if (!gdm_session_settings_is_loaded (worker->priv->user_settings)) { - /* - * Even if the user did not change the defaults, there may - * be files to cache - */ - goto out; - } - - error = NULL; - if (!gdm_session_settings_save (worker->priv->user_settings, - home_dir, &error)) { - g_warning ("could not save session and language settings: %s", - error->message); - g_error_free (error); - } - -out: - gdm_session_worker_cache_userfiles (worker); -} - static gboolean gdm_session_worker_start_user_session (GdmSessionWorker *worker, GError **error) @@ -1968,9 +1690,6 @@ pid_t session_pid; int error_code; - g_debug ("GdmSessionWorker: querying pam for user environment"); - gdm_session_worker_update_environment_from_pam (worker); - register_ck_session (worker); gdm_get_pwent_for_name (worker->priv->username, &passwd_entry); @@ -1992,14 +1711,9 @@ if (session_pid == 0) { char **environment; - char *cachedirname; char *home_dir; int fd; - /* Make sure cachedir gets created before we drop to user */ - cachedirname = gdm_session_worker_create_cachedir (worker); - g_free (cachedirname); - if (setuid (worker->priv->uid) < 0) { g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno)); _exit (1); @@ -2015,12 +1729,11 @@ g_assert (geteuid () == getuid ()); - home_dir = g_hash_table_lookup (worker->priv->environment, - "HOME"); - + home_dir = gdm_session_worker_get_environment_variable (worker, "HOME"); if ((home_dir == NULL) || g_chdir (home_dir) < 0) { g_chdir ("/"); } + g_free (home_dir); fd = open ("/dev/null", O_RDWR); dup2 (fd, STDIN_FILENO); @@ -2031,17 +1744,24 @@ dup2 (fd, STDERR_FILENO); close (fd); - _save_user_settings (worker, home_dir); + gdm_log_shutdown (); + + /* + * Reset SIGPIPE to default so that any process in the user + * session get the default SIGPIPE behavior instead of ignoring + * SIGPIPE. + */ + signal (SIGPIPE, SIG_DFL); gdm_session_execute (worker->priv->arguments[0], worker->priv->arguments, environment, TRUE); + gdm_log_init (); g_debug ("GdmSessionWorker: child '%s' could not be started: %s", worker->priv->arguments[0], g_strerror (errno)); - g_strfreev (environment); _exit (127); } @@ -2071,7 +1791,7 @@ { int error_code; - g_assert (worker->priv->state == GDM_SESSION_WORKER_STATE_ACCREDITED); + g_assert (worker->priv->state == GDM_SESSION_WORKER_STATE_ACCOUNT_DETAILS_SAVED); g_assert (geteuid () == 0); error_code = pam_open_session (worker->priv->pam_handle, 0); @@ -2209,14 +1929,6 @@ } static void -gdm_session_worker_set_layout_name (GdmSessionWorker *worker, - const char *layout_name) -{ - gdm_session_settings_set_layout_name (worker->priv->user_settings, - layout_name); -} - -static void on_set_language_name (GdmSessionWorker *worker, DBusMessage *message) { @@ -2239,33 +1951,13 @@ } static void -on_set_layout_name (GdmSessionWorker *worker, - DBusMessage *message) -{ - DBusError error; - const char *layout_name; - dbus_bool_t res; - - dbus_error_init (&error); - res = dbus_message_get_args (message, - &error, - DBUS_TYPE_STRING, &layout_name, - DBUS_TYPE_INVALID); - if (res) { - g_debug ("GdmSessionWorker: layout name set to %s", layout_name); - gdm_session_worker_set_layout_name (worker, layout_name); - } else { - g_warning ("Unable to get arguments: %s", error.message); - dbus_error_free (&error); - } -} - -static void on_saved_language_name_read (GdmSessionWorker *worker) { char *language_name; language_name = gdm_session_settings_get_language_name (worker->priv->user_settings); + + g_debug ("GdmSessionWorker: Saved language is %s", language_name); send_dbus_string_method (worker->priv->connection, "SavedLanguageNameRead", language_name); @@ -2273,23 +1965,13 @@ } static void -on_saved_layout_name_read (GdmSessionWorker *worker) -{ - char *layout_name; - - layout_name = gdm_session_settings_get_layout_name (worker->priv->user_settings); - send_dbus_string_method (worker->priv->connection, - "SavedLayoutNameRead", - layout_name); - g_free (layout_name); -} - -static void on_saved_session_name_read (GdmSessionWorker *worker) { char *session_name; session_name = gdm_session_settings_get_session_name (worker->priv->user_settings); + + g_debug ("GdmSessionWorker: Saved session is %s", session_name); send_dbus_string_method (worker->priv->connection, "SavedSessionNameRead", session_name); @@ -2302,38 +1984,6 @@ GError *error; gboolean res; - worker->priv->user_settings = gdm_session_settings_new (); - - g_signal_connect_swapped (worker->priv->user_settings, - "notify::language-name", - G_CALLBACK (on_saved_language_name_read), - worker); - - g_signal_connect_swapped (worker->priv->user_settings, - "notify::layout-name", - G_CALLBACK (on_saved_layout_name_read), - worker); - - g_signal_connect_swapped (worker->priv->user_settings, - "notify::session-name", - G_CALLBACK (on_saved_session_name_read), - worker); - - /* In some setups the user can read ~/.dmrc at this point. - * In some other setups the user can only read ~/.dmrc after completing - * the pam conversation. - * - * The user experience is better if we can read .dmrc now since we can - * prefill in the language and session combo boxes in the greeter with - * the right values. - * - * We'll try now, and if it doesn't work out, try later. - */ - if (worker->priv->username != NULL) { - attempt_to_load_user_settings (worker, - worker->priv->username); - } - error = NULL; res = gdm_session_worker_initialize_pam (worker, worker->priv->service, @@ -2430,6 +2080,64 @@ } static void +save_account_details_now (GdmSessionWorker *worker) +{ + g_assert (worker->priv->state == GDM_SESSION_WORKER_STATE_ACCREDITED); + + g_debug ("GdmSessionWorker: saving account details for user %s", worker->priv->username); + worker->priv->state = GDM_SESSION_WORKER_STATE_ACCOUNT_DETAILS_SAVED; + if (!gdm_session_settings_save (worker->priv->user_settings, + worker->priv->username)) { + g_warning ("could not save session and language settings"); + } + queue_state_change (worker); +} + +static void +on_settings_is_loaded_changed (GdmSessionSettings *user_settings, + GParamSpec *pspec, + GdmSessionWorker *worker) +{ + if (!gdm_session_settings_is_loaded (worker->priv->user_settings)) { + return; + } + + if (worker->priv->state == GDM_SESSION_WORKER_STATE_NONE) { + g_debug ("GdmSessionWorker: queuing setup for user: %s %s", + worker->priv->username, worker->priv->display_device); + queue_state_change (worker); + } else if (worker->priv->state == GDM_SESSION_WORKER_STATE_ACCREDITED) { + save_account_details_now (worker); + } else { + return; + } + + g_signal_handlers_disconnect_by_func (G_OBJECT (worker->priv->user_settings), + G_CALLBACK (on_settings_is_loaded_changed), + worker); +} + +static void +do_save_account_details_when_ready (GdmSessionWorker *worker) +{ + g_assert (worker->priv->state == GDM_SESSION_WORKER_STATE_ACCREDITED); + + if (!gdm_session_settings_is_loaded (worker->priv->user_settings)) { + g_signal_connect (G_OBJECT (worker->priv->user_settings), + "notify::is-loaded", + G_CALLBACK (on_settings_is_loaded_changed), + worker); + g_debug ("GdmSessionWorker: user %s, not fully loaded yet, will save account details later", + worker->priv->username); + gdm_session_settings_load (worker->priv->user_settings, + worker->priv->username); + return; + } + + save_account_details_now (worker); +} + +static void do_open_session (GdmSessionWorker *worker) { GError *error; @@ -2492,6 +2200,9 @@ case GDM_SESSION_WORKER_STATE_ACCREDITED: name = "ACCREDITED"; break; + case GDM_SESSION_WORKER_STATE_ACCOUNT_DETAILS_SAVED: + name = "ACCOUNT_DETAILS_SAVED"; + break; case GDM_SESSION_WORKER_STATE_SESSION_OPENED: name = "SESSION_OPENED"; break; @@ -2530,6 +2241,9 @@ case GDM_SESSION_WORKER_STATE_ACCREDITED: do_accredit (worker); break; + case GDM_SESSION_WORKER_STATE_ACCOUNT_DETAILS_SAVED: + do_save_account_details_when_ready (worker); + break; case GDM_SESSION_WORKER_STATE_SESSION_OPENED: do_open_session (worker); break; @@ -2673,8 +2387,27 @@ worker->priv->hostname = g_strdup (hostname); worker->priv->username = g_strdup (username); - g_debug ("GdmSessionWorker: queuing setup for user: %s %s", service, console); - queue_state_change (worker); + g_signal_connect_swapped (worker->priv->user_settings, + "notify::language-name", + G_CALLBACK (on_saved_language_name_read), + worker); + + g_signal_connect_swapped (worker->priv->user_settings, + "notify::session-name", + G_CALLBACK (on_saved_session_name_read), + worker); + + /* Load settings from accounts daemon before continuing + * FIXME: need to handle username not loading + */ + if (gdm_session_settings_load (worker->priv->user_settings, username)) { + queue_state_change (worker); + } else { + g_signal_connect (G_OBJECT (worker->priv->user_settings), + "notify::is-loaded", + G_CALLBACK (on_settings_is_loaded_changed), + worker); + } } else { g_warning ("Unable to get arguments: %s", error.message); dbus_error_free (&error); @@ -2817,8 +2550,6 @@ on_set_environment_variable (worker, message); } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetLanguageName")) { on_set_language_name (worker, message); - } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetLayoutName")) { - on_set_layout_name (worker, message); } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) { on_set_session_name (worker, message); } else { @@ -2925,10 +2656,8 @@ { worker->priv = GDM_SESSION_WORKER_GET_PRIVATE (worker); - worker->priv->environment = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_free); + + worker->priv->user_settings = gdm_session_settings_new (); } static void @@ -2956,6 +2685,7 @@ gdm_session_worker_unwatch_child (worker); + g_object_unref (worker->priv->user_settings); g_free (worker->priv->service); g_free (worker->priv->x11_display_name); g_free (worker->priv->x11_authority_file); @@ -2964,9 +2694,6 @@ g_free (worker->priv->username); g_free (worker->priv->server_address); g_strfreev (worker->priv->arguments); - if (worker->priv->environment != NULL) { - g_hash_table_destroy (worker->priv->environment); - } G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object); } diff -Nru gdm-2.32.1/daemon/gdm-session-worker.h gdm-3.0.0/daemon/gdm-session-worker.h --- gdm-2.32.1/daemon/gdm-session-worker.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-session-worker.h 2011-04-04 14:37:16.000000000 +0000 @@ -41,6 +41,7 @@ GDM_SESSION_WORKER_ERROR_OPENING_MESSAGE_PIPE, GDM_SESSION_WORKER_ERROR_COMMUNICATING, GDM_SESSION_WORKER_ERROR_WORKER_DIED, + GDM_SESSION_WORKER_ERROR_SERVICE_UNAVAILABLE, GDM_SESSION_WORKER_ERROR_AUTHENTICATING, GDM_SESSION_WORKER_ERROR_AUTHORIZING, GDM_SESSION_WORKER_ERROR_OPENING_LOG_FILE, diff -Nru gdm-2.32.1/daemon/gdm-simple-slave.c gdm-3.0.0/daemon/gdm-simple-slave.c --- gdm-2.32.1/daemon/gdm-simple-slave.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-simple-slave.c 2011-04-04 14:37:16.000000000 +0000 @@ -104,6 +104,7 @@ G_DEFINE_TYPE (GdmSimpleSlave, gdm_simple_slave, GDM_TYPE_SLAVE) static void create_new_session (GdmSimpleSlave *slave); +static void destroy_session (GdmSimpleSlave *slave); static void start_greeter (GdmSimpleSlave *slave); static void @@ -238,16 +239,6 @@ } static void -destroy_session (GdmSimpleSlave *slave) -{ - if (slave->priv->session != NULL) { - gdm_session_close (GDM_SESSION (slave->priv->session)); - g_object_unref (slave->priv->session); - slave->priv->session = NULL; - } -} - -static void reset_session (GdmSimpleSlave *slave) { destroy_session (slave); @@ -684,18 +675,6 @@ } static void -on_default_layout_name_changed (GdmSession *session, - const char *text, - GdmSimpleSlave *slave) -{ - g_debug ("GdmSimpleSlave: Default layout name changed: %s", text); - - if (slave->priv->greeter_server != NULL) { - gdm_greeter_server_default_layout_name_changed (slave->priv->greeter_server, text); - } -} - -static void on_default_session_name_changed (GdmSession *session, const char *text, GdmSimpleSlave *slave) @@ -840,17 +819,101 @@ slave); g_signal_connect (slave->priv->session, - "default-layout-name-changed", - G_CALLBACK (on_default_layout_name_changed), - slave); - - g_signal_connect (slave->priv->session, "default-session-name-changed", G_CALLBACK (on_default_session_name_changed), slave); } static void +destroy_session (GdmSimpleSlave *slave) +{ + if (slave->priv->session == NULL) { + return; + } + + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_conversation_started), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_setup_complete), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_setup_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_reset_complete), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_reset_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_authenticated), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_authentication_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_authorized), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_authorization_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_accredited), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_accreditation_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_opened), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_open_failed), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_info), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_problem), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_info_query), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_secret_info_query), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_started), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_exited), + slave); + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_died), + slave); +#if 0 + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_closed), + slave); +#endif + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_session_selected_user_changed), + slave); + + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_default_language_name_changed), + slave); + + g_signal_handlers_disconnect_by_func (slave->priv->session, + G_CALLBACK (on_default_session_name_changed), + slave); + + gdm_session_close (GDM_SESSION (slave->priv->session)); + g_object_unref (slave->priv->session); + slave->priv->session = NULL; +} + +static void on_greeter_session_start (GdmGreeterSession *greeter, GdmSimpleSlave *slave) { @@ -898,6 +961,9 @@ GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), "gdm-autologin", username); @@ -909,6 +975,9 @@ GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin verification"); + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), "gdm", username); @@ -919,6 +988,9 @@ const char *text, GdmSimpleSlave *slave) { + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_answer_query (GDM_SESSION (slave->priv->session), text); } @@ -927,6 +999,9 @@ const char *text, GdmSimpleSlave *slave) { + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_select_session (GDM_SESSION (slave->priv->session), text); } @@ -935,18 +1010,13 @@ const char *text, GdmSimpleSlave *slave) { + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_select_language (GDM_SESSION (slave->priv->session), text); } static void -on_greeter_layout_selected (GdmGreeterServer *greeter_server, - const char *text, - GdmSimpleSlave *slave) -{ - gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); -} - -static void on_greeter_user_selected (GdmGreeterServer *greeter_server, const char *text, GdmSimpleSlave *slave) @@ -969,6 +1039,9 @@ gboolean display_is_local; g_debug ("GdmSimpleSlave: Greeter connected"); + if (slave->priv->greeter_reset_id > 0) { + return; + } gdm_session_start_conversation (GDM_SESSION (slave->priv->session)); @@ -983,10 +1056,30 @@ } static void +on_greeter_disconnected (GdmGreeterServer *greeter_server, + GdmSimpleSlave *slave) +{ + gboolean display_is_local; + + g_debug ("GdmSimpleSlave: Greeter disconnected"); + + g_object_get (slave, + "display-is-local", &display_is_local, + NULL); + + if ( ! display_is_local) { + gdm_slave_stopped (GDM_SLAVE (slave)); + } +} + +static void on_start_session_when_ready (GdmGreeterServer *session, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Will start session when ready"); + if (slave->priv->greeter_reset_id > 0) { + return; + } slave->priv->start_session_when_ready = TRUE; if (slave->priv->waiting_to_start_session) { @@ -999,12 +1092,18 @@ GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Will start session when ready and told"); + if (slave->priv->greeter_reset_id > 0) { + return; + } slave->priv->start_session_when_ready = FALSE; } static void setup_server (GdmSimpleSlave *slave) { + /* Put cursor out of the way on first head */ + gdm_slave_set_initial_cursor_position (GDM_SLAVE (slave)); + /* Set the busy cursor */ gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); } @@ -1087,10 +1186,6 @@ G_CALLBACK (on_greeter_language_selected), slave); g_signal_connect (slave->priv->greeter_server, - "layout-selected", - G_CALLBACK (on_greeter_layout_selected), - slave); - g_signal_connect (slave->priv->greeter_server, "user-selected", G_CALLBACK (on_greeter_user_selected), slave); @@ -1099,6 +1194,10 @@ G_CALLBACK (on_greeter_connected), slave); g_signal_connect (slave->priv->greeter_server, + "disconnected", + G_CALLBACK (on_greeter_disconnected), + slave); + g_signal_connect (slave->priv->greeter_server, "cancelled", G_CALLBACK (on_greeter_cancel), slave); diff -Nru gdm-2.32.1/daemon/gdm-slave.c gdm-3.0.0/daemon/gdm-slave.c --- gdm-2.32.1/daemon/gdm-slave.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-slave.c 2011-04-04 14:37:16.000000000 +0000 @@ -44,6 +44,7 @@ #include /* for Display */ #include /* for watch cursor */ +#include #include #include "gdm-common.h" @@ -354,6 +355,85 @@ return ret; } +static void +determine_initial_cursor_position (GdmSlave *slave, + int *x, + int *y) +{ + XRRScreenResources *resources; + RROutput primary_output; + int i; + + /* If this function fails for whatever reason, + * put the pointer in the upper left corner of the + * first monitor + */ + *x = 0; + *y = 0; + + gdm_error_trap_push (); + resources = XRRGetScreenResources (slave->priv->server_display, + DefaultRootWindow (slave->priv->server_display)); + primary_output = XRRGetOutputPrimary (slave->priv->server_display, + DefaultRootWindow (slave->priv->server_display)); + gdm_error_trap_pop (); + + if (resources == NULL) { + return; + } + + for (i = 0; i < resources->noutput; i++) { + XRROutputInfo *output_info; + + if (primary_output == None) { + primary_output = resources->outputs[0]; + } + + if (resources->outputs[i] != primary_output) { + continue; + } + + output_info = XRRGetOutputInfo (slave->priv->server_display, + resources, + resources->outputs[i]); + + if (output_info->connection != RR_Disconnected && + output_info->crtc != 0) { + XRRCrtcInfo *crtc_info; + + crtc_info = XRRGetCrtcInfo (slave->priv->server_display, + resources, + output_info->crtc); + /* position it sort of in the lower right + */ + *x = crtc_info->x + .9 * crtc_info->width; + *y = crtc_info->y + .9 * crtc_info->height; + XRRFreeCrtcInfo (crtc_info); + } + + XRRFreeOutputInfo (output_info); + break; + } + + XRRFreeScreenResources (resources); +} + +void +gdm_slave_set_initial_cursor_position (GdmSlave *slave) +{ + if (slave->priv->server_display != NULL) { + int x, y; + + determine_initial_cursor_position (slave, &x, &y); + XWarpPointer(slave->priv->server_display, + None, + DefaultRootWindow (slave->priv->server_display), + 0, 0, + 0, 0, + x, y); + } +} + void gdm_slave_set_busy_cursor (GdmSlave *slave) { diff -Nru gdm-2.32.1/daemon/gdm-slave.h gdm-3.0.0/daemon/gdm-slave.h --- gdm-2.32.1/daemon/gdm-slave.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-slave.h 2011-04-04 14:37:16.000000000 +0000 @@ -73,6 +73,9 @@ const char *username); gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave); + +void gdm_slave_set_initial_cursor_position (GdmSlave *slave); + void gdm_slave_set_busy_cursor (GdmSlave *slave); gboolean gdm_slave_run_script (GdmSlave *slave, const char *dir, diff -Nru gdm-2.32.1/daemon/gdm-static-display.c gdm-3.0.0/daemon/gdm-static-display.c --- gdm-2.32.1/daemon/gdm-static-display.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-static-display.c 2011-01-15 02:20:13.000000000 +0000 @@ -45,7 +45,7 @@ struct GdmStaticDisplayPrivate { - gboolean enable_timed_login; + gboolean first_login; }; enum { @@ -121,6 +121,8 @@ { g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE; + GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->unmanage (display); return TRUE; @@ -158,12 +160,14 @@ char **usernamep, int *delayp) { - if (GDM_STATIC_DISPLAY (display)->priv->enable_timed_login) { - GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); - } else { - *enabledp = FALSE; - *usernamep = g_strdup (""); - *delayp = 0; + GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp); + + if (!GDM_STATIC_DISPLAY (display)->priv->first_login) { + /* if this is autologin but not timed login, then disable + * autologin after the first one */ + if (*enabledp && *delayp == 0) { + *enabledp = FALSE; + } } } @@ -196,7 +200,7 @@ static_display->priv = GDM_STATIC_DISPLAY_GET_PRIVATE (static_display); - static_display->priv->enable_timed_login = TRUE; + static_display->priv->first_login = TRUE; } static void diff -Nru gdm-2.32.1/daemon/gdm-welcome-session.c gdm-3.0.0/daemon/gdm-welcome-session.c --- gdm-2.32.1/daemon/gdm-welcome-session.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/daemon/gdm-welcome-session.c 2011-01-15 02:20:13.000000000 +0000 @@ -439,6 +439,7 @@ g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH"))); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1")); + g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm")); g_hash_table_foreach (hash, (GHFunc)listify_hash, env); g_hash_table_destroy (hash); diff -Nru gdm-2.32.1/daemon/Makefile.in gdm-3.0.0/daemon/Makefile.in --- gdm-2.32.1/daemon/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/daemon/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -55,8 +55,11 @@ subdir = daemon DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -265,8 +268,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/dconf-override-db and /tmp/z8gFCzoRtS/gdm-3.0.0/data/dconf-override-db differ diff -Nru gdm-2.32.1/data/dconf-profile gdm-3.0.0/data/dconf-profile --- gdm-2.32.1/data/dconf-profile 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/data/dconf-profile 2011-01-15 02:20:13.000000000 +0000 @@ -0,0 +1,2 @@ +user +gdm Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/astronaut.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/astronaut.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/baseball.png and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/baseball.png differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/butterfly.png and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/butterfly.png differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/cat-eye.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/cat-eye.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/chess.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/chess.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/coffee.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/coffee.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/dice.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/dice.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/energy-arc.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/energy-arc.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/fish.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/fish.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/flake.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/flake.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/flower.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/flower.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/grapes.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/grapes.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/guitar.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/guitar.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/launch.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/launch.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/leaf.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/leaf.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/lightning.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/lightning.jpg differ diff -Nru gdm-2.32.1/data/faces/Makefile.am gdm-3.0.0/data/faces/Makefile.am --- gdm-2.32.1/data/faces/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/faces/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ - -imagedir = $(datadir)/pixmaps/faces - -image_DATA = \ - astronaut.jpg \ - baseball.png \ - butterfly.png \ - cat-eye.jpg \ - chess.jpg \ - coffee.jpg \ - dice.jpg \ - energy-arc.jpg \ - fish.jpg \ - flake.jpg \ - flower.jpg \ - grapes.jpg \ - guitar.jpg \ - launch.jpg \ - leaf.jpg \ - lightning.jpg \ - penguin.jpg \ - puppy.jpg \ - sky.jpg \ - soccerball.png \ - sunflower.jpg \ - sunset.jpg \ - tennis-ball.png \ - yellow-rose.jpg - -EXTRA_DIST = \ - $(image_DATA) - diff -Nru gdm-2.32.1/data/faces/Makefile.in gdm-3.0.0/data/faces/Makefile.in --- gdm-2.32.1/data/faces/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/faces/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,567 +0,0 @@ -# Makefile.in generated by automake 1.11.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. -# 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@ -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@ -subdir = data/faces -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -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__installdirs = "$(DESTDIR)$(imagedir)" -DATA = $(image_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ -AR = @AR@ -AT_BINDIR = @AT_BINDIR@ -AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BINDIR = @BINDIR@ -CANBERRA_GTK_CFLAGS = @CANBERRA_GTK_CFLAGS@ -CANBERRA_GTK_LIBS = @CANBERRA_GTK_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ -CHECK_LIBS = @CHECK_LIBS@ -COMMON_CFLAGS = @COMMON_CFLAGS@ -COMMON_LIBS = @COMMON_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DAEMON_CFLAGS = @DAEMON_CFLAGS@ -DAEMON_LIBS = @DAEMON_LIBS@ -DATADIR = @DATADIR@ -DATADIRNAME = @DATADIRNAME@ -DBUS_SYS_DIR = @DBUS_SYS_DIR@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ -EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ -EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ -EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ -EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ -EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ -EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ -EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@ -EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@ -FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GDMCHOOSER = @GDMCHOOSER@ -GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ -GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ -GDM_GROUPNAME = @GDM_GROUPNAME@ -GDM_OLD_CONF = @GDM_OLD_CONF@ -GDM_PID_FILE = @GDM_PID_FILE@ -GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@ -GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@ -GDM_USERNAME = @GDM_USERNAME@ -GDM_WORKING_DIR = @GDM_WORKING_DIR@ -GDM_XAUTH_DIR = @GDM_XAUTH_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@ -HAVE_PAM = @HAVE_PAM@ -HELP_DIR = @HELP_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@ -LANG_CONFIG_FILE = @LANG_CONFIG_FILE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDIR = @LIBDIR@ -LIBEXECDIR = @LIBEXECDIR@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWRAP_LIBS = @LIBWRAP_LIBS@ -LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@ -LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOCALSTATEDIR = @LOCALSTATEDIR@ -LTLIBOBJS = @LTLIBOBJS@ -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@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -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@ -PAM_LIBS = @PAM_LIBS@ -PAM_PREFIX = @PAM_PREFIX@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -RBAC_LIBS = @RBAC_LIBS@ -SBINDIR = @SBINDIR@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ -SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ -SIMPLE_GREETER_CFLAGS = @SIMPLE_GREETER_CFLAGS@ -SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LIBS@ -SOUND_PROGRAM = @SOUND_PROGRAM@ -STRIP = @STRIP@ -SYSCONFDIR = @SYSCONFDIR@ -UPOWER = @UPOWER@ -UPOWER_CFLAGS = @UPOWER_CFLAGS@ -UPOWER_LIBS = @UPOWER_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@ -XDMCP_LIBS = @XDMCP_LIBS@ -XEVIE_OPTION = @XEVIE_OPTION@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XLIB_CFLAGS = @XLIB_CFLAGS@ -XLIB_LIBS = @XLIB_LIBS@ -XMKMF = @XMKMF@ -XSESSION_SHELL = @XSESSION_SHELL@ -X_CFLAGS = @X_CFLAGS@ -X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PATH = @X_PATH@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_SERVER = @X_SERVER@ -X_SERVER_PATH = @X_SERVER_PATH@ -X_XNEST_CMD = @X_XNEST_CMD@ -X_XNEST_CONFIG_OPTIONS = @X_XNEST_CONFIG_OPTIONS@ -X_XNEST_UNSCALED_FONTPATH = @X_XNEST_UNSCALED_FONTPATH@ -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_CXX = @ac_ct_CXX@ -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@ -authdir = @authdir@ -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@ -dmconfdir = @dmconfdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gdmconfdir = @gdmconfdir@ -gdmlocaledir = @gdmlocaledir@ -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@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -logdir = @logdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pixmapdir = @pixmapdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -sysconfsubdir = @sysconfsubdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -imagedir = $(datadir)/pixmaps/faces -image_DATA = \ - astronaut.jpg \ - baseball.png \ - butterfly.png \ - cat-eye.jpg \ - chess.jpg \ - coffee.jpg \ - dice.jpg \ - energy-arc.jpg \ - fish.jpg \ - flake.jpg \ - flower.jpg \ - grapes.jpg \ - guitar.jpg \ - launch.jpg \ - leaf.jpg \ - lightning.jpg \ - penguin.jpg \ - puppy.jpg \ - sky.jpg \ - soccerball.png \ - sunflower.jpg \ - sunset.jpg \ - tennis-ball.png \ - yellow-rose.jpg - -EXTRA_DIST = \ - $(image_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 data/faces/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/faces/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-imageDATA: $(image_DATA) - @$(NORMAL_INSTALL) - test -z "$(imagedir)" || $(MKDIR_P) "$(DESTDIR)$(imagedir)" - @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagedir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(imagedir)" || exit $$?; \ - done - -uninstall-imageDATA: - @$(NORMAL_UNINSTALL) - @list='$(image_DATA)'; test -n "$(imagedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(imagedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(imagedir)" && rm -f $$files -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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)$(imagedir)"; 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: - $(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 -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-imageDATA - -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-imageDATA - -.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-imageDATA 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-imageDATA - - -# 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/kn7Me_oaqq/gdm-2.32.1/data/faces/penguin.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/penguin.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/puppy.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/puppy.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/sky.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/sky.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/soccerball.png and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/soccerball.png differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/sunflower.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/sunflower.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/sunset.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/sunset.jpg differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/tennis-ball.png and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/tennis-ball.png differ Binary files /tmp/kn7Me_oaqq/gdm-2.32.1/data/faces/yellow-rose.jpg and /tmp/z8gFCzoRtS/gdm-3.0.0/data/faces/yellow-rose.jpg differ diff -Nru gdm-2.32.1/data/gdm.schemas gdm-3.0.0/data/gdm.schemas --- gdm-2.32.1/data/gdm.schemas 2011-03-28 16:57:45.000000000 +0000 +++ gdm-3.0.0/data/gdm.schemas 2011-04-04 14:39:46.000000000 +0000 @@ -124,7 +124,7 @@ xdmcp/Willing s - /etc/gdm/Xwilling + /usr/local/etc/gdm/Xwilling diff -Nru gdm-2.32.1/data/gdm.schemas.in gdm-3.0.0/data/gdm.schemas.in --- gdm-2.32.1/data/gdm.schemas.in 2011-03-07 17:43:18.000000000 +0000 +++ gdm-3.0.0/data/gdm.schemas.in 2011-04-04 14:39:46.000000000 +0000 @@ -124,7 +124,7 @@ xdmcp/Willing s - /etc/gdm/Xwilling + /usr/local/etc/gdm/Xwilling diff -Nru gdm-2.32.1/data/gdm.session gdm-3.0.0/data/gdm.session --- gdm-2.32.1/data/gdm.session 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/data/gdm.session 2011-04-04 14:37:16.000000000 +0000 @@ -0,0 +1,5 @@ +[GNOME Session] +Name=Display Manager +RequiredComponents=gdm-simple-greeter;gnome-settings-daemon;polkit-gnome-authentication-agent-1; +RequiredProviders=windowmanager; +DefaultProvider-windowmanager=metacity diff -Nru gdm-2.32.1/data/greeter-autostart/gdm-simple-greeter.desktop.in gdm-3.0.0/data/greeter-autostart/gdm-simple-greeter.desktop.in --- gdm-2.32.1/data/greeter-autostart/gdm-simple-greeter.desktop.in 2011-03-28 16:57:45.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/gdm-simple-greeter.desktop.in 2011-04-04 14:39:45.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application _Name=Login Window -Exec=/usr/libexec/gdm-simple-greeter +Exec=/usr/local/libexec/gdm-simple-greeter OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Application X-GNOME-Autostart-Notify=true diff -Nru gdm-2.32.1/data/greeter-autostart/gnome-session-check-accelerated.desktop.in gdm-3.0.0/data/greeter-autostart/gnome-session-check-accelerated.desktop.in --- gdm-2.32.1/data/greeter-autostart/gnome-session-check-accelerated.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/gnome-session-check-accelerated.desktop.in 2011-04-04 14:39:46.000000000 +0000 @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +_Name=GNOME Session Acceleration Checker +TryExec=/usr/local/libexec/gnome-session-check-accelerated +Exec=/usr/local/libexec/gnome-session-check-accelerated +X-GNOME-Autostart-Phase=Application diff -Nru gdm-2.32.1/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in gdm-3.0.0/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in --- gdm-2.32.1/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in 2011-04-04 14:37:16.000000000 +0000 @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +_Name=GNOME Session Acceleration Checker +TryExec=@LIBEXECDIR@/gnome-session-check-accelerated +Exec=@LIBEXECDIR@/gnome-session-check-accelerated +X-GNOME-Autostart-Phase=Application diff -Nru gdm-2.32.1/data/greeter-autostart/gnome-settings-daemon.desktop.in gdm-3.0.0/data/greeter-autostart/gnome-settings-daemon.desktop.in --- gdm-2.32.1/data/greeter-autostart/gnome-settings-daemon.desktop.in 2011-03-28 16:57:46.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/gnome-settings-daemon.desktop.in 2011-04-04 14:39:45.000000000 +0000 @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application _Name=GNOME Settings Daemon -TryExec=/usr/libexec/gnome-settings-daemon -Exec=/usr/libexec/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins +TryExec=/usr/local/libexec/gnome-settings-daemon +Exec=/usr/local/libexec/gnome-settings-daemon OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true diff -Nru gdm-2.32.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-3.0.0/data/greeter-autostart/gnome-settings-daemon.desktop.in.in --- gdm-2.32.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-04-04 14:37:16.000000000 +0000 @@ -2,7 +2,7 @@ Type=Application _Name=GNOME Settings Daemon TryExec=@LIBEXECDIR@/gnome-settings-daemon -Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins +Exec=@LIBEXECDIR@/gnome-settings-daemon OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true diff -Nru gdm-2.32.1/data/greeter-autostart/Makefile.am gdm-3.0.0/data/greeter-autostart/Makefile.am --- gdm-2.32.1/data/greeter-autostart/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/Makefile.am 2011-04-04 14:37:16.000000000 +0000 @@ -22,6 +22,7 @@ metacity.desktop.in \ orca-screen-reader.desktop.in \ polkit-gnome-authentication-agent-1.desktop.in \ + gnome-session-check-accelerated.desktop.in \ $(NULL) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -31,6 +32,7 @@ gnome-power-manager.desktop.in.in \ gnome-settings-daemon.desktop.in.in \ polkit-gnome-authentication-agent-1.desktop.in.in \ + gnome-session-check-accelerated.desktop.in.in \ $(desktop_in_files) \ $(NULL) @@ -41,6 +43,7 @@ gnome-power-manager.desktop.in \ gnome-settings-daemon.desktop.in \ polkit-gnome-authentication-agent-1.desktop.in \ + gnome-session-check-accelerated.desktop.in \ $(NULL) MAINTAINERCLEANFILES = \ diff -Nru gdm-2.32.1/data/greeter-autostart/Makefile.in gdm-3.0.0/data/greeter-autostart/Makefile.in --- gdm-2.32.1/data/greeter-autostart/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -38,8 +38,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/at-spi-registryd-wrapper.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -82,8 +85,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ @@ -343,6 +344,7 @@ metacity.desktop.in \ orca-screen-reader.desktop.in \ polkit-gnome-authentication-agent-1.desktop.in \ + gnome-session-check-accelerated.desktop.in \ $(NULL) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -352,6 +354,7 @@ gnome-power-manager.desktop.in.in \ gnome-settings-daemon.desktop.in.in \ polkit-gnome-authentication-agent-1.desktop.in.in \ + gnome-session-check-accelerated.desktop.in.in \ $(desktop_in_files) \ $(NULL) @@ -362,6 +365,7 @@ gnome-power-manager.desktop.in \ gnome-settings-daemon.desktop.in \ polkit-gnome-authentication-agent-1.desktop.in \ + gnome-session-check-accelerated.desktop.in \ $(NULL) MAINTAINERCLEANFILES = \ diff -Nru gdm-2.32.1/data/greeter-autostart/orca-screen-reader.desktop.in gdm-3.0.0/data/greeter-autostart/orca-screen-reader.desktop.in --- gdm-2.32.1/data/greeter-autostart/orca-screen-reader.desktop.in 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/orca-screen-reader.desktop.in 2011-01-15 02:20:13.000000000 +0000 @@ -2,7 +2,7 @@ _Name=Orca Screen Reader _Comment=Present on-screen information as speech or braille TryExec=orca -Exec=orca --no-setup --disable main-window --disable splash-window --disable magnifier --enable speech +Exec=orca --no-setup --disable main-window --disable splash-window --disable magnifier --enable speech --enable braille Icon=orca Terminal=false Type=Application diff -Nru gdm-2.32.1/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in gdm-3.0.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in --- gdm-2.32.1/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2011-03-28 16:57:46.000000000 +0000 +++ gdm-3.0.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2011-04-04 14:39:46.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] Type=Application _Name=PolicyKit Authentication Agent -Exec=/usr/libexec/polkit-gnome-authentication-agent-1 +Exec=/usr/local/libexec/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; diff -Nru gdm-2.32.1/data/make-dconf-override-db.sh gdm-3.0.0/data/make-dconf-override-db.sh --- gdm-2.32.1/data/make-dconf-override-db.sh 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/data/make-dconf-override-db.sh 2011-04-04 14:37:16.000000000 +0000 @@ -0,0 +1,56 @@ +#!/bin/bash + +set -e + +export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD") +eval `dbus-launch --sh-syntax` + +trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR + +gsettings set org.gnome.power-manager show-actions false + +gsettings set org.gnome.desktop.a11y.keyboard enable true +gsettings set org.gnome.desktop.background show-desktop-icons false +gsettings set org.gnome.desktop.default-applications.terminal exec '"/bin/true"' +gsettings set org.gnome.desktop.interface toolkit-accessibility true + +gsettings set org.gnome.desktop.lockdown disable-application-handlers true +gsettings set org.gnome.desktop.lockdown disable-command-line true +gsettings set org.gnome.desktop.lockdown disable-lock-screen true +gsettings set org.gnome.desktop.lockdown disable-print-setup true +gsettings set org.gnome.desktop.lockdown disable-printing true +gsettings set org.gnome.desktop.lockdown disable-save-to-disk true + +gsettings set org.gnome.desktop.sound event-sounds true + +gsettings set org.gnome.settings-daemon.plugins.media-keys eject '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys calculator '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys email '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys help '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys home '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys media '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys next '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys pause '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys play '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys previous '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys screensaver '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys search '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys stop '""' +gsettings set org.gnome.settings-daemon.plugins.media-keys www '""' + +gsettings list-schemas | egrep '^org\.gnome\.settings-daemon\.plugins\.' | while read schema; do + gsettings set $schema active false +done + +gsettings set org.gnome.settings-daemon.plugins.a11y-keyboard active true +gsettings set org.gnome.settings-daemon.plugins.background active true +gsettings set org.gnome.settings-daemon.plugins.media-keys active true +gsettings set org.gnome.settings-daemon.plugins.power active true +gsettings set org.gnome.settings-daemon.plugins.sound active true +gsettings set org.gnome.settings-daemon.plugins.xrandr active true +gsettings set org.gnome.settings-daemon.plugins.xsettings active true + +mv $XDG_CONFIG_HOME/dconf/user dconf-override-db +rm -rf $XDG_CONFIG_HOME + +kill $DBUS_SESSION_BUS_PID diff -Nru gdm-2.32.1/data/Makefile.am gdm-3.0.0/data/Makefile.am --- gdm-2.32.1/data/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/Makefile.am 2011-04-04 14:37:16.000000000 +0000 @@ -1,7 +1,6 @@ NULL = SUBDIRS = \ - faces \ greeter-autostart \ pixmaps \ $(NULL) @@ -78,6 +77,9 @@ localealiasdir = $(datadir)/gdm localealias_DATA = locale.alias +sessiondir = $(datadir)/gnome-session/sessions +dist_session_DATA = gdm.session + EXTRA_DIST = \ $(schemas_in_files) \ $(schemas_DATA) \ @@ -94,6 +96,8 @@ PostLogin \ gconf.path \ session-setup.entries \ + make-dconf-override-db.sh \ + dconf-profile \ $(NULL) CLEANFILES = \ @@ -102,17 +106,25 @@ Init \ PreSession \ PostSession \ + dconf-override-db \ $(NULL) DISTCLEANFILES = \ $(dbusconf_DATA) \ gdm.schemas \ + dconf-override-db \ $(NULL) MAINTAINERCLEANFILES = \ *~ \ + dconf-override-db \ Makefile.in +dconf-override-db: $(srcdir)/make-dconf-override-db.sh + $(srcdir)/make-dconf-override-db.sh + +dist-hook: $(srcdir)/dconf-override-db + cp $(srcdir)/dconf-override-db $(distdir) uninstall-hook: rm -f \ @@ -125,12 +137,19 @@ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \ $(DESTDIR)$(workingdir)/.gconf.path \ + $(DESTDIR)$(sysconfdir)/dconf/db/gdm \ + $(DESTDIR)$(sysconfdir)/dconf/profile/gdm \ -rf \ $(DESTDIR)$(workingdir)/.gconf.mandatory \ + $(DESTDIR)$(workingdir)/.config/dconf \ $(DESTDIR)$(screenshotdir) \ $(DESTDIR)$(xauthdir) -install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path + -rmdir \ + $(DESTDIR)$(sysconfdir)/dconf/db \ + $(DESTDIR)$(sysconfdir)/dconf + +install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path dconf-override-db if test '!' -d $(DESTDIR)$(gdmconfdir); then \ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ @@ -222,6 +241,24 @@ chown root:gdm $(DESTDIR)$(workingdir) || : ; \ fi + if test '!' -d $(DESTDIR)$(workingdir)/.config/dconf; then \ + $(mkinstalldirs) $(DESTDIR)$(workingdir)/.config/dconf; \ + chmod 0755 $(DESTDIR)$(workingdir)/.config/dconf; \ + chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \ + fi + + if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/profile; then \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/profile; \ + chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/profile; \ + chown root:root $(DESTDIR)$(sysconfdir)/dconf/profile || : ; \ + fi + + if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db; then \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db; \ + chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db; \ + chown root:root $(DESTDIR)$(sysconfdir)/dconf/db || : ; \ + fi + if test '!' -d $(DESTDIR)$(cachedir); then \ $(mkinstalldirs) $(DESTDIR)$(cachedir); \ chmod 1755 $(DESTDIR)$(cachedir); \ @@ -235,4 +272,6 @@ chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml + $(INSTALL_DATA) $(srcdir)/dconf-override-db $(DESTDIR)$(sysconfdir)/dconf/db/gdm + $(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm diff -Nru gdm-2.32.1/data/Makefile.in gdm-3.0.0/data/Makefile.in --- gdm-2.32.1/data/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -35,11 +35,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gdm.conf.in +DIST_COMMON = $(dist_session_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gdm.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -82,9 +85,10 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(dbusconfdir)" \ +am__installdirs = "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(sessiondir)" \ "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)" -DATA = $(dbusconf_DATA) $(localealias_DATA) $(schemas_DATA) +DATA = $(dbusconf_DATA) $(dist_session_DATA) $(localealias_DATA) \ + $(schemas_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -123,8 +127,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ @@ -367,7 +369,6 @@ top_srcdir = @top_srcdir@ NULL = SUBDIRS = \ - faces \ greeter-autostart \ pixmaps \ $(NULL) @@ -388,6 +389,8 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) localealiasdir = $(datadir)/gdm localealias_DATA = locale.alias +sessiondir = $(datadir)/gnome-session/sessions +dist_session_DATA = gdm.session EXTRA_DIST = \ $(schemas_in_files) \ $(schemas_DATA) \ @@ -404,6 +407,8 @@ PostLogin \ gconf.path \ session-setup.entries \ + make-dconf-override-db.sh \ + dconf-profile \ $(NULL) CLEANFILES = \ @@ -412,15 +417,18 @@ Init \ PreSession \ PostSession \ + dconf-override-db \ $(NULL) DISTCLEANFILES = \ $(dbusconf_DATA) \ gdm.schemas \ + dconf-override-db \ $(NULL) MAINTAINERCLEANFILES = \ *~ \ + dconf-override-db \ Makefile.in all: all-recursive @@ -484,6 +492,26 @@ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(dbusconfdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(dbusconfdir)" && rm -f $$files +install-dist_sessionDATA: $(dist_session_DATA) + @$(NORMAL_INSTALL) + test -z "$(sessiondir)" || $(MKDIR_P) "$(DESTDIR)$(sessiondir)" + @list='$(dist_session_DATA)'; test -n "$(sessiondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sessiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(sessiondir)" || exit $$?; \ + done + +uninstall-dist_sessionDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_session_DATA)'; test -n "$(sessiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(sessiondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(sessiondir)" && rm -f $$files install-localealiasDATA: $(localealias_DATA) @$(NORMAL_INSTALL) test -z "$(localealiasdir)" || $(MKDIR_P) "$(DESTDIR)$(localealiasdir)" @@ -718,12 +746,15 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"; do \ + for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -774,8 +805,8 @@ info-am: -install-data-am: install-dbusconfDATA install-localealiasDATA \ - install-schemasDATA +install-data-am: install-dbusconfDATA install-dist_sessionDATA \ + install-localealiasDATA install-schemasDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -820,8 +851,8 @@ ps-am: -uninstall-am: uninstall-dbusconfDATA uninstall-localealiasDATA \ - uninstall-schemasDATA +uninstall-am: uninstall-dbusconfDATA uninstall-dist_sessionDATA \ + uninstall-localealiasDATA uninstall-schemasDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ @@ -830,19 +861,20 @@ .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 \ + ctags ctags-recursive dist-hook 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-dbusconfDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-localealiasDATA install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-schemasDATA 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 \ - uninstall-dbusconfDATA uninstall-hook \ + install-dist_sessionDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-localealiasDATA \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA 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 uninstall-dbusconfDATA \ + uninstall-dist_sessionDATA uninstall-hook \ uninstall-localealiasDATA uninstall-schemasDATA @@ -897,6 +929,12 @@ -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in +dconf-override-db: $(srcdir)/make-dconf-override-db.sh + $(srcdir)/make-dconf-override-db.sh + +dist-hook: $(srcdir)/dconf-override-db + cp $(srcdir)/dconf-override-db $(distdir) + uninstall-hook: rm -f \ $(DESTDIR)$(GDM_CUSTOM_CONF) \ @@ -908,12 +946,19 @@ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm \ $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin \ $(DESTDIR)$(workingdir)/.gconf.path \ + $(DESTDIR)$(sysconfdir)/dconf/db/gdm \ + $(DESTDIR)$(sysconfdir)/dconf/profile/gdm \ -rf \ $(DESTDIR)$(workingdir)/.gconf.mandatory \ + $(DESTDIR)$(workingdir)/.config/dconf \ $(DESTDIR)$(screenshotdir) \ $(DESTDIR)$(xauthdir) -install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path + -rmdir \ + $(DESTDIR)$(sysconfdir)/dconf/db \ + $(DESTDIR)$(sysconfdir)/dconf + +install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path dconf-override-db if test '!' -d $(DESTDIR)$(gdmconfdir); then \ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ @@ -1005,6 +1050,24 @@ chown root:gdm $(DESTDIR)$(workingdir) || : ; \ fi + if test '!' -d $(DESTDIR)$(workingdir)/.config/dconf; then \ + $(mkinstalldirs) $(DESTDIR)$(workingdir)/.config/dconf; \ + chmod 0755 $(DESTDIR)$(workingdir)/.config/dconf; \ + chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \ + fi + + if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/profile; then \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/profile; \ + chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/profile; \ + chown root:root $(DESTDIR)$(sysconfdir)/dconf/profile || : ; \ + fi + + if test '!' -d $(DESTDIR)$(sysconfdir)/dconf/db; then \ + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/dconf/db; \ + chmod 0755 $(DESTDIR)$(sysconfdir)/dconf/db; \ + chown root:root $(DESTDIR)$(sysconfdir)/dconf/db || : ; \ + fi + if test '!' -d $(DESTDIR)$(cachedir); then \ $(mkinstalldirs) $(DESTDIR)$(cachedir); \ chmod 1755 $(DESTDIR)$(cachedir); \ @@ -1018,6 +1081,9 @@ chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml + $(INSTALL_DATA) $(srcdir)/dconf-override-db $(DESTDIR)$(sysconfdir)/dconf/db/gdm + $(INSTALL_DATA) $(srcdir)/dconf-profile $(DESTDIR)$(sysconfdir)/dconf/profile/gdm + # 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 gdm-2.32.1/data/pixmaps/16x16/Makefile.in gdm-3.0.0/data/pixmaps/16x16/Makefile.in --- gdm-2.32.1/data/pixmaps/16x16/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/pixmaps/16x16/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -39,8 +39,11 @@ subdir = data/pixmaps/16x16 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,8 +86,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/data/pixmaps/32x32/Makefile.in gdm-3.0.0/data/pixmaps/32x32/Makefile.in --- gdm-2.32.1/data/pixmaps/32x32/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/pixmaps/32x32/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -39,8 +39,11 @@ subdir = data/pixmaps/32x32 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,8 +86,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/data/pixmaps/48x48/Makefile.in gdm-3.0.0/data/pixmaps/48x48/Makefile.in --- gdm-2.32.1/data/pixmaps/48x48/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/pixmaps/48x48/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -39,8 +39,11 @@ subdir = data/pixmaps/48x48 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,8 +86,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/data/pixmaps/Makefile.in gdm-3.0.0/data/pixmaps/Makefile.in --- gdm-2.32.1/data/pixmaps/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/data/pixmaps/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -37,8 +37,11 @@ subdir = data/pixmaps DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -121,8 +124,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/data/session-setup.entries gdm-3.0.0/data/session-setup.entries --- gdm-2.32.1/data/session-setup.entries 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/data/session-setup.entries 2011-01-15 02:20:13.000000000 +0000 @@ -774,5 +774,12 @@ /bin/true + + + /desktop/gnome/sound/event_sounds + + true + + diff -Nru gdm-2.32.1/debian/changelog gdm-3.0.0/debian/changelog --- gdm-2.32.1/debian/changelog 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/changelog 2011-04-08 16:13:10.000000000 +0000 @@ -1,47 +1,18 @@ -gdm (2.32.1-0ubuntu1) natty; urgency=low +gdm (3.0.0-0ubuntu1~build1) natty; urgency=low * New upstream release - * debian/patches/01git_xdmcp_ipv6.patch: - * debian/patches/43_CVE-2011-0727.patch: - - Applied upstream - - -- Robert Ancell Fri, 08 Apr 2011 16:35:19 +1000 - -gdm (2.32.0-0ubuntu15) natty; urgency=low - - * SECURITY UPDATE: race condition allowing privilege escalation - - debian/patches/43_CVE-2011-0727.patch: fix - daemon/gdm-session-worker.c to copy files as session user rather - than root followed by a subsequent chown. (LP: #746053) - - CVE-2011-0727 - - -- Steve Beattie Mon, 04 Apr 2011 20:42:03 -0700 - -gdm (2.32.0-0ubuntu14) natty; urgency=low - - * debian/patches/24_respect_system_minuid.patch: - - Ignore entries from ck-history that are using system UIDs (LP: #696038) - * debian/patches/42_no_ecryptfs_autologin.patch: - - Don't autologin ecryptfs users (LP: #284443) - - -- Robert Ancell Fri, 01 Apr 2011 15:49:50 +1100 - -gdm (2.32.0-0ubuntu13) natty; urgency=low - - [ Gunnar Hjalmarsson ] - * debian/patches/36_language_environment_settings.patch: - - Make the first item in the system LANGUAGE list serve as default - language for new users (LP: #740754). - - Do not apply code for faking $GDM_LANG if it is the $USER's - first login ever (LP: #740754). - - Check $DESKTOP_SESSION instead of $GDMSESSION to determine if - it is a guest session. - - [ Martin Pitt ] - * Add 41_pt_time_format.patch: Fix time format for Portugal. Thanks - jbatista! (LP: #696560) + * debian/patches: + + drop 00git_passwordless_login_crash.patch, 01git_xdmcp_ipv6.patch, + 38_user_chooser_focus.patch, are upstream + + disable 09_gdmsetup.patch, 15_default_session.patch, + 17_use_timed_login_after_autologin.patch, 24_respect_system_minuid.patch, + 30_don_t_save_failsafe_session.patch, 33-multi-keyboard-layouts.patch, + 35_langlist_and_lsmess_dmrc_fields.patch, need to be fixed + + refreshed as needed + * debian/control: + + update dependencies - -- Martin Pitt Thu, 31 Mar 2011 18:09:26 +0200 + -- Rico Tzschichholz Fri, 08 Apr 2011 18:11:55 +0200 gdm (2.32.0-0ubuntu12) natty; urgency=low diff -Nru gdm-2.32.1/debian/control gdm-3.0.0/debian/control --- gdm-2.32.1/debian/control 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/control 2011-04-08 16:17:42.000000000 +0000 @@ -5,28 +5,31 @@ Build-Depends: cdbs, debhelper (>= 7.3.15ubuntu2), gnome-common, - autotools-dev, + autotools-dev, gnome-pkg-tools, - libglib2.0-dev (>= 2.22), - libdbus-glib-1-dev (>= 0.74), - libx11-dev, - libgtk2.0-dev (>= 2.23.90-0ubuntu4), - libgconf2-dev, + libglib2.0-dev (>= 2.27.4), + libdbus-glib-1-dev (>= 0.74), + libpolkit-gobject-1-dev (>= 0.92), + libx11-dev, + libgtk-3-dev (>= 2.91.1), + libgconf2-dev (>= 2.31.3), + libpango1.0-dev (>= 1.3.0), gnome-doc-utils, - libpanel-applet2-dev, gconf2, libattr1-dev, - libpam0g-dev, - libxdmcp-dev, - libwrap0-dev, - libxi-dev, - libxinerama-dev, - libxklavier-dev, + libfontconfig1-dev (>= 2.5.0), + libpam0g-dev, + libxdmcp-dev, +# libwrap0-dev, + libxi-dev, + libxinerama-dev, + libxklavier-dev (>= 4.0), libpolkit-gobject-1-dev, - libcanberra-gtk-dev (>= 0.4), - libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libcanberra-gtk3-dev (>= 0.4), + libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], iso-codes, - libupower-glib-dev (>= 0.9.0) + libupower-glib-dev (>= 0.9.0), + libaccountsservice-dev (>= 0.6.5) Standards-Version: 3.9.1 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gdm/ubuntu diff -Nru gdm-2.32.1/debian/patches/00_fix_gtk_deps.patch gdm-3.0.0/debian/patches/00_fix_gtk_deps.patch --- gdm-2.32.1/debian/patches/00_fix_gtk_deps.patch 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/debian/patches/00_fix_gtk_deps.patch 2011-03-31 12:02:57.000000000 +0000 @@ -0,0 +1,11537 @@ +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.68 for gdm 2.91.94. ++# Generated by GNU Autoconf 2.67 for gdm 2.91.94. + # + # Report bugs to . + # +@@ -91,7 +91,6 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -174,15 +173,7 @@ test x\$exitcode = x0 || exit 1" + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +-test \$(( 1 + 1 )) = 2 || exit 1 +- +- 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\" ) || exit 1" ++test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes + else +@@ -225,18 +216,11 @@ IFS=$as_save_IFS + # 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+"$@"} ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + + if test x$as_have_required = xno; then : +@@ -545,8 +529,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P + # Sed expression to map a string onto a valid variable name. + as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + ++ ++ ++# Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + ++case X$lt_ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} ++if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X$1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "$0" --no-reexec ${1+"$@"} ++fi ++ ++if test "X$1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<_LT_EOF ++$* ++_LT_EOF ++ exit 0 ++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 ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "$0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi ++ fi ++ fi ++ fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ++fi ++ ++ ++ + + test -n "$DJDIR" || exec 7<&0 &1 +@@ -656,6 +787,7 @@ GDM_OLD_CONF + GDM_CUSTOM_CONF + GDM_DEFAULTS_CONF + AT_BINDIR ++cachedir + logdir + pixmapdir + gdmlocaledir +@@ -706,6 +838,10 @@ LIBXKLAVIER_LIBS + LIBXKLAVIER_CFLAGS + SIMPLE_GREETER_LIBS + SIMPLE_GREETER_CFLAGS ++SET_SESSION_LIBS ++SET_SESSION_CFLAGS ++GDMSETUP_LIBS ++GDMSETUP_CFLAGS + UPOWER + UPOWER_LIBS + UPOWER_CFLAGS +@@ -788,11 +924,9 @@ OTOOL + LIPO + NMEDIT + DSYMUTIL +-MANIFEST_TOOL ++lt_ECHO + RANLIB +-ac_ct_AR + AR +-DLLTOOL + OBJDUMP + LN_S + NM +@@ -912,9 +1046,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot + enable_libtool_lock +-with_gnu_ld + enable_nls + with_help_dir + with_omf_dir +@@ -947,6 +1079,7 @@ with_dbus_sys + with_dbus_services + enable_rbac_shutdown + with_log_dir ++with_cache_dir + with_at_bindir + with_defaults_conf + with_custom_conf +@@ -969,12 +1102,8 @@ LDFLAGS + LIBS + CPPFLAGS + CPP +-CPPFLAGS + CXX + CXXFLAGS +-LDFLAGS +-LIBS +-CPPFLAGS + CCC + CXXCPP + PKG_CONFIG +@@ -997,6 +1126,10 @@ GCONF_CFLAGS + GCONF_LIBS + UPOWER_CFLAGS + UPOWER_LIBS ++GDMSETUP_CFLAGS ++GDMSETUP_LIBS ++SET_SESSION_CFLAGS ++SET_SESSION_LIBS + SIMPLE_GREETER_CFLAGS + SIMPLE_GREETER_LIBS + LIBXKLAVIER_CFLAGS +@@ -1409,7 +1542,7 @@ Try \`$0 --help' for more information" + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac +@@ -1665,8 +1798,6 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR +- (or the compiler's sysroot if not specified). + --with-help-dir=DIR path to help docs + --with-omf-dir=DIR path to OMF files + --with-help-formats=FORMATS +@@ -1701,6 +1832,7 @@ Optional Packages: + --with-dbus-services= + where D-BUS services directory is + --with-log-dir= log dir ++ --with-cache-dir= cache dir + --with-at-bindir= + PATH to Accessible Technology programs [default=BINDIR] + +@@ -1761,6 +1893,14 @@ Some influential environment variables: + UPOWER_CFLAGS + C compiler flags for UPOWER, overriding pkg-config + UPOWER_LIBS linker flags for UPOWER, overriding pkg-config ++ GDMSETUP_CFLAGS ++ C compiler flags for GDMSETUP, overriding pkg-config ++ GDMSETUP_LIBS ++ linker flags for GDMSETUP, overriding pkg-config ++ SET_SESSION_CFLAGS ++ C compiler flags for SET_SESSION, overriding pkg-config ++ SET_SESSION_LIBS ++ linker flags for SET_SESSION, overriding pkg-config + SIMPLE_GREETER_CFLAGS + C compiler flags for SIMPLE_GREETER, overriding pkg-config + SIMPLE_GREETER_LIBS +@@ -1844,7 +1984,7 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + gdm configure 2.91.94 +-generated by GNU Autoconf 2.68 ++generated by GNU Autoconf 2.67 + + Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -1890,7 +2030,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile +@@ -1927,7 +2067,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp +@@ -1940,10 +2080,10 @@ fi + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if eval \${$3+:} false; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -2010,7 +2150,7 @@ $as_echo "$as_me: WARNING: $2: proceedin + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -2019,7 +2159,7 @@ eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_header_mongrel + +@@ -2060,7 +2200,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_run +@@ -2074,7 +2214,7 @@ ac_fn_c_check_header_compile () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2092,7 +2232,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_header_compile + +@@ -2129,7 +2269,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_compile +@@ -2175,7 +2315,7 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_link +@@ -2188,7 +2328,7 @@ ac_fn_c_check_func () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2243,7 +2383,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_func + +@@ -2279,7 +2419,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_cpp +@@ -2325,7 +2465,7 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_cxx_try_link +@@ -2339,7 +2479,7 @@ ac_fn_c_check_type () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -2380,7 +2520,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_type + cat >config.log <<_ACEOF +@@ -2388,7 +2528,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by gdm $as_me 2.91.94, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -2646,7 +2786,7 @@ $as_echo "$as_me: loading site script $a + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "failed to load site script $ac_site_file +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + done + +@@ -2786,7 +2926,7 @@ ac_configure="$SHELL $ac_aux_dir/configu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if ${ac_cv_path_install+:} false; then : ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2873,11 +3013,11 @@ am_lf=' + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2963,7 +3103,7 @@ if test "$cross_compiling" != no; then + set dummy ${ac_tool_prefix}strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_STRIP+:} false; then : ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -3003,7 +3143,7 @@ if test -z "$ac_cv_prog_STRIP"; then + set dummy strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_STRIP+:} false; then : ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -3056,7 +3196,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if ${ac_cv_path_mkdir+:} false; then : ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -3107,7 +3247,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AWK+:} false; then : ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -3147,7 +3287,7 @@ done + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -3354,7 +3494,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3394,7 +3534,7 @@ if test -z "$ac_cv_prog_CC"; then + set dummy gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3447,7 +3587,7 @@ if test -z "$CC"; then + set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3487,7 +3627,7 @@ if test -z "$CC"; then + set dummy cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3546,7 +3686,7 @@ if test -z "$CC"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3590,7 +3730,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3645,7 +3785,7 @@ fi + test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "no acceptable C compiler found in \$PATH +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + + # Provide some information about the compiler. + $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +@@ -3760,7 +3900,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error 77 "C compiler cannot create executables +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +@@ -3803,7 +3943,7 @@ else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +@@ -3862,7 +4002,7 @@ $as_echo "$ac_try_echo"; } >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "cannot run C compiled programs. + If you meant to cross compile, use \`--host'. +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + fi + fi +@@ -3873,7 +4013,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex + ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if ${ac_cv_objext+:} false; then : ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3914,7 +4054,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +@@ -3924,7 +4064,7 @@ OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if ${ac_cv_c_compiler_gnu+:} false; then : ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3961,7 +4101,7 @@ ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if ${ac_cv_prog_cc_g+:} false; then : ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -4039,7 +4179,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if ${ac_cv_prog_cc_c89+:} false; then : ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -4138,7 +4278,7 @@ depcc="$CC" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if ${am_cv_CC_dependencies_compiler_type+:} false; then : ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4274,7 +4414,7 @@ if test -n "$CPP" && test -d "$CPP"; the + CPP= + fi + if test -z "$CPP"; then +- if ${ac_cv_prog_CPP+:} false; then : ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4390,7 +4530,7 @@ else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + + ac_ext=c +@@ -4402,7 +4542,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if ${ac_cv_path_GREP+:} false; then : ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4465,7 +4605,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if ${ac_cv_path_EGREP+:} false; then : ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4532,7 +4672,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4661,7 +4801,7 @@ done + + + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +-if test "x$ac_cv_header_minix_config_h" = xyes; then : ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes + else + MINIX= +@@ -4683,7 +4823,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 + $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +-if ${ac_cv_safe_to_define___extensions__+:} false; then : ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4724,7 +4864,7 @@ $as_echo "$ac_cv_safe_to_define___extens + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4850,7 +4990,7 @@ if test -z "$CXX"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CXX+:} false; then : ++if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -4894,7 +5034,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CXX+:} false; then : ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CXX"; then +@@ -4972,7 +5112,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 + $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if ${ac_cv_cxx_compiler_gnu+:} false; then : ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5009,7 +5149,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 + $as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if ${ac_cv_prog_cxx_g+:} false; then : ++if test "${ac_cv_prog_cxx_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag +@@ -5095,7 +5235,7 @@ depcc="$CXX" am_compiler_list= + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if ${am_cv_CXX_dependencies_compiler_type+:} false; then : ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -5227,7 +5367,7 @@ $as_echo_n "checking whether cc understa + 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 : ++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5352,8 +5492,8 @@ esac + + + +-macro_version='2.4' +-macro_revision='1.3293' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + +@@ -5375,7 +5515,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/d + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if ${ac_cv_build+:} false; then : ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias +@@ -5391,7 +5531,7 @@ fi + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -5409,7 +5549,7 @@ case $build_os in *\ *) build_os=`echo " + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if ${ac_cv_host+:} false; then : ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then +@@ -5424,7 +5564,7 @@ fi + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -5440,78 +5580,9 @@ IFS=$ac_save_IFS + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-# Backslashify metacharacters that are still active within +-# double-quoted strings. +-sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\(["`\\]\)/\\\1/g' +- +-# 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' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +-$as_echo_n "checking how to print strings... " >&6; } +-# 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' +-fi +- +-# func_echo_all arg... +-# Invoke $ECHO with all args, space-separated. +-func_echo_all () +-{ +- $ECHO "" +-} +- +-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 +-$as_echo "print -r" >&6; } ;; +- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +-$as_echo "cat" >&6; } ;; +-esac +- +- +- +- +- +- +- +- +- +- +- +- +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if ${ac_cv_path_SED+:} false; then : ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -5593,7 +5664,7 @@ Xsed="$SED -e 1s/^X//" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if ${ac_cv_path_FGREP+:} false; then : ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -5724,7 +5795,7 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if ${lt_cv_path_LD+:} false; then : ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -5764,7 +5835,7 @@ fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if ${lt_cv_prog_gnu_ld+:} false; then : ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -5791,7 +5862,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if ${lt_cv_path_NM+:} false; then : ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -5844,17 +5915,14 @@ if test "$lt_cv_path_NM" != "no"; 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 +- if test -n "$ac_tool_prefix"; then +- for ac_prog in dumpbin "link -dump" ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_DUMPBIN+:} false; then : ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -5892,13 +5960,13 @@ fi + fi + if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN +- for ac_prog in dumpbin "link -dump" ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -5947,15 +6015,6 @@ esac + fi + fi + +- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in +- *COFF*) +- DUMPBIN="$DUMPBIN -symbols" +- ;; +- *) +- DUMPBIN=: +- ;; +- esac +- fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" +@@ -5970,18 +6029,18 @@ test -z "$NM" && NM=nm + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if ${lt_cv_nm_interface+:} false; then : ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6037: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6040: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:$LINENO: output\"" >&5) ++ (eval echo "\"\$as_me:6043: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6005,7 +6064,7 @@ fi + # find the maximum length of command line arguments + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if ${lt_cv_sys_max_cmd_len+:} false; then : ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -6038,11 +6097,6 @@ else + lt_cv_sys_max_cmd_len=8192; + ;; + +- 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. +@@ -6107,8 +6161,8 @@ else + # 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ +- = "X$teststring$teststring"; } >/dev/null 2>&1 && ++ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` +@@ -6150,8 +6204,8 @@ $as_echo_n "checking whether the shell u + # 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, \ ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +@@ -6200,83 +6254,9 @@ esac + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +-$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +-if ${lt_cv_to_host_file_cmd+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- 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 +- +-fi +- +-to_host_file_cmd=$lt_cv_to_host_file_cmd +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +-$as_echo "$lt_cv_to_host_file_cmd" >&6; } +- +- +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +-if ${lt_cv_to_tool_file_cmd+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- #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 +- +-fi +- +-to_tool_file_cmd=$lt_cv_to_tool_file_cmd +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +-$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +- +- +- +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if ${lt_cv_ld_reload_flag+:} false; then : ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' +@@ -6290,11 +6270,6 @@ case $reload_flag in + esac + reload_cmds='$LD$reload_flag -o $output$reload_objs' + case $host_os in +- cygwin* | mingw* | pw32* | cegcc*) +- if test "$GCC" != yes; then +- reload_cmds=false +- fi +- ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +@@ -6317,7 +6292,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then : ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -6357,7 +6332,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then + set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then : ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -6416,7 +6391,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if ${lt_cv_deplibs_check_method+:} false; then : ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -6458,18 +6433,16 @@ 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 ++ 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_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +-cegcc*) ++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' +@@ -6499,10 +6472,6 @@ gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +-haiku*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- + hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in +@@ -6511,11 +6480,11 @@ hpux10.20* | hpux11*) + 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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) 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_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 +@@ -6541,7 +6510,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + 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 +@@ -6618,21 +6587,6 @@ esac + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } +- +-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 +-fi +- + 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 +@@ -6648,26 +6602,16 @@ test -z "$deplibs_check_method" && depli + + + +- +- +- +- +- +- +- +- +- +- + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ar; 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_DLLTOOL+:} false; then : ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test -n "$DLLTOOL"; then +- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6676,7 +6620,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6686,10 +6630,10 @@ IFS=$as_save_IFS + + fi + fi +-DLLTOOL=$ac_cv_prog_DLLTOOL +-if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +-$as_echo "$DLLTOOL" >&6; } ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -6697,17 +6641,17 @@ fi + + + fi +-if test -z "$ac_cv_prog_DLLTOOL"; then +- ac_ct_DLLTOOL=$DLLTOOL +- # Extract the first word of "dlltool", so it can be a program name with args. +-set dummy dlltool; ac_word=$2 ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; 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_ac_ct_DLLTOOL+:} false; then : ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_DLLTOOL"; then +- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6716,7 +6660,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ ac_cv_prog_ac_ct_AR="ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6726,17 +6670,17 @@ IFS=$as_save_IFS + + fi + fi +-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +-if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +-$as_echo "$ac_ct_DLLTOOL" >&6; } ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_DLLTOOL" = x; then +- DLLTOOL="false" ++ if test "x$ac_ct_AR" = x; then ++ AR="false" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -6744,13 +6688,14 @@ yes:) + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- DLLTOOL=$ac_ct_DLLTOOL ++ AR=$ac_ct_AR + fi + else +- DLLTOOL="$ac_cv_prog_DLLTOOL" ++ AR="$ac_cv_prog_AR" + fi + +-test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru + + + +@@ -6761,56 +6706,17 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +-$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sharedlib_from_linklib_cmd='unknown' +- +-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 +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO +- +- +- +- +- +- + + if test -n "$ac_tool_prefix"; then +- for ac_prog in ar +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AR+:} false; then : ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test -n "$AR"; then +- ac_cv_prog_AR="$AR" # Let the user override the test. ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6819,7 +6725,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AR="$ac_tool_prefix$ac_prog" ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6829,32 +6735,28 @@ IFS=$as_save_IFS + + fi + fi +-AR=$ac_cv_prog_AR +-if test -n "$AR"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +-$as_echo "$AR" >&6; } ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + + +- test -n "$AR" && break +- done + fi +-if test -z "$AR"; then +- ac_ct_AR=$AR +- for ac_prog in ar +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_AR+:} false; then : ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_AR"; then +- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6863,7 +6765,7 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AR="$ac_prog" ++ ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6873,175 +6775,10 @@ IFS=$as_save_IFS + + fi + fi +-ac_ct_AR=$ac_cv_prog_ac_ct_AR +-if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +-$as_echo "$ac_ct_AR" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_AR" && break +-done +- +- if test "x$ac_ct_AR" = x; then +- AR="false" +- 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 +- AR=$ac_ct_AR +- fi +-fi +- +-: ${AR=ar} +-: ${AR_FLAGS=cru} +- +- +- +- +- +- +- +- +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +-$as_echo_n "checking for archiver @FILE support... " >&6; } +-if ${lt_cv_ar_at_file+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_ar_at_file=no +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- echo conftest.$ac_objext > conftest.lst +- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' +- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 +- (eval $lt_ar_try) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +- if test "$ac_status" -eq 0; 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 +- (eval $lt_ar_try) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +- if test "$ac_status" -ne 0; then +- lt_cv_ar_at_file=@ +- fi +- fi +- rm -f conftest.* libconftest.a +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $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 +- archiver_list_spec= +-else +- archiver_list_spec=$lt_cv_ar_at_file +-fi +- +- +- +- +- +- +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_STRIP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -7074,7 +6811,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+:} false; then : ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -7114,7 +6851,7 @@ if test -z "$ac_cv_prog_RANLIB"; then + set dummy ranlib; 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_ac_ct_RANLIB+:} false; then : ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -7185,18 +6922,6 @@ if test -n "$RANLIB"; then + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + +-case $host_os in +- darwin*) +- lock_old_archive_extraction=yes ;; +- *) +- lock_old_archive_extraction=no ;; +-esac +- +- +- +- +- +- + + + +@@ -7243,7 +6968,7 @@ compiler=$CC + # Check for command to grab the raw symbol name followed by C symbol from nm. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if ${lt_cv_sys_global_symbol_pipe+:} false; then : ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -7304,8 +7029,8 @@ esac + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -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'" + + # Handle CRLF in mingw tool chain + opt_cr= +@@ -7341,7 +7066,6 @@ for ac_symprfx in "" "_"; do + 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'" + + # Check to see that the pipe works correctly. + pipe_works=no +@@ -7367,8 +7091,8 @@ _LT_EOF + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 +- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 ++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then +@@ -7383,18 +7107,6 @@ _LT_EOF + 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_DLSYM_CONST +-#elif defined(__osf__) +-/* This system does not cope well with relocations in const data. */ +-# define LT_DLSYM_CONST +-#else +-# define LT_DLSYM_CONST const +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif +@@ -7406,7 +7118,7 @@ _LT_EOF + cat <<_LT_EOF >> conftest.$ac_ext + + /* The mapping between symbol names and symbols. */ +-LT_DLSYM_CONST struct { ++const struct { + const char *name; + void *address; + } +@@ -7432,8 +7144,8 @@ static const void *lt_preloaded_setup() + _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 ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 +@@ -7443,8 +7155,8 @@ _LT_EOF + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +- LIBS=$lt_globsym_save_LIBS +- CFLAGS=$lt_globsym_save_CFLAGS ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi +@@ -7481,22 +7193,6 @@ else + $as_echo "ok" >&6; } + 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 +- +- +- +- +- +- +- +- +- +- + + + +@@ -7514,39 +7210,6 @@ fi + + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +-$as_echo_n "checking for sysroot... " >&6; } +- +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; +-else +- with_sysroot=no +-fi +- +- +-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|'') +- ;; #( +- *) +- { $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 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +-$as_echo "${lt_sysroot:-no}" >&6; } +- + + + +@@ -7582,7 +7245,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line '$LINENO' "configure"' > conftest.$ac_ext ++ echo '#line 7248 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7676,7 +7339,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* + 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; } +-if ${lt_cv_cc_needs_belf+:} false; then : ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -7744,123 +7407,6 @@ esac + + 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. +-set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$MANIFEST_TOOL"; then +- ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" +- $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 +-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +-if test -n "$MANIFEST_TOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +-$as_echo "$MANIFEST_TOOL" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then +- ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL +- # Extract the first word of "mt", so it can be a program name with args. +-set dummy mt; 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_ac_ct_MANIFEST_TOOL+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_MANIFEST_TOOL"; then +- ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +-if test -n "$ac_ct_MANIFEST_TOOL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_MANIFEST_TOOL" = x; then +- MANIFEST_TOOL=":" +- 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 +- MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL +- fi +-else +- MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +-fi +- +-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +-if ${lt_cv_path_mainfest_tool+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_path_mainfest_tool=no +- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 +- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out +- cat conftest.err >&5 +- if $GREP 'Manifest Tool' conftest.out > /dev/null; then +- lt_cv_path_mainfest_tool=yes +- fi +- rm -f conftest* +-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 +- MANIFEST_TOOL=: +-fi +- +- +- +- +- + + case $host_os in + rhapsody* | darwin*) +@@ -7869,7 +7415,7 @@ fi + set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then : ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -7909,7 +7455,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then + set dummy dsymutil; 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_ac_ct_DSYMUTIL+:} false; then : ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -7961,7 +7507,7 @@ fi + set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then : ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -8001,7 +7547,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then + set dummy nmedit; 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_ac_ct_NMEDIT+:} false; then : ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -8053,7 +7599,7 @@ fi + set dummy ${ac_tool_prefix}lipo; 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_LIPO+:} false; then : ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -8093,7 +7639,7 @@ if test -z "$ac_cv_prog_LIPO"; then + set dummy lipo; 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_ac_ct_LIPO+:} false; then : ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -8145,7 +7691,7 @@ fi + set dummy ${ac_tool_prefix}otool; 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_OTOOL+:} false; then : ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -8185,7 +7731,7 @@ if test -z "$ac_cv_prog_OTOOL"; then + set dummy otool; 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_ac_ct_OTOOL+:} false; then : ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -8237,7 +7783,7 @@ fi + set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then : ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -8277,7 +7823,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then + set dummy otool64; 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_ac_ct_OTOOL64+:} false; then : ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -8352,7 +7898,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if ${lt_cv_apple_cc_single_mod+:} false; then : ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -8381,7 +7927,7 @@ fi + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if ${lt_cv_ld_exported_symbols_list+:} false; then : ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no +@@ -8411,38 +7957,6 @@ rm -f core conftest.err conftest.$ac_obj + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +-$as_echo_n "checking for -force_load linker flag... " >&6; } +-if ${lt_cv_ld_force_load+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- 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" >&5 +- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 +- echo "$AR cru libconftest.a conftest.o" >&5 +- $AR cru libconftest.a conftest.o 2>&5 +- echo "$RANLIB libconftest.a" >&5 +- $RANLIB libconftest.a 2>&5 +- cat > conftest.c << _LT_EOF +-int main() { return 0;} +-_LT_EOF +- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 +- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err +- _lt_result=$? +- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then +- lt_cv_ld_force_load=yes +- else +- cat conftest.err >&5 +- fi +- rm -f conftest.err libconftest.a conftest conftest.c +- rm -rf conftest.dSYM +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +-$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +@@ -8470,7 +7984,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } + 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 ++ if test "$DSYMUTIL" != ":"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= +@@ -8482,7 +7996,7 @@ for ac_header in dlfcn.h + do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default + " +-if test "x$ac_cv_header_dlfcn_h" = xyes; then : ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DLFCN_H 1 + _ACEOF +@@ -8493,14 +8007,528 @@ done + + + ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" ++ $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 ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CXX="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ 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 ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +-func_stripname_cnf () ++int ++main () + { +- 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 ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes ++else ++ GXX= ++fi ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++else ++ CXXFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ++else ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_cv_prog_cxx_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++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="$CXX" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ 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 ++ ++ am_cv_CXX_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 ++ 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 ++ ++ # 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_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } ++if test -z "$CXXCPP"; then ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++_ACEOF ++if ac_fn_cxx_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++_lt_caught_CXX_error=yes; } ++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 ++ ++else ++ _lt_caught_CXX_error=yes ++fi + + + +@@ -8658,7 +8686,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo + + + +- + test -z "$LN_S" && LN_S="ln -s" + + +@@ -8680,7 +8707,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if ${lt_cv_objdir+:} false; then : ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -8708,6 +8735,19 @@ _ACEOF + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + case $host_os in + aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some +@@ -8720,6 +8760,23 @@ aix3*) + ;; + esac + ++# 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. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# 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' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ + # Global variables: + ofile=libtool + can_build_shared=yes +@@ -8748,7 +8805,7 @@ for cc_temp in $compiler""; do + *) break;; + esac + done +-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + + # Only perform the check for file, if the check method requires it +@@ -8758,7 +8815,7 @@ file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if ${lt_cv_path_MAGIC_CMD+:} false; then : ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -8824,7 +8881,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if ${lt_cv_path_MAGIC_CMD+:} false; then : ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -8953,16 +9010,11 @@ if test -n "$compiler"; then + lt_prog_compiler_no_builtin_flag= + + if test "$GCC" = yes; then +- case $cc_basename in +- nvcc*) +- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; +- *) +- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; +- esac ++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -8978,15 +9030,15 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:9033: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:9037: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes +@@ -9015,6 +9067,8 @@ fi + lt_prog_compiler_pic= + lt_prog_compiler_static= + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -9062,12 +9116,6 @@ lt_prog_compiler_static= + lt_prog_compiler_pic='-fno-common' + ;; + +- haiku*) +- # PIC is the default for Haiku. +- # The "-static" flag exists, but is broken. +- lt_prog_compiler_static= +- ;; +- + 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 +@@ -9110,13 +9158,6 @@ lt_prog_compiler_static= + lt_prog_compiler_pic='-fPIC' + ;; + esac +- +- case $cc_basename in +- nvcc*) # Cuda Compiler Driver 2.2 +- lt_prog_compiler_wl='-Xlinker ' +- lt_prog_compiler_pic='-Xcompiler -fPIC' +- ;; +- esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in +@@ -9179,13 +9220,7 @@ lt_prog_compiler_static= + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; +- nagfor*) +- # NAG Fortran compiler +- lt_prog_compiler_wl='-Wl,-Wl,,' +- lt_prog_compiler_pic='-PIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) ++ pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' +@@ -9197,26 +9232,26 @@ lt_prog_compiler_static= + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; +- xl* | bgxl* | bgf* | mpixl*) +- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in +- *Sun\ F* | *Sun*Fortran*) +- # Sun Fortran 8.3 passes all unrecognized flags to the linker +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- lt_prog_compiler_wl='' +- ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; + esac + ;; + esac +@@ -9247,7 +9282,7 @@ lt_prog_compiler_static= + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in +- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ++ f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; +@@ -9304,17 +9339,13 @@ case $host_os in + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } ++ ++ ++ ++ + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +-if ${lt_cv_prog_compiler_pic+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +-$as_echo "$lt_cv_prog_compiler_pic" >&6; } +-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + + # + # Check to make sure the PIC flag actually works. +@@ -9322,7 +9353,7 @@ lt_prog_compiler_pic=$lt_cv_prog_compile + if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if ${lt_cv_prog_compiler_pic_works+:} false; then : ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -9338,15 +9369,15 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:9372: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:9376: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes +@@ -9375,18 +9406,13 @@ fi + + + +- +- +- +- +- + # + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if ${lt_cv_prog_compiler_static_works+:} false; then : ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -9399,7 +9425,7 @@ else + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 +- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes +@@ -9429,7 +9455,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if ${lt_cv_prog_compiler_c_o+:} false; then : ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -9448,16 +9474,16 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:9477: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:9481: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o=yes +@@ -9484,7 +9510,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if ${lt_cv_prog_compiler_c_o+:} false; then : ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -9503,16 +9529,16 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:9532: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:9536: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o=yes +@@ -9622,36 +9648,13 @@ $as_echo_n "checking whether the $compil + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +- +- # 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_use_gnu_ld_interface=yes +- ;; +- 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}' + +@@ -9685,12 +9688,11 @@ $as_echo_n "checking whether the $compil + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +-*** Warning: the GNU linker, at least up to release 2.19, is reported ++*** Warning: the GNU linker, at least up to release 2.9.1, 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. ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. + + _LT_EOF + fi +@@ -9726,12 +9728,10 @@ _LT_EOF + # _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' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' +- exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + + 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' +@@ -9749,11 +9749,6 @@ _LT_EOF + fi + ;; + +- haiku*) +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- link_all_deplibs=yes +- ;; +- + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no +@@ -9779,16 +9774,15 @@ _LT_EOF + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then +- tmp_addflag=' $pic_flag' ++ tmp_addflag= + 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; $ECHO \"$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' ++ pgf77* | pgf90* | pgf95*) # 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; +@@ -9799,17 +9793,13 @@ _LT_EOF + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; +- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ xl[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' +- 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 +@@ -9825,17 +9815,17 @@ _LT_EOF + fi + + case $cc_basename in +- xlf* | bgf* | bgxlf* | mpixlf*) ++ xlf*) + # 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= + hardcode_libdir_flag_spec_ld='-rpath $libdir' +- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' ++ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; 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' ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac +@@ -9844,13 +9834,13 @@ _LT_EOF + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + 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 $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' + fi + ;; + +@@ -9868,8 +9858,8 @@ _LT_EOF + + _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 $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 +@@ -9915,8 +9905,8 @@ _LT_EOF + + *) + 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 $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 +@@ -9956,10 +9946,8 @@ _LT_EOF + 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 +- 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")) && (substr(\$ 3,1,1) != ".")) { 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' + fi +@@ -10021,6 +10009,7 @@ _LT_EOF + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -10046,13 +10035,7 @@ _LT_EOF + 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 +- aix_libpath=$lt_cv_aix_libpath +-else +- if ${lt_cv_aix_libpath_+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10065,32 +10048,25 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +- lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\([^ ]*\) *$/\1/ +- p +- } +- }' +- lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then +- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +- fi ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`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 "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + fi + 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" +- fi +- +-fi +- +- aix_libpath=$lt_cv_aix_libpath_ +-fi ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; 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' +@@ -10099,13 +10075,7 @@ fi + else + # Determine the default libpath from the value encoded in an + # empty executable. +- if test "${lt_cv_aix_libpath+set}" = set; then +- aix_libpath=$lt_cv_aix_libpath +-else +- if ${lt_cv_aix_libpath_+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10118,42 +10088,30 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + +- lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\([^ ]*\) *$/\1/ +- p +- } +- }' +- lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then +- lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +- fi ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`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 "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + fi + 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" +- fi +- +-fi +- +- aix_libpath=$lt_cv_aix_libpath_ +-fi ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + 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 +- # We only use this code for GNU lds that support --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 ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec='$convenience' + 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' +@@ -10185,63 +10143,20 @@ fi + # 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 +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- always_export_symbols=yes +- file_list_spec='@' +- # 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. +- 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=' +- # 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 +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' +- # 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' +- ;; +- *) +- # Assume MSVC wrapper +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=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. +- 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. +- old_archive_from_new_cmds='true' +- # FIXME: Should let the user specify the lib program. +- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' +- enable_shared_with_static_runtimes=yes +- ;; +- esac ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=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. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) +@@ -10251,11 +10166,7 @@ fi + 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\"`' +- else +- whole_archive_flag_spec='' +- fi ++ whole_archive_flag_spec='' + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in +@@ -10263,7 +10174,7 @@ fi + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=func_echo_all ++ output_verbose_link_cmd=echo + 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}" +@@ -10306,7 +10217,7 @@ fi + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no +@@ -10314,7 +10225,7 @@ fi + + 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' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $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' + fi +@@ -10329,8 +10240,8 @@ fi + ;; + + 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 "$GCC" = yes -a "$with_gnu_ld" = no; then ++ archive_cmds='$CC -shared -fPIC ${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 +@@ -10348,16 +10259,16 @@ fi + ;; + + hpux11*) +- if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + 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 -fPIC ${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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else +@@ -10369,46 +10280,7 @@ fi + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- +- # 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) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +-$as_echo_n "checking if $CC understands -b... " >&6; } +-if ${lt_cv_prog_compiler__b+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler__b=no +- 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 +- # 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>&5 +- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler__b=yes +- fi +- else +- lt_cv_prog_compiler__b=yes +- fi +- fi +- $RM -r conftest* +- 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' +-else +- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +-fi +- ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi +@@ -10436,39 +10308,26 @@ fi + + 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' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +-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" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ 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; } ++int foo(void) {} + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- lt_cv_irix_exported_symbol=yes +-else +- lt_cv_irix_exported_symbol=no ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- 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' +- fi ++ LDFLAGS="$save_LDFLAGS" + 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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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' +@@ -10477,7 +10336,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -10530,17 +10389,17 @@ $as_echo "$lt_cv_irix_exported_symbol" > + 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' ++ 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' + ;; + + 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' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +@@ -10550,13 +10409,13 @@ $as_echo "$lt_cv_irix_exported_symbol" > + 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' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -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' +@@ -10569,9 +10428,9 @@ $as_echo "$lt_cv_irix_exported_symbol" > + 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' ++ archive_cmds='$CC -shared ${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 ${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"*) +@@ -10759,50 +10618,44 @@ x|xyes) + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +-if ${lt_cv_archive_cmds_need_lc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ 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; } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl +- pic_flag=$lt_prog_compiler_pic +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag +- allow_undefined_flag= +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag ++ allow_undefined_flag= ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +- then +- lt_cv_archive_cmds_need_lc=no +- else +- lt_cv_archive_cmds_need_lc=yes +- fi +- allow_undefined_flag=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ++ then ++ archive_cmds_need_lc=no ++ else ++ archive_cmds_need_lc=yes ++ fi ++ allow_undefined_flag=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 ++$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi +@@ -10973,23 +10826,16 @@ if test "$GCC" = yes; then + 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 +- *\;*) ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then + # 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 ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi + # 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= +@@ -11002,7 +10848,7 @@ if test "$GCC" = yes; then + 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 ' ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; +@@ -11022,13 +10868,7 @@ BEGIN {RS=" "; FS="/|\n";} { + 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` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi +@@ -11116,7 +10956,7 @@ amigaos*) + 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=`$ECHO "X$lib" | $Xsed -e '\''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 + ;; +@@ -11147,9 +10987,8 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$cc_basename in +- yes,*) +- # gcc ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -11170,83 +11009,36 @@ cygwin* | mingw* | pw32* | cegcc*) + 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}' +- +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + 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" ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH. ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. + 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"` ++ 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") ++ ;; ++ 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 +- +- # 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 ++ dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -11333,19 +11125,6 @@ gnu*) + hardcode_into_libs=yes + ;; + +-haiku*) +- version_type=linux +- 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. +@@ -11388,10 +11167,8 @@ hpux9* | hpux10* | hpux11*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ # 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]*) +@@ -11458,17 +11235,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + 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 +- if ${lt_cv_shlibpath_overrides_runpath+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_shlibpath_overrides_runpath=no +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ +- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -11481,31 +11253,23 @@ main () + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +- lt_cv_shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=yes + fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir +- +-fi +- +- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir + + # 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 + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ 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;/^$/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 +@@ -11517,6 +11281,18 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ 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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -11807,11 +11583,6 @@ fi + + + +- +- +- +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= +@@ -11884,7 +11655,7 @@ else + # 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 : ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11918,7 +11689,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $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 : ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -11932,12 +11703,12 @@ fi + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +-if test "x$ac_cv_func_shl_load" = xyes; then : ++if test "x$ac_cv_func_shl_load" = x""yes; then : + 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; } +-if ${ac_cv_lib_dld_shl_load+:} false; then : ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11971,16 +11742,16 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $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 : ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + 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 : ++if test "x$ac_cv_func_dlopen" = x""yes; then : + 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; } +-if ${ac_cv_lib_dl_dlopen+:} false; then : ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12014,12 +11785,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $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 : ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + 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; } +-if ${ac_cv_lib_svld_dlopen+:} false; then : ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12053,12 +11824,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $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 : ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + 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; } +-if ${ac_cv_lib_dld_dld_link+:} false; then : ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12092,7 +11863,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $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 : ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -12133,7 +11904,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if ${lt_cv_dlopen_self+:} false; then : ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12142,7 +11913,7 @@ 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" ++#line 11916 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12183,13 +11954,7 @@ else + # endif + #endif + +-/* 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; } ++void fnord() { int i=42;} + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -12198,11 +11963,7 @@ int main () + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else +- { +- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- else puts (dlerror ()); +- } ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else +@@ -12239,7 +12000,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; } + 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 : ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12248,7 +12009,7 @@ 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" ++#line 12012 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12286,16 +12047,10 @@ else + # endif + # endif + # endif +-# endif +-#endif +- +-/* 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 + #endif + +-int fnord () { return 42; } ++void fnord() { int i=42;} + int main () + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +@@ -12304,11 +12059,7 @@ int main () + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else +- { +- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- else puts (dlerror ()); +- } ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else +@@ -12465,145 +12216,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CC="$lt_save_CC" + +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +-$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +-if test -z "$CXXCPP"; then +- if ${ac_cv_prog_CXXCPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CXXCPP needs to be expanded +- for CXXCPP in "$CXX -E" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CXXCPP=$CXXCPP +- +-fi +- CXXCPP=$ac_cv_prog_CXXCPP +-else +- ac_cv_prog_CXXCPP=$CXXCPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } +-ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-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 +- +-else +- _lt_caught_CXX_error=yes +-fi + + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' +@@ -12630,8 +12242,6 @@ module_cmds_CXX= + module_expsym_cmds_CXX= + link_all_deplibs_CXX=unknown + old_archive_cmds_CXX=$old_archive_cmds +-reload_flag_CXX=$reload_flag +-reload_cmds_CXX=$reload_cmds + no_undefined_flag_CXX= + whole_archive_flag_spec_CXX= + enable_shared_with_static_runtimes_CXX=no +@@ -12687,7 +12297,6 @@ $RM -r conftest* + + # 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 +@@ -12705,7 +12314,6 @@ $RM -r conftest* + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} +- CFLAGS=$CXXFLAGS + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do +@@ -12716,7 +12324,7 @@ $RM -r conftest* + *) break;; + esac + done +-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + + if test -n "$compiler"; then +@@ -12779,7 +12387,7 @@ else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if ${lt_cv_path_LD+:} false; then : ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -12819,7 +12427,7 @@ fi + test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if ${lt_cv_prog_gnu_ld+:} false; then : ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -12845,8 +12453,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + # 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 +- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +@@ -12878,7 +12486,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + # 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"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + GXX=no +@@ -12988,13 +12596,7 @@ $as_echo_n "checking whether the $compil + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. +- if test "${lt_cv_aix_libpath+set}" = set; then +- aix_libpath=$lt_cv_aix_libpath +-else +- if ${lt_cv_aix_libpath__CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -13007,33 +12609,26 @@ main () + _ACEOF + if ac_fn_cxx_try_link "$LINENO"; then : + +- lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\([^ ]*\) *$/\1/ +- p +- } +- }' +- lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then +- lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +- fi ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`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 "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- if test -z "$lt_cv_aix_libpath__CXX"; then +- lt_cv_aix_libpath__CXX="/usr/lib:/lib" +- fi +- +-fi +- +- aix_libpath=$lt_cv_aix_libpath__CXX +-fi ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + +- archive_expsym_cmds_CXX='$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" ++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' +@@ -13042,13 +12637,7 @@ fi + else + # Determine the default libpath from the value encoded in an + # empty executable. +- if test "${lt_cv_aix_libpath+set}" = set; then +- aix_libpath=$lt_cv_aix_libpath +-else +- if ${lt_cv_aix_libpath__CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -13061,42 +12650,30 @@ main () + _ACEOF + if ac_fn_cxx_try_link "$LINENO"; then : + +- lt_aix_libpath_sed=' +- /Import File Strings/,/^$/ { +- /^0/ { +- s/^0 *\([^ ]*\) *$/\1/ +- p +- } +- }' +- lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then +- lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +- fi ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`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 "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- if test -z "$lt_cv_aix_libpath__CXX"; then +- lt_cv_aix_libpath__CXX="/usr/lib:/lib" +- fi +- +-fi +- +- aix_libpath=$lt_cv_aix_libpath__CXX +-fi ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${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_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' +- if test "$with_gnu_ld" = yes; then +- # We only use this code for GNU lds that support --whole-archive. +- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- else +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_CXX='$convenience' +- fi ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_CXX='$convenience' + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. +@@ -13126,75 +12703,28 @@ fi + ;; + + 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. +- hardcode_libdir_flag_spec_CXX=' ' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=yes +- file_list_spec_CXX='@' +- # 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. +- archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' +- archive_expsym_cmds_CXX='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, CXX)='true' +- enable_shared_with_static_runtimes_CXX=yes +- # Don't use ranlib +- old_postinstall_cmds_CXX='chmod 644 $oldlib' +- postlink_cmds_CXX='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, CXX) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=no +- enable_shared_with_static_runtimes_CXX=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- archive_cmds_CXX='$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... +- archive_expsym_cmds_CXX='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 +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$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... ++ archive_expsym_cmds_CXX='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 ++ ld_shlibs_CXX=no ++ fi ++ ;; + darwin* | rhapsody*) + + +@@ -13202,11 +12732,7 @@ fi + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported +- if test "$lt_cv_ld_force_load" = "yes"; then +- whole_archive_flag_spec_CXX='`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_CXX='' +- fi ++ whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in +@@ -13214,7 +12740,7 @@ fi + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=func_echo_all ++ output_verbose_link_cmd=echo + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="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}" +@@ -13267,11 +12793,6 @@ fi + gnu*) + ;; + +- haiku*) +- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- link_all_deplibs_CXX=yes +- ;; +- + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: +@@ -13296,11 +12817,11 @@ fi + # 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"' ++ 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; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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 + ld_shlibs_CXX=no +@@ -13361,7 +12882,7 @@ fi + # 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"' ++ 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; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes; then +@@ -13371,10 +12892,10 @@ fi + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) +- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) +- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -13404,7 +12925,7 @@ fi + case $cc_basename in + CC*) + # SGI C++ +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is +@@ -13415,9 +12936,9 @@ fi + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' + fi + fi + link_all_deplibs_CXX=yes +@@ -13446,7 +12967,7 @@ fi + # 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"' ++ 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; $ECHO "X$list" | $Xsed' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +@@ -13483,26 +13004,26 @@ fi + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in +- *pgCC\ [1-5].* | *pgcpp\ [1-5].*) ++ *pgCC\ [1-5]* | *pgcpp\ [1-5]*) + prelink_cmds_CXX='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`"' ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' + old_archive_cmds_CXX='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`~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='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' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='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' ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $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 ++ *) # Version 6 will use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$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' + ;; +@@ -13510,7 +13031,7 @@ fi + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${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_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ +@@ -13529,9 +13050,9 @@ fi + # 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' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; +- xl* | mpixl* | bgxl*) ++ xl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +@@ -13551,13 +13072,13 @@ fi + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' +- whole_archive_flag_spec_CXX='${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_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # 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' ++ output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -13626,7 +13147,7 @@ fi + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi +- output_verbose_link_cmd=func_echo_all ++ output_verbose_link_cmd=echo + else + ld_shlibs_CXX=no + fi +@@ -13661,15 +13182,15 @@ fi + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='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~ ++ $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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; +@@ -13685,17 +13206,17 @@ fi + # 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"' ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) +- archive_cmds_CXX='$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' ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + +@@ -13705,7 +13226,7 @@ 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"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support +@@ -13741,7 +13262,7 @@ fi + + solaris*) + case $cc_basename in +- CC* | sunCC*) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' +@@ -13762,7 +13283,7 @@ fi + esac + link_all_deplibs_CXX=yes + +- output_verbose_link_cmd='func_echo_all' ++ output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is +@@ -13782,14 +13303,14 @@ fi + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='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' ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. +@@ -13800,7 +13321,7 @@ 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' +@@ -13854,10 +13375,6 @@ fi + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ +- '"$old_archive_cmds_CXX" +- reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ +- '"$reload_cmds_CXX" + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +@@ -13919,13 +13436,6 @@ private: + }; + _LT_EOF + +- +-_lt_libdeps_save_CFLAGS=$CFLAGS +-case "$CC $CFLAGS " in #( +-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +-esac +- + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -13939,7 +13449,7 @@ if { { eval echo "\"\$as_me\":${as_linen + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do +- case ${prev}${p} in ++ case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. +@@ -13948,22 +13458,13 @@ if { { eval echo "\"\$as_me\":${as_linen + test $p = "-R"; then + prev=$p + continue ++ else ++ prev= + fi + +- # 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) ++ case $p 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. +@@ -13983,10 +13484,8 @@ if { { eval echo "\"\$as_me\":${as_linen + postdeps_CXX="${postdeps_CXX} ${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. +@@ -14022,7 +13521,6 @@ else + fi + + $RM -f confest.$objext +-CFLAGS=$_lt_libdeps_save_CFLAGS + + # PORTME: override above test on systems where it is broken + case $host_os in +@@ -14058,7 +13556,7 @@ linux*) + + solaris*) + case $cc_basename in +- CC* | sunCC*) ++ CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as +@@ -14123,6 +13621,8 @@ fi + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -14172,11 +13672,6 @@ lt_prog_compiler_static_CXX= + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; +- haiku*) +- # PIC is the default for Haiku. +- # The "-static" flag exists, but is broken. +- lt_prog_compiler_static_CXX= +- ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. +@@ -14226,11 +13721,6 @@ lt_prog_compiler_static_CXX= + ;; + 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). +- lt_prog_compiler_pic_CXX='-DDLL_EXPORT' +- ;; + dgux*) + case $cc_basename in + ec++*) +@@ -14320,8 +13810,8 @@ lt_prog_compiler_static_CXX= + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; +- xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) +- # IBM XL 8.0, 9.0 on PPC and BlueGene ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' +@@ -14351,7 +13841,7 @@ lt_prog_compiler_static_CXX= + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -14383,7 +13873,7 @@ lt_prog_compiler_static_CXX= + ;; + solaris*) + case $cc_basename in +- CC* | sunCC*) ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' +@@ -14448,17 +13938,10 @@ case $host_os in + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; + esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_CXX" >&6; } ++ + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +-if ${lt_cv_prog_compiler_pic_CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + + # + # Check to make sure the PIC flag actually works. +@@ -14466,7 +13949,7 @@ lt_prog_compiler_pic_CXX=$lt_cv_prog_com + if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works_CXX=no +@@ -14482,15 +13965,15 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:13968: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:13972: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes +@@ -14516,15 +13999,13 @@ fi + + + +- +- + # + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works_CXX=no +@@ -14537,7 +14018,7 @@ else + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 +- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes +@@ -14564,7 +14045,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no +@@ -14583,16 +14064,16 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:14067: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:14071: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o_CXX=yes +@@ -14616,7 +14097,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o_CXX=no +@@ -14635,16 +14116,16 @@ else + -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\"" >&5) ++ (eval echo "\"\$as_me:14119: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:14123: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_cv_prog_compiler_c_o_CXX=yes +@@ -14695,35 +14176,30 @@ fi + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- exclude_expsyms_CXX='_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 +- export_symbols_cmds_CXX='$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_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" +- ;; ++ ;; + cygwin* | mingw* | cegcc*) +- case $cc_basename in +- cl*) ;; +- *) +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' +- exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' +- ;; +- esac +- ;; ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs_CXX=no ++ ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; ++ ;; + esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 + $as_echo "$ld_shlibs_CXX" >&6; } +@@ -14755,50 +14231,44 @@ x|xyes) + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ 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; } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl_CXX +- pic_flag=$lt_prog_compiler_pic_CXX +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX +- allow_undefined_flag_CXX= +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX ++ allow_undefined_flag_CXX= ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +- then +- lt_cv_archive_cmds_need_lc_CXX=no +- else +- lt_cv_archive_cmds_need_lc_CXX=yes +- fi +- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } +- archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ++ then ++ archive_cmds_need_lc_CXX=no ++ else ++ archive_cmds_need_lc_CXX=yes ++ fi ++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5 ++$as_echo "$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi +@@ -14955,7 +14425,7 @@ amigaos*) + 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=`$ECHO "X$lib" | $Xsed -e '\''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 + ;; +@@ -14986,9 +14456,8 @@ cygwin* | mingw* | pw32* | cegcc*) + need_version=no + need_lib_prefix=no + +- case $GCC,$cc_basename in +- yes,*) +- # gcc ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +@@ -15008,83 +14477,37 @@ cygwin* | mingw* | pw32* | cegcc*) + 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}' +- +- ;; +- 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"` ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- *) +- sys_lib_search_path_spec="$LIB" ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH. ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. + 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"` ++ 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") ++ ;; ++ 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 +- +- # 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 ++ dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; +@@ -15170,19 +14593,6 @@ gnu*) + hardcode_into_libs=yes + ;; + +-haiku*) +- version_type=linux +- 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. +@@ -15225,10 +14635,8 @@ hpux9* | hpux10* | hpux11*) + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ # 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]*) +@@ -15295,17 +14703,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) + 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 +- if ${lt_cv_shlibpath_overrides_runpath+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_shlibpath_overrides_runpath=no +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ +- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -15318,31 +14721,23 @@ main () + _ACEOF + if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +- lt_cv_shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=yes + fi + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir +- +-fi +- +- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir + + # 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 + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" +- ++ 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;/^$/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 +@@ -15354,6 +14749,18 @@ fi + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ 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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -15593,8 +15000,6 @@ fi + + + +- +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action_CXX= +@@ -15642,7 +15047,6 @@ fi + fi # test -n "$compiler" + + CC=$lt_save_CC +- CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC +@@ -15682,7 +15086,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15841,7 +15245,7 @@ fi + set dummy intltool-update; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_UPDATE in +@@ -15881,7 +15285,7 @@ fi + set dummy intltool-merge; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_MERGE in +@@ -15921,7 +15325,7 @@ fi + set dummy intltool-extract; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_EXTRACT in +@@ -16082,7 +15486,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. + set dummy xgettext; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_XGETTEXT+:} false; then : ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $XGETTEXT in +@@ -16122,7 +15526,7 @@ fi + set dummy msgmerge; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_MSGMERGE+:} false; then : ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGMERGE in +@@ -16162,7 +15566,7 @@ fi + set dummy msgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_MSGFMT+:} false; then : ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MSGFMT in +@@ -16202,7 +15606,7 @@ fi + set dummy gmsgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_GMSGFMT+:} false; then : ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -16253,7 +15657,7 @@ fi + set dummy perl; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_INTLTOOL_PERL+:} false; then : ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $INTLTOOL_PERL in +@@ -16337,7 +15741,7 @@ 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 : ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + DATADIRNAME=share + else + DATADIRNAME=lib +@@ -16370,7 +15774,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != + 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 : ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -16413,7 +15817,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the + 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 : ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -16579,7 +15983,7 @@ _ACEOF + for ac_header in locale.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +-if test "x$ac_cv_header_locale_h" = xyes; then : ++if test "x$ac_cv_header_locale_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LOCALE_H 1 + _ACEOF +@@ -16591,7 +15995,7 @@ done + if test $ac_cv_header_locale_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 + $as_echo_n "checking for LC_MESSAGES... " >&6; } +-if ${am_cv_val_LC_MESSAGES+:} false; then : ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -16631,7 +16035,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >> + INTLLIBS= + + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +-if test "x$ac_cv_header_libintl_h" = xyes; then : ++if test "x$ac_cv_header_libintl_h" = x""yes; then : + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + +@@ -16640,7 +16044,7 @@ if test "x$ac_cv_header_libintl_h" = xye + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 + $as_echo_n "checking for ngettext in libc... " >&6; } +-if ${gt_cv_func_ngettext_libc+:} false; then : ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -16671,7 +16075,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6 + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 + $as_echo_n "checking for dgettext in libc... " >&6; } +-if ${gt_cv_func_dgettext_libc+:} false; then : ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -16704,7 +16108,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6 + for ac_func in bind_textdomain_codeset + do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF +@@ -16723,7 +16127,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 + $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if ${ac_cv_lib_intl_bindtextdomain+:} false; then : ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16757,10 +16161,10 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 + $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_ngettext+:} false; then : ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16794,10 +16198,10 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = xyes; then : ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 + $as_echo_n "checking for dgettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_dgettext+:} false; then : ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16831,7 +16235,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 + $as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = xyes; then : ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + fi + +@@ -16847,7 +16251,7 @@ $as_echo_n "checking if -liconv is neede + $as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 + $as_echo_n "checking for ngettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_ngettext+:} false; then : ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16881,10 +16285,10 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 + $as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = xyes; then : ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 + $as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if ${ac_cv_lib_intl_dcgettext+:} false; then : ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -16918,7 +16322,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 + $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -16943,7 +16347,7 @@ fi + for ac_func in bind_textdomain_codeset + do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_BIND_TEXTDOMAIN_CODESET 1 + _ACEOF +@@ -16981,7 +16385,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>conf + set dummy msgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_MSGFMT+:} false; then : ++if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$MSGFMT" in +@@ -17018,7 +16422,7 @@ fi + for ac_func in dcgettext + do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +-if test "x$ac_cv_func_dcgettext" = xyes; then : ++if test "x$ac_cv_func_dcgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DCGETTEXT 1 + _ACEOF +@@ -17059,7 +16463,7 @@ fi + set dummy gmsgfmt; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_GMSGFMT+:} false; then : ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GMSGFMT in +@@ -17100,7 +16504,7 @@ fi + set dummy xgettext; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_XGETTEXT+:} false; then : ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case "$XGETTEXT" in +@@ -17151,7 +16555,7 @@ 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 : ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -17282,6 +16686,7 @@ $as_echo "$LINGUAS" >&6; } + + + DBUS_GLIB_REQUIRED_VERSION=0.74 ++POLKIT_GOBJECT_REQUIRED_VERSION=0.92 + GLIB_REQUIRED_VERSION=2.27.4 + GTK_REQUIRED_VERSION=2.91.1 + PANGO_REQUIRED_VERSION=1.3.0 +@@ -17469,7 +16874,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables GTHREAD_CFLAGS + and GTHREAD_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; } +@@ -17484,8 +16888,7 @@ and GTHREAD_LIBS to avoid the need to ca + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS +@@ -17506,19 +16909,25 @@ if test -n "$COMMON_CFLAGS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_COMMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + " 2>/dev/null` + else + pkg_failed=yes +@@ -17531,19 +16940,25 @@ if test -n "$COMMON_LIBS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_COMMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + " 2>/dev/null` + else + pkg_failed=yes +@@ -17565,21 +16980,27 @@ else + fi + if test $_pkg_short_errors_supported = yes; then + COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + " 2>&1` + else + COMMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$COMMON_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION + ) were not met: + + $COMMON_PKG_ERRORS +@@ -17590,7 +17011,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables COMMON_CFLAGS + and COMMON_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; } +@@ -17605,8 +17025,7 @@ and COMMON_LIBS to avoid the need to cal + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + COMMON_CFLAGS=$pkg_cv_COMMON_CFLAGS + COMMON_LIBS=$pkg_cv_COMMON_LIBS +@@ -17627,11 +17046,13 @@ if test -n "$DAEMON_CFLAGS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17640,6 +17061,7 @@ if test -n "$DAEMON_CFLAGS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17655,11 +17077,13 @@ if test -n "$DAEMON_LIBS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= \$POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= \$GLIB_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION + accountsservice >= \$ACCOUNTS_SERVICE_REQUIRED_VERSION + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17668,6 +17092,7 @@ if test -n "$DAEMON_LIBS"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17692,12 +17117,14 @@ else + fi + if test $_pkg_short_errors_supported = yes; then + DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION + " 2>&1` + else + DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17707,6 +17134,7 @@ fi + echo "$DAEMON_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +@@ -17720,7 +17148,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables DAEMON_CFLAGS + and DAEMON_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; } +@@ -17735,8 +17162,7 @@ and DAEMON_LIBS to avoid the need to cal + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + DAEMON_CFLAGS=$pkg_cv_DAEMON_CFLAGS + DAEMON_LIBS=$pkg_cv_DAEMON_LIBS +@@ -17762,8 +17188,8 @@ if test "x$with_x" = xno; then + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( +- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : ++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # One or both of the vars are not set, and there is no cached value. +@@ -18097,7 +17523,7 @@ if ac_fn_c_try_link "$LINENO"; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18131,14 +17557,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18172,7 +17598,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + +@@ -18191,14 +17617,14 @@ rm -f core conftest.err conftest.$ac_obj + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + + fi + + if test $ac_cv_func_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_gethostbyname+:} false; then : ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18232,14 +17658,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_gethostbyname+:} false; then : ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18273,7 +17699,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -18288,14 +17714,14 @@ fi + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +-if test "x$ac_cv_func_connect" = xyes; then : ++if test "x$ac_cv_func_connect" = x""yes; then : + + fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 + $as_echo_n "checking for connect in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_connect+:} false; then : ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18329,7 +17755,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 + $as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = xyes; then : ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + +@@ -18337,14 +17763,14 @@ fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +-if test "x$ac_cv_func_remove" = xyes; then : ++if test "x$ac_cv_func_remove" = x""yes; then : + + fi + + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 + $as_echo_n "checking for remove in -lposix... " >&6; } +-if ${ac_cv_lib_posix_remove+:} false; then : ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18378,7 +17804,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 + $as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = xyes; then : ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + +@@ -18386,14 +17812,14 @@ fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +-if test "x$ac_cv_func_shmat" = xyes; then : ++if test "x$ac_cv_func_shmat" = x""yes; then : + + fi + + if test $ac_cv_func_shmat = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 + $as_echo_n "checking for shmat in -lipc... " >&6; } +-if ${ac_cv_lib_ipc_shmat+:} false; then : ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18427,7 +17853,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = xyes; then : ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -18445,7 +17871,7 @@ fi + # John Interrante, Karl Berry + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18479,7 +17905,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -18596,7 +18022,7 @@ if ac_fn_c_try_link "$LINENO"; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18630,14 +18056,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18671,7 +18097,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + +@@ -18690,14 +18116,14 @@ rm -f core conftest.err conftest.$ac_obj + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + + fi + + if test $ac_cv_func_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_gethostbyname+:} false; then : ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18731,14 +18157,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_gethostbyname+:} false; then : ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18772,7 +18198,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -18787,14 +18213,14 @@ fi + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +-if test "x$ac_cv_func_connect" = xyes; then : ++if test "x$ac_cv_func_connect" = x""yes; then : + + fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 + $as_echo_n "checking for connect in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_connect+:} false; then : ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18828,7 +18254,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 + $as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = xyes; then : ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + +@@ -18836,14 +18262,14 @@ fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +-if test "x$ac_cv_func_remove" = xyes; then : ++if test "x$ac_cv_func_remove" = x""yes; then : + + fi + + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 + $as_echo_n "checking for remove in -lposix... " >&6; } +-if ${ac_cv_lib_posix_remove+:} false; then : ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18877,7 +18303,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 + $as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = xyes; then : ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + +@@ -18885,14 +18311,14 @@ fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +-if test "x$ac_cv_func_shmat" = xyes; then : ++if test "x$ac_cv_func_shmat" = x""yes; then : + + fi + + if test $ac_cv_func_shmat = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 + $as_echo_n "checking for shmat in -lipc... " >&6; } +-if ${ac_cv_lib_ipc_shmat+:} false; then : ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18926,7 +18352,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = xyes; then : ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -18944,7 +18370,7 @@ fi + # John Interrante, Karl Berry + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -18978,7 +18404,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -19078,7 +18504,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables GTK_CFLAGS + and GTK_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details." "$LINENO" 5 +- + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -19093,8 +18518,7 @@ and GTK_LIBS to avoid the need to call p + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + GTK_CFLAGS=$pkg_cv_GTK_CFLAGS + GTK_LIBS=$pkg_cv_GTK_LIBS +@@ -19181,7 +18605,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS + and CANBERRA_GTK_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; } +@@ -19196,8 +18619,7 @@ and CANBERRA_GTK_LIBS to avoid the need + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS + CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS +@@ -19224,7 +18646,201 @@ if test -n "$GCONF_CFLAGS"; then + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GCONF_LIBS"; then ++ pkg_cv_GCONF_LIBS="$GCONF_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++" 2>&1` ++ else ++ GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GCONF_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED_VERSION ++) were not met: ++ ++$GCONF_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 GCONF_CFLAGS ++and GCONF_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 GCONF_CFLAGS ++and GCONF_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 ++ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS ++ GCONF_LIBS=$pkg_cv_GCONF_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ++ ++ ++gconf_defaultpath=`pkg-config gconf-2.0 --variable=gconf_defaultpath` ++ ++cat >>confdefs.h <<_ACEOF ++#define GCONF_DEFAULTPATH "$gconf_defaultpath" ++_ACEOF ++ ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5 ++$as_echo_n "checking for UPOWER... " >&6; } ++ ++if test -n "$UPOWER_CFLAGS"; then ++ pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$UPOWER_LIBS"; then ++ pkg_cv_UPOWER_LIBS="$UPOWER_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1` ++ else ++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$UPOWER_PKG_ERRORS" >&5 ++ ++ have_upower=no ++ ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_upower=no ++ ++else ++ UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS ++ UPOWER_LIBS=$pkg_cv_UPOWER_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_upower=yes ++fi ++if test "x$have_upower" = "xyes" ; then ++ ++$as_echo "#define HAVE_UPOWER /**/" >>confdefs.h ++ ++fi ++ ++ ++ ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDMSETUP" >&5 ++$as_echo_n "checking for GDMSETUP... " >&6; } ++ ++if test -n "$GDMSETUP_CFLAGS"; then ++ pkg_cv_GDMSETUP_CFLAGS="$GDMSETUP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= \$GTK_REQUIRED_VERSION ++ gmodule-2.0 ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 ++") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GDMSETUP_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + " 2>/dev/null` + else + pkg_failed=yes +@@ -19232,18 +18848,24 @@ fi + else + pkg_failed=untried + fi +-if test -n "$GCONF_LIBS"; then +- pkg_cv_GCONF_LIBS="$GCONF_LIBS" ++if test -n "$GDMSETUP_LIBS"; then ++ pkg_cv_GDMSETUP_LIBS="$GDMSETUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= \$GTK_REQUIRED_VERSION ++ gmodule-2.0 + \""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ pkg_cv_GDMSETUP_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + " 2>/dev/null` + else + pkg_failed=yes +@@ -19264,27 +18886,32 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ GDMSETUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + " 2>&1` + else +- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ GDMSETUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$GCONF_PKG_ERRORS" >&5 ++ echo "$GDMSETUP_PKG_ERRORS" >&5 + +- as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gtk+-3.0 >= $GTK_REQUIRED_VERSION ++ gmodule-2.0 + ) were not met: + +-$GCONF_PKG_ERRORS ++$GDMSETUP_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 GCONF_CFLAGS +-and GCONF_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables GDMSETUP_CFLAGS ++and GDMSETUP_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; } +@@ -19294,16 +18921,15 @@ as_fn_error $? "The pkg-config script co + 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 GCONF_CFLAGS +-and GCONF_LIBS to avoid the need to call pkg-config. ++Alternatively, you may set the environment variables GDMSETUP_CFLAGS ++and GDMSETUP_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; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else +- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS +- GCONF_LIBS=$pkg_cv_GCONF_LIBS ++ GDMSETUP_CFLAGS=$pkg_cv_GDMSETUP_CFLAGS ++ GDMSETUP_LIBS=$pkg_cv_GDMSETUP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +@@ -19311,44 +18937,49 @@ fi + + + +-gconf_defaultpath=`pkg-config gconf-2.0 --variable=gconf_defaultpath` +- +-cat >>confdefs.h <<_ACEOF +-#define GCONF_DEFAULTPATH "$gconf_defaultpath" +-_ACEOF +- +- + + pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5 +-$as_echo_n "checking for UPOWER... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SET_SESSION" >&5 ++$as_echo_n "checking for SET_SESSION... " >&6; } + +-if test -n "$UPOWER_CFLAGS"; then +- pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS" ++if test -n "$SET_SESSION_CFLAGS"; then ++ pkg_cv_SET_SESSION_CFLAGS="$SET_SESSION_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null` ++ pkg_cv_SET_SESSION_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++" 2>/dev/null` + else + pkg_failed=yes + fi + else + pkg_failed=untried + fi +-if test -n "$UPOWER_LIBS"; then +- pkg_cv_UPOWER_LIBS="$UPOWER_LIBS" ++if test -n "$SET_SESSION_LIBS"; then ++ pkg_cv_SET_SESSION_LIBS="$SET_SESSION_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null` ++ pkg_cv_SET_SESSION_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -19368,37 +18999,55 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1` ++ SET_SESSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++" 2>&1` + else +- UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1` ++ SET_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++" 2>&1` + fi + # Put the nasty error message in config.log where it belongs +- echo "$UPOWER_PKG_ERRORS" >&5 ++ echo "$SET_SESSION_PKG_ERRORS" >&5 + +- have_upower=no ++ as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ++ gobject-2.0 >= $GLIB_REQUIRED_VERSION ++) were not met: ++ ++$SET_SESSION_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 SET_SESSION_CFLAGS ++and SET_SESSION_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; } +- have_upower=no ++ { { $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 SET_SESSION_CFLAGS ++and SET_SESSION_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 +- UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS +- UPOWER_LIBS=$pkg_cv_UPOWER_LIBS ++ SET_SESSION_CFLAGS=$pkg_cv_SET_SESSION_CFLAGS ++ SET_SESSION_LIBS=$pkg_cv_SET_SESSION_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_upower=yes +-fi +-if test "x$have_upower" = "xyes" ; then +- +-$as_echo "#define HAVE_UPOWER /**/" >>confdefs.h + + fi + + + + +- + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIMPLE_GREETER" >&5 + $as_echo_n "checking for SIMPLE_GREETER... " >&6; } +@@ -19519,7 +19168,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables SIMPLE_GREETER_CFLAGS + and SIMPLE_GREETER_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; } +@@ -19534,8 +19182,7 @@ and SIMPLE_GREETER_LIBS to avoid the nee + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + SIMPLE_GREETER_CFLAGS=$pkg_cv_SIMPLE_GREETER_CFLAGS + SIMPLE_GREETER_LIBS=$pkg_cv_SIMPLE_GREETER_LIBS +@@ -19727,7 +19374,6 @@ installed software in a non-standard pre + Alternatively, you may set the environment variables SIMPLE_CHOOSER_CFLAGS + and SIMPLE_CHOOSER_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; } +@@ -19742,8 +19388,7 @@ and SIMPLE_CHOOSER_LIBS to avoid the nee + See the pkg-config man page for more details. + + To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +- ++See \`config.log' for more details" "$LINENO" 5 ; } + else + SIMPLE_CHOOSER_CFLAGS=$pkg_cv_SIMPLE_CHOOSER_CFLAGS + SIMPLE_CHOOSER_LIBS=$pkg_cv_SIMPLE_CHOOSER_LIBS +@@ -19761,7 +19406,7 @@ PLUGIN_LIBTOOL_FLAGS="-export_dynamic -m + set dummy glib-genmarshal; 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_GLIB_GENMARSHAL+:} false; then : ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GLIB_GENMARSHAL in +@@ -19897,7 +19542,7 @@ if ac_fn_c_try_link "$LINENO"; then : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -19931,14 +19576,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 + $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -19972,7 +19617,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : ++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + +@@ -19991,14 +19636,14 @@ rm -f core conftest.err conftest.$ac_obj + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + + fi + + if test $ac_cv_func_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_gethostbyname+:} false; then : ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20032,14 +19677,14 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 + $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_gethostbyname+:} false; then : ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20073,7 +19718,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 + $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -20088,14 +19733,14 @@ fi + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +-if test "x$ac_cv_func_connect" = xyes; then : ++if test "x$ac_cv_func_connect" = x""yes; then : + + fi + + if test $ac_cv_func_connect = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 + $as_echo_n "checking for connect in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_connect+:} false; then : ++if test "${ac_cv_lib_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20129,7 +19774,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 + $as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = xyes; then : ++if test "x$ac_cv_lib_socket_connect" = x""yes; then : + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + +@@ -20137,14 +19782,14 @@ fi + + # Guillermo Gomez says -lposix is necessary on A/UX. + ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +-if test "x$ac_cv_func_remove" = xyes; then : ++if test "x$ac_cv_func_remove" = x""yes; then : + + fi + + if test $ac_cv_func_remove = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 + $as_echo_n "checking for remove in -lposix... " >&6; } +-if ${ac_cv_lib_posix_remove+:} false; then : ++if test "${ac_cv_lib_posix_remove+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20178,7 +19823,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 + $as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = xyes; then : ++if test "x$ac_cv_lib_posix_remove" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + +@@ -20186,14 +19831,14 @@ fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +-if test "x$ac_cv_func_shmat" = xyes; then : ++if test "x$ac_cv_func_shmat" = x""yes; then : + + fi + + if test $ac_cv_func_shmat = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 + $as_echo_n "checking for shmat in -lipc... " >&6; } +-if ${ac_cv_lib_ipc_shmat+:} false; then : ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20227,7 +19872,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 + $as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = xyes; then : ++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -20245,7 +19890,7 @@ fi + # John Interrante, Karl Berry + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 + $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20279,7 +19924,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : ++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -20371,7 +20016,7 @@ fi + set dummy gconftool-2; 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_GCONFTOOL+:} false; then : ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $GCONFTOOL in +@@ -20445,7 +20090,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a + if test "${enable_schemas_install+set}" = set; then : + enableval=$enable_schemas_install; case ${enableval} in + yes|no) ;; +- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; ++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + esac + fi + +@@ -20617,7 +20262,7 @@ fi + for ac_header in stropts.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" +-if test "x$ac_cv_header_stropts_h" = xyes; then : ++if test "x$ac_cv_header_stropts_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_STROPTS_H 1 + _ACEOF +@@ -20630,7 +20275,7 @@ done + for ac_header in sys/socket.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_socket_h" = xyes; then : ++if test "x$ac_cv_header_sys_socket_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SYS_SOCKET_H 1 + _ACEOF +@@ -20645,7 +20290,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t" + #endif + + " +-if test "x$ac_cv_type_socklen_t" = xyes; then : ++if test "x$ac_cv_type_socklen_t" = x""yes; then : + + else + +@@ -20656,7 +20301,7 @@ fi + for ac_header in sys/sockio.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sockio_h" = xyes; then : ++if test "x$ac_cv_header_sys_sockio_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SYS_SOCKIO_H 1 + _ACEOF +@@ -20681,7 +20326,7 @@ done + for ac_header in crt_externs.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" +-if test "x$ac_cv_header_crt_externs_h" = xyes; then : ++if test "x$ac_cv_header_crt_externs_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_CRT_EXTERNS_H 1 + _ACEOF +@@ -20693,7 +20338,7 @@ done + for ac_func in _NSGetEnviron + do : + ac_fn_c_check_func "$LINENO" "_NSGetEnviron" "ac_cv_func__NSGetEnviron" +-if test "x$ac_cv_func__NSGetEnviron" = xyes; then : ++if test "x$ac_cv_func__NSGetEnviron" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE__NSGETENVIRON 1 + _ACEOF +@@ -20713,13 +20358,13 @@ EXTRA_TEST_LIBS="" + EXTRA_GREETER_LIBS="" + + ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" +-if test "x$ac_cv_func_socket" = xyes; then : ++if test "x$ac_cv_func_socket" = x""yes; then : + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 + $as_echo_n "checking for socket in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_socket+:} false; then : ++if test "${ac_cv_lib_socket_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20753,7 +20398,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 + $as_echo "$ac_cv_lib_socket_socket" >&6; } +-if test "x$ac_cv_lib_socket_socket" = xyes; then : ++if test "x$ac_cv_lib_socket_socket" = x""yes; then : + + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket" + EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lsocket" +@@ -20768,13 +20413,13 @@ fi + fi + + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 + $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_gethostbyname+:} false; then : ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20808,7 +20453,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 + $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : ++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : + + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl" + EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lnsl" +@@ -20820,7 +20465,7 @@ fi + + ac_fn_c_check_decl "$LINENO" "HOST_NAME_MAX" "ac_cv_have_decl_HOST_NAME_MAX" "#include + " +-if test "x$ac_cv_have_decl_HOST_NAME_MAX" = xyes; then : ++if test "x$ac_cv_have_decl_HOST_NAME_MAX" = x""yes; then : + + else + +@@ -20835,7 +20480,7 @@ ac_fn_c_check_decl () + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 + $as_echo_n "checking whether $as_decl_name is declared... " >&6; } +-if eval \${$3+:} false; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -20866,12 +20511,12 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_decl + ac_fn_c_check_decl "$LINENO" "_POSIX_HOST_NAME_MAX" "ac_cv_have_decl__POSIX_HOST_NAME_MAX" "#include + " +-if test "x$ac_cv_have_decl__POSIX_HOST_NAME_MAX" = xyes; then : ++if test "x$ac_cv_have_decl__POSIX_HOST_NAME_MAX" = x""yes; then : + $as_echo "#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX" >>confdefs.h + + else +@@ -20883,7 +20528,7 @@ fi + fi + + ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" +-if test "x$ac_cv_func_sched_yield" = xyes; then : ++if test "x$ac_cv_func_sched_yield" = x""yes; then : + + + $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h +@@ -20892,7 +20537,7 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5 + $as_echo_n "checking for sched_yield in -lrt... " >&6; } +-if ${ac_cv_lib_rt_sched_yield+:} false; then : ++if test "${ac_cv_lib_rt_sched_yield+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20926,7 +20571,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5 + $as_echo "$ac_cv_lib_rt_sched_yield" >&6; } +-if test "x$ac_cv_lib_rt_sched_yield" = xyes; then : ++if test "x$ac_cv_lib_rt_sched_yield" = x""yes; then : + + + $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h +@@ -20940,13 +20585,13 @@ fi + fi + + ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" +-if test "x$ac_cv_func_inet_aton" = xyes; then : ++if test "x$ac_cv_func_inet_aton" = x""yes; then : + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 + $as_echo_n "checking for inet_aton in -lresolv... " >&6; } +-if ${ac_cv_lib_resolv_inet_aton+:} false; then : ++if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20980,7 +20625,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 + $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } +-if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : ++if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then : + + EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lresolv" + fi +@@ -20991,7 +20636,7 @@ fi + + mkdtemp_missing=false + ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" +-if test "x$ac_cv_func_mkdtemp" = xyes; then : ++if test "x$ac_cv_func_mkdtemp" = x""yes; then : + + $as_echo "#define HAVE_MKDTEMP 1" >>confdefs.h + +@@ -21047,7 +20692,7 @@ rm -f core conftest.err conftest.$ac_obj + have_getaddrinfo=no + have_inet_ntop=no + ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" +-if test "x$ac_cv_func_getaddrinfo" = xyes; then : ++if test "x$ac_cv_func_getaddrinfo" = x""yes; then : + have_getaddrinfo=yes + fi + +@@ -21056,7 +20701,7 @@ fi + as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo in -l$lib" >&5 + $as_echo_n "checking for getaddrinfo in -l$lib... " >&6; } +-if eval \${$as_ac_Lib+:} false; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21099,7 +20744,7 @@ fi + fi + + ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +-if test "x$ac_cv_func_inet_ntop" = xyes; then : ++if test "x$ac_cv_func_inet_ntop" = x""yes; then : + have_inet_ntop=yes + fi + +@@ -21108,7 +20753,7 @@ fi + as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_inet_ntop" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntop in -l$lib" >&5 + $as_echo_n "checking for inet_ntop in -l$lib... " >&6; } +-if eval \${$as_ac_Lib+:} false; then : ++if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21235,7 +20880,7 @@ fi + have_pam=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 + $as_echo_n "checking for pam_start in -lpam... " >&6; } +-if ${ac_cv_lib_pam_pam_start+:} false; then : ++if test "${ac_cv_lib_pam_pam_start+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21269,7 +20914,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 + $as_echo "$ac_cv_lib_pam_pam_start" >&6; } +-if test "x$ac_cv_lib_pam_pam_start" = xyes; then : ++if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : + have_pam=yes + fi + +@@ -21297,7 +20942,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_syslog in -lpam" >&5 + $as_echo_n "checking for pam_syslog in -lpam... " >&6; } +-if ${ac_cv_lib_pam_pam_syslog+:} false; then : ++if test "${ac_cv_lib_pam_pam_syslog+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21331,7 +20976,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_syslog" >&5 + $as_echo "$ac_cv_lib_pam_pam_syslog" >&6; } +-if test "x$ac_cv_lib_pam_pam_syslog" = xyes; then : ++if test "x$ac_cv_lib_pam_pam_syslog" = x""yes; then : + + $as_echo "#define HAVE_PAM_SYSLOG /**/" >>confdefs.h + +@@ -21413,7 +21058,7 @@ fi + # Can we use BSD's setusercontext + # + ac_fn_c_check_header_mongrel "$LINENO" "login_cap.h" "ac_cv_header_login_cap_h" "$ac_includes_default" +-if test "x$ac_cv_header_login_cap_h" = xyes; then : ++if test "x$ac_cv_header_login_cap_h" = x""yes; then : + + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil" + +@@ -21429,7 +21074,7 @@ fi + for ac_header in sys/sockio.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sockio_h" = xyes; then : ++if test "x$ac_cv_header_sys_sockio_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SYS_SOCKIO_H 1 + _ACEOF +@@ -21448,7 +21093,7 @@ done + for ac_header in libgen.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +-if test "x$ac_cv_header_libgen_h" = xyes; then : ++if test "x$ac_cv_header_libgen_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBGEN_H 1 + _ACEOF +@@ -21477,7 +21122,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix getpwnam_r" >&5 + $as_echo_n "checking for posix getpwnam_r... " >&6; } +-if ${ac_cv_func_posix_getpwnam_r+:} false; then : ++if test "${ac_cv_func_posix_getpwnam_r+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -21534,7 +21179,7 @@ $as_echo "#define HAVE_POSIX_GETPWNAM_R + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nonposix getpwnam_r" >&5 + $as_echo_n "checking for nonposix getpwnam_r... " >&6; } +-if ${ac_cv_func_nonposix_getpwnam_r+:} false; then : ++if test "${ac_cv_func_nonposix_getpwnam_r+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -21597,7 +21242,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5 + $as_echo_n "checking for login in -lutil... " >&6; } +-if ${ac_cv_lib_util_login+:} false; then : ++if test "${ac_cv_lib_util_login+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21631,7 +21276,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_login" >&5 + $as_echo "$ac_cv_lib_util_login" >&6; } +-if test "x$ac_cv_lib_util_login" = xyes; then : ++if test "x$ac_cv_lib_util_login" = x""yes; then : + + + $as_echo "#define HAVE_LOGIN 1" >>confdefs.h +@@ -21641,7 +21286,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5 + $as_echo_n "checking for logout in -lutil... " >&6; } +-if ${ac_cv_lib_util_logout+:} false; then : ++if test "${ac_cv_lib_util_logout+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21675,7 +21320,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logout" >&5 + $as_echo "$ac_cv_lib_util_logout" >&6; } +-if test "x$ac_cv_lib_util_logout" = xyes; then : ++if test "x$ac_cv_lib_util_logout" = x""yes; then : + + + $as_echo "#define HAVE_LOGOUT 1" >>confdefs.h +@@ -21685,7 +21330,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5 + $as_echo_n "checking for logwtmp in -lutil... " >&6; } +-if ${ac_cv_lib_util_logwtmp+:} false; then : ++if test "${ac_cv_lib_util_logwtmp+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -21719,7 +21364,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logwtmp" >&5 + $as_echo "$ac_cv_lib_util_logwtmp" >&6; } +-if test "x$ac_cv_lib_util_logwtmp" = xyes; then : ++if test "x$ac_cv_lib_util_logwtmp" = x""yes; then : + + + $as_echo "#define HAVE_LOGWTMP 1" >>confdefs.h +@@ -21744,7 +21389,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 + $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +-if ${ac_cv_header_time+:} false; then : ++if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -22250,11 +21895,11 @@ if test x$with_xdmcp != xno ; then + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + ac_fn_c_check_header_compile "$LINENO" "X11/Xdmcp.h" "ac_cv_header_X11_Xdmcp_h" "#include + " +-if test "x$ac_cv_header_X11_Xdmcp_h" = xyes; then : ++if test "x$ac_cv_header_X11_Xdmcp_h" = x""yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpFlush in -lXdmcp" >&5 + $as_echo_n "checking for XdmcpFlush in -lXdmcp... " >&6; } +-if ${ac_cv_lib_Xdmcp_XdmcpFlush+:} false; then : ++if test "${ac_cv_lib_Xdmcp_XdmcpFlush+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22288,7 +21933,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpFlush" >&5 + $as_echo "$ac_cv_lib_Xdmcp_XdmcpFlush" >&6; } +-if test "x$ac_cv_lib_Xdmcp_XdmcpFlush" = xyes; then : ++if test "x$ac_cv_lib_Xdmcp_XdmcpFlush" = x""yes; then : + + + $as_echo "#define HAVE_LIBXDMCP 1" >>confdefs.h +@@ -22390,7 +22035,7 @@ $as_echo "#define HAVE_TCPWRAPPERS 1" >> + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hosts_ctl in -lwrap" >&5 + $as_echo_n "checking for hosts_ctl in -lwrap... " >&6; } +-if ${ac_cv_lib_wrap_hosts_ctl+:} false; then : ++if test "${ac_cv_lib_wrap_hosts_ctl+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22424,7 +22069,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_hosts_ctl" >&5 + $as_echo "$ac_cv_lib_wrap_hosts_ctl" >&6; } +-if test "x$ac_cv_lib_wrap_hosts_ctl" = xyes; then : ++if test "x$ac_cv_lib_wrap_hosts_ctl" = x""yes; then : + + LIBWRAP_LIBS="-lwrap" + LIBWRAP_PATH=auto +@@ -22524,7 +22169,7 @@ fi + have_xinput= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5 + $as_echo_n "checking for XOpenDevice in -lXi... " >&6; } +-if ${ac_cv_lib_Xi_XOpenDevice+:} false; then : ++if test "${ac_cv_lib_Xi_XOpenDevice+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22558,7 +22203,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xi_XOpenDevice" >&5 + $as_echo "$ac_cv_lib_Xi_XOpenDevice" >&6; } +-if test "x$ac_cv_lib_Xi_XOpenDevice" = xyes; then : ++if test "x$ac_cv_lib_Xi_XOpenDevice" = x""yes; then : + XINPUT_LIBS=-lXi + fi + +@@ -22601,7 +22246,7 @@ rm -f core conftest.err conftest.$ac_obj + fi + fi + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/XInput.h" "ac_cv_header_X11_extensions_XInput_h" "$ac_includes_default" +-if test "x$ac_cv_header_X11_extensions_XInput_h" = xyes; then : ++if test "x$ac_cv_header_X11_extensions_XInput_h" = x""yes; then : + have_xinput=yes + fi + +@@ -22627,7 +22272,7 @@ if test ! x$with_xinerama = xno ; then + use_xfree_xinerama=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryExtension in -lXinerama" >&5 + $as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +-if ${ac_cv_lib_Xinerama_XineramaQueryExtension+:} false; then : ++if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22661,10 +22306,10 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 + $as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +-if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = xyes; then : ++if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#include + " +-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes; then : ++if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : + if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then + X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS" + fi +@@ -22696,7 +22341,7 @@ $as_echo "$use_xfree_xinerama" >&6; }; + use_solaris_xinerama=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaGetInfo in -lXext" >&5 + $as_echo_n "checking for XineramaGetInfo in -lXext... " >&6; } +-if ${ac_cv_lib_Xext_XineramaGetInfo+:} false; then : ++if test "${ac_cv_lib_Xext_XineramaGetInfo+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22730,7 +22375,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XineramaGetInfo" >&5 + $as_echo "$ac_cv_lib_Xext_XineramaGetInfo" >&6; } +-if test "x$ac_cv_lib_Xext_XineramaGetInfo" = xyes; then : ++if test "x$ac_cv_lib_Xext_XineramaGetInfo" = x""yes; then : + use_solaris_xinerama=yes + else + use_solaris_xinerama=no +@@ -22739,7 +22384,7 @@ fi + if test "x$use_solaris_xinerama" = "xyes"; then + ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xinerama.h" "ac_cv_header_X11_extensions_xinerama_h" "#include + " +-if test "x$ac_cv_header_X11_extensions_xinerama_h" = xyes; then : ++if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then : + if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then + X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS" + fi +@@ -22777,20 +22422,20 @@ if test "x$with_selinux" = "xyes" ; then + LDFLAGS="$LDFLAGS -L/usr/local/selinux/lib" + fi + ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" +-if test "x$ac_cv_header_selinux_selinux_h" = xyes; then : ++if test "x$ac_cv_header_selinux_selinux_h" = x""yes; then : + + fi + + + ac_fn_c_check_header_mongrel "$LINENO" "selinux/get_context_list.h" "ac_cv_header_selinux_get_context_list_h" "$ac_includes_default" +-if test "x$ac_cv_header_selinux_get_context_list_h" = xyes; then : ++if test "x$ac_cv_header_selinux_get_context_list_h" = x""yes; then : + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for attr_get in -lattr" >&5 + $as_echo_n "checking for attr_get in -lattr... " >&6; } +-if ${ac_cv_lib_attr_attr_get+:} false; then : ++if test "${ac_cv_lib_attr_attr_get+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22824,7 +22469,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_attr_get" >&5 + $as_echo "$ac_cv_lib_attr_attr_get" >&6; } +-if test "x$ac_cv_lib_attr_attr_get" = xyes; then : ++if test "x$ac_cv_lib_attr_attr_get" = x""yes; then : + /bin/true + fi + +@@ -22832,7 +22477,7 @@ fi + # so I check for all the ones we use + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_ordered_context_list in -lselinux" >&5 + $as_echo_n "checking for get_ordered_context_list in -lselinux... " >&6; } +-if ${ac_cv_lib_selinux_get_ordered_context_list+:} false; then : ++if test "${ac_cv_lib_selinux_get_ordered_context_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22866,13 +22511,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_get_ordered_context_list" >&5 + $as_echo "$ac_cv_lib_selinux_get_ordered_context_list" >&6; } +-if test "x$ac_cv_lib_selinux_get_ordered_context_list" = xyes; then : ++if test "x$ac_cv_lib_selinux_get_ordered_context_list" = x""yes; then : + /bin/true + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freecon in -lselinux" >&5 + $as_echo_n "checking for freecon in -lselinux... " >&6; } +-if ${ac_cv_lib_selinux_freecon+:} false; then : ++if test "${ac_cv_lib_selinux_freecon+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22906,13 +22551,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_freecon" >&5 + $as_echo "$ac_cv_lib_selinux_freecon" >&6; } +-if test "x$ac_cv_lib_selinux_freecon" = xyes; then : ++if test "x$ac_cv_lib_selinux_freecon" = x""yes; then : + /bin/true + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freeconary in -lselinux" >&5 + $as_echo_n "checking for freeconary in -lselinux... " >&6; } +-if ${ac_cv_lib_selinux_freeconary+:} false; then : ++if test "${ac_cv_lib_selinux_freeconary+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22946,13 +22591,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_freeconary" >&5 + $as_echo "$ac_cv_lib_selinux_freeconary" >&6; } +-if test "x$ac_cv_lib_selinux_freeconary" = xyes; then : ++if test "x$ac_cv_lib_selinux_freeconary" = x""yes; then : + /bin/true + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setexeccon in -lselinux" >&5 + $as_echo_n "checking for setexeccon in -lselinux... " >&6; } +-if ${ac_cv_lib_selinux_setexeccon+:} false; then : ++if test "${ac_cv_lib_selinux_setexeccon+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -22986,13 +22631,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_setexeccon" >&5 + $as_echo "$ac_cv_lib_selinux_setexeccon" >&6; } +-if test "x$ac_cv_lib_selinux_setexeccon" = xyes; then : ++if test "x$ac_cv_lib_selinux_setexeccon" = x""yes; then : + /bin/true + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5 + $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; } +-if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then : ++if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23026,7 +22671,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 + $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } +-if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then : ++if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then : + /bin/true + fi + +@@ -23122,7 +22767,7 @@ fi + for ac_header in execinfo.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default" +-if test "x$ac_cv_header_execinfo_h" = xyes; then : ++if test "x$ac_cv_header_execinfo_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_EXECINFO_H 1 + _ACEOF +@@ -23136,7 +22781,7 @@ done + for ac_header in sys/prctl.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/prctl.h" "ac_cv_header_sys_prctl_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_prctl_h" = xyes; then : ++if test "x$ac_cv_header_sys_prctl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SYS_PRCTL_H 1 + _ACEOF +@@ -23169,6 +22814,21 @@ fi + logdir=$GDM_LOG_DIR + + ++ ++# Check whether --with-cache-dir was given. ++if test "${with_cache_dir+set}" = set; then : ++ withval=$with_cache_dir; ++fi ++ ++ ++if ! test -z "$with_cache_dir"; then ++ GDM_CACHE_DIR=$with_cache_dir ++else ++ GDM_CACHE_DIR=/var/cache/gdm ++fi ++cachedir=$GDM_CACHE_DIR ++ ++ + withval="" + + # Check whether --with-at-bindir was given. +@@ -23311,7 +22971,7 @@ else + # See if we have audit daemon library + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_log_user_message in -laudit" >&5 + $as_echo_n "checking for audit_log_user_message in -laudit... " >&6; } +-if ${ac_cv_lib_audit_audit_log_user_message+:} false; then : ++if test "${ac_cv_lib_audit_audit_log_user_message+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23345,7 +23005,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_log_user_message" >&5 + $as_echo "$ac_cv_lib_audit_audit_log_user_message" >&6; } +-if test "x$ac_cv_lib_audit_audit_log_user_message" = xyes; then : ++if test "x$ac_cv_lib_audit_audit_log_user_message" = x""yes; then : + have_libaudit=yes + else + have_libaudit=no +@@ -23386,7 +23046,7 @@ fi + # + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for di_devperm_login in -ldevinfo" >&5 + $as_echo_n "checking for di_devperm_login in -ldevinfo... " >&6; } +-if ${ac_cv_lib_devinfo_di_devperm_login+:} false; then : ++if test "${ac_cv_lib_devinfo_di_devperm_login+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23420,7 +23080,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_devinfo_di_devperm_login" >&5 + $as_echo "$ac_cv_lib_devinfo_di_devperm_login" >&6; } +-if test "x$ac_cv_lib_devinfo_di_devperm_login" = xyes; then : ++if test "x$ac_cv_lib_devinfo_di_devperm_login" = x""yes; then : + + $as_echo "#define HAVE_LOGINDEVPERM 1" >>confdefs.h + +@@ -23489,12 +23149,9 @@ elif test -x /usr/bin/X; then + X_SERVER="/usr/bin/X" + X_CONFIG_OPTIONS="-audit 0" + else +- # what to do, what to do, this is wrong, but this just sets the +- # defaults, perhaps this user is cross compiling or some such +- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" ++ X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" + X_SERVER="/usr/bin/X" +- X_CONFIG_OPTIONS="-audit 0" + fi + + +@@ -23962,7 +23619,7 @@ _ACEOF + #AC_SUBST(DEBIAN_DATESTAMP) + #AC_SUBST(DEBIAN_DATE) + +-ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/simple-greeter/Makefile gui/simple-chooser/Makefile utils/Makefile data/gdm.conf data/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile" ++ac_config_files="$ac_config_files Makefile daemon/Makefile docs/Makefile gui/Makefile gui/gdmsetup/Makefile gui/simple-greeter/Makefile gui/simple-chooser/Makefile utils/Makefile data/gdm.conf data/Makefile data/greeter-autostart/Makefile data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/pixmaps/Makefile data/pixmaps/16x16/Makefile data/pixmaps/32x32/Makefile data/pixmaps/48x48/Makefile common/Makefile po/Makefile.in tests/Makefile" + + + cat >confcache <<\_ACEOF +@@ -24029,21 +23686,10 @@ $as_echo "$as_me: WARNING: cache variabl + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- if test "x$cache_file" != "x/dev/null"; then ++ test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- if test ! -f "$cache_file" || test -h "$cache_file"; then +- cat confcache >"$cache_file" +- else +- case $cache_file in #( +- */* | ?:*) +- mv -f confcache "$cache_file"$$ && +- mv -f "$cache_file"$$ "$cache_file" ;; #( +- *) +- mv -f confcache "$cache_file" ;; +- esac +- fi +- fi ++ cat confcache >$cache_file + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +@@ -24098,6 +23744,10 @@ if test -z "${am__fastdepCXX_TRUE}" && t + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + + ac_config_commands="$ac_config_commands po/stamp-it" + +@@ -24151,7 +23801,7 @@ if test -z "${HAVE_LIBAUDIT_TRUE}" && te + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + +-: "${CONFIG_STATUS=./config.status}" ++: ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -24252,7 +23902,6 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -24560,7 +24209,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # values after options handling. + ac_log=" + This file was extended by gdm $as_me 2.91.94, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -24626,7 +24275,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + gdm config.status 2.91.94 +-configured by $0, generated by GNU Autoconf 2.68, ++configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" + + Copyright (C) 2010 Free Software Foundation, Inc. +@@ -24754,208 +24403,184 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac + sed_quote_subst='$sed_quote_subst' + double_quote_subst='$double_quote_subst' + delay_variable_subst='$delay_variable_subst' +-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +-enable_static='`$ECHO "$enable_static" | $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"`' +-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +-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_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"`' +-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +-lt_sysroot='`$ECHO "$lt_sysroot" | $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"`' +-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +-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"`' +-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"`' +-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' ++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' ++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' ++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' ++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' ++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' ++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' ++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' ++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' ++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' ++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' ++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' ++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' ++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' ++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' ++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' ++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' ++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' ++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' ++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' ++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' ++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' ++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' ++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' ++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' ++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' ++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' ++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' + + LTCC='$LTCC' + LTCFLAGS='$LTCFLAGS' + compiler='$compiler_DEFAULT' + +-# 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 SHELL \ +-ECHO \ +-SED \ ++for var in SED \ + GREP \ + EGREP \ + FGREP \ +@@ -24968,13 +24593,8 @@ reload_flag \ + OBJDUMP \ + deplibs_check_method \ + file_magic_cmd \ +-file_magic_glob \ +-want_nocaseglob \ +-DLLTOOL \ +-sharedlib_from_linklib_cmd \ + AR \ + AR_FLAGS \ +-archiver_list_spec \ + STRIP \ + RANLIB \ + CC \ +@@ -24984,14 +24604,14 @@ lt_cv_sys_global_symbol_pipe \ + lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +-nm_file_list_spec \ ++SHELL \ ++ECHO \ + lt_prog_compiler_no_builtin_flag \ +-lt_prog_compiler_pic \ + lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ + lt_prog_compiler_static \ + lt_cv_prog_compiler_c_o \ + need_locks \ +-MANIFEST_TOOL \ + DSYMUTIL \ + NMEDIT \ + LIPO \ +@@ -25007,6 +24627,7 @@ no_undefined_flag \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ ++fix_srcfile_path \ + exclude_expsyms \ + include_expsyms \ + file_list_spec \ +@@ -25014,7 +24635,6 @@ variables_saved_for_relink \ + libname_spec \ + library_names_spec \ + soname_spec \ +-install_override_mode \ + finish_eval \ + old_striplib \ + striplib \ +@@ -25025,11 +24645,10 @@ predeps \ + postdeps \ + compiler_lib_search_path \ + LD_CXX \ +-reload_flag_CXX \ + compiler_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ +-lt_prog_compiler_pic_CXX \ + lt_prog_compiler_wl_CXX \ ++lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + export_dynamic_flag_spec_CXX \ +@@ -25041,6 +24660,7 @@ no_undefined_flag_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ ++fix_srcfile_path_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX \ + file_list_spec_CXX \ +@@ -25050,9 +24670,9 @@ postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX; do +- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -25074,13 +24694,11 @@ module_cmds \ + module_expsym_cmds \ + export_symbols_cmds \ + prelink_cmds \ +-postlink_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + finish_cmds \ + sys_lib_search_path_spec \ + sys_lib_dlsearch_path_spec \ +-reload_cmds_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ +@@ -25089,11 +24707,10 @@ archive_expsym_cmds_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + export_symbols_cmds_CXX \ +-prelink_cmds_CXX \ +-postlink_cmds_CXX; do +- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++prelink_cmds_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in + *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +@@ -25101,6 +24718,12 @@ postlink_cmds_CXX; do + esac + done + ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` ++ ;; ++esac ++ + ac_aux_dir='$ac_aux_dir' + xsi_shell='$xsi_shell' + lt_shell_append='$lt_shell_append' +@@ -25140,6 +24763,7 @@ do + "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;; ++ "gui/gdmsetup/Makefile") CONFIG_FILES="$CONFIG_FILES gui/gdmsetup/Makefile" ;; + "gui/simple-greeter/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-greeter/Makefile" ;; + "gui/simple-chooser/Makefile") CONFIG_FILES="$CONFIG_FILES gui/simple-chooser/Makefile" ;; + "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; +@@ -25156,7 +24780,7 @@ do + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; + +- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + esac + done + +@@ -25179,10 +24803,9 @@ fi + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ac_tmp= ++ tmp= + trap 'exit_status=$? +- : "${ac_tmp:=$tmp}" +- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -25190,13 +24813,12 @@ $debug || + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -d "$tmp" ++ test -n "$tmp" && test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") + } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +-ac_tmp=$tmp + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -25218,7 +24840,7 @@ else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$ac_tmp/subs1.awk" && ++echo 'BEGIN {' >"$tmp/subs1.awk" && + _ACEOF + + +@@ -25246,7 +24868,7 @@ done + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -25294,7 +24916,7 @@ t delim + rm -f conf$$subs.awk + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + _ACAWK +-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && ++cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +@@ -25326,7 +24948,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + _ACEOF + +@@ -25360,7 +24982,7 @@ fi # test -n "$CONFIG_FILES" + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$ac_tmp/defines.awk" <<\_ACAWK || ++cat >"$tmp/defines.awk" <<\_ACAWK || + BEGIN { + _ACEOF + +@@ -25372,8 +24994,8 @@ _ACEOF + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_tt=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_tt"; then ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 +@@ -25474,7 +25096,7 @@ do + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -25493,7 +25115,7 @@ do + for ac_f + do + case $ac_f in +- -) ac_f="$ac_tmp/stdin";; ++ -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -25502,7 +25124,7 @@ do + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" +@@ -25528,8 +25150,8 @@ $as_echo "$as_me: creating $ac_file" >&6 + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$ac_tmp/stdin" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -25665,22 +25287,21 @@ s&@INSTALL@&$ac_INSTALL&;t t + s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ +- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ +- "$ac_tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined" >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined" >&2;} + +- rm -f "$ac_tmp/stdin" ++ rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; +- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; ++ -) cat "$tmp/out" && rm -f "$tmp/out";; ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; +@@ -25691,20 +25312,20 @@ which seems to be undefined. Please mak + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" +- } >"$ac_tmp/config.h" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$ac_tmp/config.h" "$ac_file" \ ++ mv "$tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. +@@ -25866,8 +25487,7 @@ $as_echo X"$file" | + # NOTE: Changes made to this file will be lost: look at ltmain.sh. + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +-# Inc. ++# 2006, 2007, 2008 Free Software Foundation, Inc. + # Written by Gordon Matzigkeit, 1996 + # + # This file is part of GNU Libtool. +@@ -25915,12 +25535,6 @@ pic_mode=$pic_mode + # Whether or not to optimize for fast installation. + fast_install=$enable_fast_install + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# An echo program that protects backslashes. +-ECHO=$lt_ECHO +- + # The host system. + host_alias=$host_alias + host=$host +@@ -25970,11 +25584,9 @@ SP2NL=$lt_lt_SP2NL + # turn newlines into spaces. + NL2SP=$lt_lt_NL2SP + +-# convert \$build file names to \$host format. +-to_host_file_cmd=$lt_cv_to_host_file_cmd +- +-# convert \$build files to toolchain format. +-to_tool_file_cmd=$lt_cv_to_tool_file_cmd ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds + + # An object symbol dumper. + OBJDUMP=$lt_OBJDUMP +@@ -25982,30 +25594,13 @@ OBJDUMP=$lt_OBJDUMP + # Method to check whether dependent libraries are shared objects. + deplibs_check_method=$lt_deplibs_check_method + +-# Command to use when deplibs_check_method = "file_magic". ++# Command to use when deplibs_check_method == "file_magic". + file_magic_cmd=$lt_file_magic_cmd + +-# How to find potential files when deplibs_check_method = "file_magic". +-file_magic_glob=$lt_file_magic_glob +- +-# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +-want_nocaseglob=$lt_want_nocaseglob +- +-# DLL creation program. +-DLLTOOL=$lt_DLLTOOL +- +-# Command to associate shared and link libraries. +-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd +- + # The archiver. + AR=$lt_AR +- +-# Flags to create an archive. + AR_FLAGS=$lt_AR_FLAGS + +-# How to feed a file listing to the archiver. +-archiver_list_spec=$lt_archiver_list_spec +- + # A symbol stripping program. + STRIP=$lt_STRIP + +@@ -26014,9 +25609,6 @@ RANLIB=$lt_RANLIB + old_postinstall_cmds=$lt_old_postinstall_cmds + old_postuninstall_cmds=$lt_old_postuninstall_cmds + +-# Whether to use a lock for old archive extraction. +-lock_old_archive_extraction=$lock_old_archive_extraction +- + # A C compiler. + LTCC=$lt_CC + +@@ -26035,24 +25627,21 @@ global_symbol_to_c_name_address=$lt_lt_c + # 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 + +-# 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. +-lt_sysroot=$lt_sysroot +- + # The name of the directory that contains temporary libtool files. + objdir=$objdir + ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# An echo program that does not interpret backslashes. ++ECHO=$lt_ECHO ++ + # Used to examine libraries when file_magic_cmd begins with "file". + MAGIC_CMD=$MAGIC_CMD + + # Must we lock files when doing compilation? + need_locks=$lt_need_locks + +-# Manifest tool. +-MANIFEST_TOOL=$lt_MANIFEST_TOOL +- + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. + DSYMUTIL=$lt_DSYMUTIL + +@@ -26109,9 +25698,6 @@ library_names_spec=$lt_library_names_spe + # The coded name of the library, if different from the real name. + soname_spec=$lt_soname_spec + +-# Permission mode override for installation of shared libraries. +-install_override_mode=$lt_install_override_mode +- + # Command to use after installation of a shared archive. + postinstall_cmds=$lt_postinstall_cmds + +@@ -26151,10 +25737,6 @@ striplib=$lt_striplib + # The linker used to build libraries. + LD=$lt_LD + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- + # Commands used to build an old-style archive. + old_archive_cmds=$lt_old_archive_cmds + +@@ -26167,12 +25749,12 @@ with_gcc=$GCC + # Compiler flag to turn off builtin functions. + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +- + # How to pass a linker flag through the compiler. + wl=$lt_lt_prog_compiler_wl + ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ + # Compiler flag to prevent dynamic linking. + link_static_flag=$lt_lt_prog_compiler_static + +@@ -26259,6 +25841,9 @@ inherit_rpath=$inherit_rpath + # Whether libtool must link a program against all its dependency libraries. + link_all_deplibs=$link_all_deplibs + ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ + # Set to "yes" if exported symbols are required. + always_export_symbols=$always_export_symbols + +@@ -26274,9 +25859,6 @@ include_expsyms=$lt_include_expsyms + # Commands necessary for linking programs (against libraries) with templates. + prelink_cmds=$lt_prelink_cmds + +-# Commands necessary for finishing linking programs. +-postlink_cmds=$lt_postlink_cmds +- + # Specify filename containing input files. + file_list_spec=$lt_file_list_spec + +@@ -26323,169 +25905,212 @@ ltmain="$ac_aux_dir/ltmain.sh" + # 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) ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# 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 () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# 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 () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# 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_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}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# 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 () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++ ++# 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 "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} ++ ++_LT_EOF ++ ;; ++ esac + +- 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 + ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +- mv -f "$cfgfile" "$ofile" || ++ mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + +@@ -26497,10 +26122,6 @@ fi + # The linker used to build libraries. + LD=$lt_LD_CXX + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag_CXX +-reload_cmds=$lt_reload_cmds_CXX +- + # Commands used to build an old-style archive. + old_archive_cmds=$lt_old_archive_cmds_CXX + +@@ -26513,12 +26134,12 @@ with_gcc=$GCC_CXX + # Compiler flag to turn off builtin functions. + no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +- + # How to pass a linker flag through the compiler. + wl=$lt_lt_prog_compiler_wl_CXX + ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++ + # Compiler flag to prevent dynamic linking. + link_static_flag=$lt_lt_prog_compiler_static_CXX + +@@ -26605,6 +26226,9 @@ inherit_rpath=$inherit_rpath_CXX + # Whether libtool must link a program against all its dependency libraries. + link_all_deplibs=$link_all_deplibs_CXX + ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path_CXX ++ + # Set to "yes" if exported symbols are required. + always_export_symbols=$always_export_symbols_CXX + +@@ -26620,9 +26244,6 @@ include_expsyms=$lt_include_expsyms_CXX + # Commands necessary for linking programs (against libraries) with templates. + prelink_cmds=$lt_prelink_cmds_CXX + +-# Commands necessary for finishing linking programs. +-postlink_cmds=$lt_postlink_cmds_CXX +- + # Specify filename containing input files. + file_list_spec=$lt_file_list_spec_CXX + +--- gdm-2.91.94.orig/tests/Makefile.in ++++ gdm-2.91.94/tests/Makefile.in +@@ -137,7 +137,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -162,6 +161,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -212,7 +213,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -248,6 +248,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -286,7 +288,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -303,6 +304,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -325,6 +327,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/daemon/Makefile.in ++++ gdm-2.91.94/daemon/Makefile.in +@@ -78,11 +78,13 @@ am__gdm_binary_SOURCES_DIST = main.c gdm + gdm-transient-display.c gdm-transient-display.h \ + gdm-static-factory-display.c gdm-static-factory-display.h \ + gdm-product-display.c gdm-product-display.h gdm-manager.c \ +- gdm-manager.h gdm-slave-proxy.c gdm-slave-proxy.h \ +- gdm-xdmcp-display-factory.c gdm-xdmcp-display-factory.h \ +- gdm-xdmcp-display.c gdm-xdmcp-display.h \ +- gdm-xdmcp-greeter-display.c gdm-xdmcp-greeter-display.h \ +- gdm-xdmcp-chooser-display.c gdm-xdmcp-chooser-display.h ++ gdm-manager.h gdm-user.c gdm-user.h gdm-user-private.h \ ++ gdm-user-manager.c gdm-user-manager.h gdm-slave-proxy.c \ ++ gdm-slave-proxy.h gdm-xdmcp-display-factory.c \ ++ gdm-xdmcp-display-factory.h gdm-xdmcp-display.c \ ++ gdm-xdmcp-display.h gdm-xdmcp-greeter-display.c \ ++ gdm-xdmcp-greeter-display.h gdm-xdmcp-chooser-display.c \ ++ gdm-xdmcp-chooser-display.h + am__objects_1 = + am__objects_2 = gdm-xdmcp-display-factory.$(OBJEXT) \ + gdm-xdmcp-display.$(OBJEXT) \ +@@ -98,6 +100,7 @@ am_gdm_binary_OBJECTS = main.$(OBJEXT) \ + gdm-static-display.$(OBJEXT) gdm-transient-display.$(OBJEXT) \ + gdm-static-factory-display.$(OBJEXT) \ + gdm-product-display.$(OBJEXT) gdm-manager.$(OBJEXT) \ ++ gdm-user.$(OBJEXT) gdm-user-manager.$(OBJEXT) \ + gdm-slave-proxy.$(OBJEXT) $(am__objects_1) $(am__objects_3) \ + $(am__objects_5) + gdm_binary_OBJECTS = $(am_gdm_binary_OBJECTS) +@@ -300,7 +303,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -325,6 +327,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -375,7 +379,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -411,6 +414,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -449,7 +454,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -466,6 +470,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -488,6 +493,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -516,6 +522,7 @@ AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DDMCONFDIR=\"$(dmconfdir)\" \ + -DGDMCONFDIR=\"$(gdmconfdir)\" \ ++ -DCACHEDIR=\"$(cachedir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DLOGDIR=\"$(logdir)\" \ +@@ -542,6 +549,7 @@ BUILT_SOURCES = \ + gdm-session-direct-glue.h \ + gdm-manager-glue.h \ + gdm-display-glue.h \ ++ gdm-user-manager-glue.h \ + gdm-xdmcp-greeter-display-glue.h \ + gdm-xdmcp-chooser-display-glue.h \ + gdm-static-display-glue.h \ +@@ -730,8 +738,9 @@ gdm_binary_SOURCES = main.c gdm-display- + gdm-transient-display.c gdm-transient-display.h \ + gdm-static-factory-display.c gdm-static-factory-display.h \ + gdm-product-display.c gdm-product-display.h gdm-manager.c \ +- gdm-manager.h gdm-slave-proxy.c gdm-slave-proxy.h $(NULL) \ +- $(am__append_4) $(am__append_5) ++ gdm-manager.h gdm-user.c gdm-user.h gdm-user-private.h \ ++ gdm-user-manager.c gdm-user-manager.h gdm-slave-proxy.c \ ++ gdm-slave-proxy.h $(NULL) $(am__append_4) $(am__append_5) + XDMCP_SOURCES = \ + gdm-xdmcp-display-factory.c \ + gdm-xdmcp-display-factory.h \ +@@ -782,6 +791,7 @@ EXTRA_DIST = \ + gdm-session-direct.xml \ + gdm-manager.xml \ + gdm-display.xml \ ++ gdm-user-manager.xml \ + gdm-xdmcp-greeter-display.xml \ + gdm-xdmcp-chooser-display.xml \ + gdm-static-display.xml \ +@@ -1015,6 +1025,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-static-display.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-static-factory-display.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-transient-display.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user-manager.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-welcome-session.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-xdmcp-chooser-display.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-xdmcp-chooser-slave.Po@am__quote@ +@@ -1272,6 +1284,8 @@ uninstall-am: uninstall-libexecPROGRAMS + + gdm-manager-glue.h: gdm-manager.xml Makefile.am + dbus-binding-tool --prefix=gdm_manager --mode=glib-server --output=gdm-manager-glue.h $(srcdir)/gdm-manager.xml ++gdm-user-manager-glue.h: gdm-user-manager.xml Makefile.am ++ dbus-binding-tool --prefix=gdm_user_manager --mode=glib-server --output=gdm-user-manager-glue.h $(srcdir)/gdm-user-manager.xml + gdm-slave-glue.h: gdm-slave.xml Makefile.am + dbus-binding-tool --prefix=gdm_slave --mode=glib-server --output=gdm-slave-glue.h $(srcdir)/gdm-slave.xml + gdm-simple-slave-glue.h: gdm-simple-slave.xml Makefile.am +--- gdm-2.91.94.orig/docs/Makefile.in ++++ gdm-2.91.94/docs/Makefile.in +@@ -117,7 +117,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -142,6 +141,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -192,7 +193,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -228,6 +228,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -266,7 +268,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -283,6 +284,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -305,6 +307,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/utils/Makefile.in ++++ gdm-2.91.94/utils/Makefile.in +@@ -36,6 +36,7 @@ build_triplet = @build@ + host_triplet = @host@ + bin_PROGRAMS = gdmflexiserver$(EXEEXT) gdm-screenshot$(EXEEXT) \ + $(am__EXEEXT_1) ++libexec_PROGRAMS = gdm-set-default-session$(EXEEXT) $(am__EXEEXT_1) + subdir = utils + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -48,8 +49,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = +-am__installdirs = "$(DESTDIR)$(bindir)" +-PROGRAMS = $(bin_PROGRAMS) ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" ++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) + am__objects_1 = + am_gdm_screenshot_OBJECTS = gdm-screenshot.$(OBJEXT) $(am__objects_1) + gdm_screenshot_OBJECTS = $(am_gdm_screenshot_OBJECTS) +@@ -60,6 +61,12 @@ gdm_screenshot_DEPENDENCIES = $(am__DEPE + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent ++am_gdm_set_default_session_OBJECTS = \ ++ gdm-set-default-session.$(OBJEXT) $(am__objects_1) ++gdm_set_default_session_OBJECTS = \ ++ $(am_gdm_set_default_session_OBJECTS) ++gdm_set_default_session_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am_gdmflexiserver_OBJECTS = gdmflexiserver.$(OBJEXT) $(am__objects_1) + gdmflexiserver_OBJECTS = $(am_gdmflexiserver_OBJECTS) + gdmflexiserver_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@@ -90,8 +97,10 @@ 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 = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES) +-DIST_SOURCES = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES) ++SOURCES = $(gdm_screenshot_SOURCES) $(gdm_set_default_session_SOURCES) \ ++ $(gdmflexiserver_SOURCES) ++DIST_SOURCES = $(gdm_screenshot_SOURCES) \ ++ $(gdm_set_default_session_SOURCES) $(gdmflexiserver_SOURCES) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -134,7 +143,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -159,6 +167,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -209,7 +219,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -245,6 +254,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -283,7 +294,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -300,6 +310,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -322,6 +333,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -346,11 +358,13 @@ AM_CPPFLAGS = \ + -DLOCALSTATEDIR=\""$(localstatedir)"\" \ + -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGDMCONFDIR=\"$(gdmconfdir)\" \ + $(UTILS_CFLAGS) \ + $(CANBERRA_GTK_CFLAGS) \ + $(GTK_CFLAGS) \ + $(XLIB_CFLAGS) \ + $(COMMON_CFLAGS) \ ++ $(SET_SESSION_CFLAGS) \ + $(NULL) + + edit = sed \ +@@ -379,6 +393,15 @@ gdm_screenshot_LDADD = \ + $(COMMON_LIBS) \ + $(NULL) + ++gdm_set_default_session_SOURCES = \ ++ gdm-set-default-session.c \ ++ $(NULL) ++ ++gdm_set_default_session_LDADD = \ ++ $(SET_SESSION_LIBS) \ ++ $(COMMON_LIBS) \ ++ $(NULL) ++ + CLEANFILES = \ + $(NULL) + +@@ -462,9 +485,55 @@ clean-binPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list ++install-libexecPROGRAMS: $(libexec_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" ++ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ ++ 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)$(libexecdir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ ++ } \ ++ ; done ++ ++uninstall-libexecPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || 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)$(libexecdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files ++ ++clean-libexecPROGRAMS: ++ @list='$(libexec_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 + gdm-screenshot$(EXEEXT): $(gdm_screenshot_OBJECTS) $(gdm_screenshot_DEPENDENCIES) + @rm -f gdm-screenshot$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(gdm_screenshot_OBJECTS) $(gdm_screenshot_LDADD) $(LIBS) ++gdm-set-default-session$(EXEEXT): $(gdm_set_default_session_OBJECTS) $(gdm_set_default_session_DEPENDENCIES) ++ @rm -f gdm-set-default-session$(EXEEXT) ++ $(AM_V_CCLD)$(LINK) $(gdm_set_default_session_OBJECTS) $(gdm_set_default_session_LDADD) $(LIBS) + gdmflexiserver$(EXEEXT): $(gdmflexiserver_OBJECTS) $(gdmflexiserver_DEPENDENCIES) + @rm -f gdmflexiserver$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(gdmflexiserver_OBJECTS) $(gdmflexiserver_LDADD) $(LIBS) +@@ -476,6 +545,7 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-screenshot.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-set-default-session.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdmflexiserver.Po@am__quote@ + + .c.o: +@@ -594,7 +664,7 @@ check-am: all-am + check: check-am + all-am: Makefile $(PROGRAMS) + installdirs: +- for dir in "$(DESTDIR)$(bindir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -626,7 +696,8 @@ maintainer-clean-generic: + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ++clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ ++ clean-libtool mostlyclean-am + + distclean: distclean-am + -rm -rf ./$(DEPDIR) +@@ -652,7 +723,7 @@ install-dvi: install-dvi-am + + install-dvi-am: + +-install-exec-am: install-binPROGRAMS ++install-exec-am: install-binPROGRAMS install-libexecPROGRAMS + + install-html: install-html-am + +@@ -692,23 +763,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS ++uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS + + .MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ +- clean-generic clean-libtool ctags 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-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 uninstall uninstall-am \ +- uninstall-binPROGRAMS ++ clean-generic clean-libexecPROGRAMS clean-libtool ctags \ ++ 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-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-libexecPROGRAMS \ ++ 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 uninstall \ ++ uninstall-am uninstall-binPROGRAMS uninstall-libexecPROGRAMS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- /dev/null ++++ gdm-2.91.94/po/POTFILES +@@ -0,0 +1,86 @@ ++ ../common/gdm-common.c \ ++ ../common/gdm-log.c \ ++ ../common/gdm-md5.c \ ++ ../common/gdm-settings-backend.c \ ++ ../common/gdm-settings.c \ ++ ../common/gdm-settings-client.c \ ++ ../common/gdm-settings-desktop-backend.c \ ++ ../common/gdm-settings-direct.c \ ++ ../common/gdm-settings-utils.c \ ++ ../common/gdm-signal-handler.c \ ++ ../common/test-log.c \ ++ ../common/test-settings-client.c \ ++ ../common/test-settings-server.c \ ++ ../daemon/factory-slave-main.c \ ++ ../daemon/gdm-chooser-session.c \ ++ ../daemon/gdm-display-access-file.c \ ++ ../daemon/gdm-display.c \ ++ ../daemon/gdm-display-store.c \ ++ ../daemon/gdm-factory-slave.c \ ++ ../daemon/gdm-greeter-server.c \ ++ ../daemon/gdm-greeter-session.c \ ++ ../daemon/gdm-local-display-factory.c \ ++ ../daemon/gdm-manager.c \ ++ ../daemon/gdm-product-display.c \ ++ ../daemon/gdm-product-slave.c \ ++ ../daemon/gdm-server.c \ ++ ../daemon/gdm-session-auditor.c \ ++ ../daemon/gdm-session.c \ ++ ../daemon/gdm-session-direct.c \ ++ ../daemon/gdm-session-relay.c \ ++ ../daemon/gdm-session-settings.c \ ++ ../daemon/gdm-session-settings.c \ ++ ../daemon/gdm-session-worker.c \ ++ ../daemon/gdm-session-worker-job.c \ ++ ../daemon/gdm-simple-slave.c \ ++ ../daemon/gdm-slave.c \ ++ ../daemon/gdm-slave-proxy.c \ ++ ../daemon/gdm-static-display.c \ ++ ../daemon/gdm-static-factory-display.c \ ++ ../daemon/gdm-welcome-session.c \ ++ ../daemon/gdm-xdmcp-display.c \ ++ ../daemon/gdm-xdmcp-display-factory.c \ ++ ../daemon/main.c \ ++ ../daemon/product-slave-main.c \ ++ ../daemon/session-worker-main.c \ ++ ../daemon/simple-slave-main.c \ ++ ../daemon/test-session.c \ ++ ../daemon/xdmcp-chooser-slave-main.c \ ++ ../data/gdm.policy.in \ ++ ../data/gdm.schemas.in.in \ ++ ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in \ ++ ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in \ ++ ../data/greeter-autostart/gnome-power-manager.desktop.in.in \ ++ ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in \ ++ ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in \ ++ ../data/greeter-autostart/gnome-mag.desktop.in \ ++ ../data/greeter-autostart/gok.desktop.in \ ++ ../data/greeter-autostart/metacity.desktop.in \ ++ ../data/greeter-autostart/orca-screen-reader.desktop.in \ ++ ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in \ ++ ../gui/gdmsetup/gdmsetup.desktop.in \ ++ ../gui/gdmsetup/gdmsetup.c \ ++ ../[type: gettext/glade]gui/gdmsetup/gdmsetup.ui \ ++ ../gui/simple-chooser/gdm-host-chooser-dialog.c \ ++ ../gui/simple-chooser/gdm-host-chooser-widget.c \ ++ ../gui/simple-greeter/gdm-cell-renderer-timer.c \ ++ ../gui/simple-greeter/gdm-chooser-widget.c \ ++ ../gui/simple-greeter/gdm-clock-widget.c \ ++ ../gui/simple-greeter/gdm-greeter-login-window.c \ ++ ../gui/simple-greeter/gdm-greeter-login-window.c \ ++ ../[type: gettext/glade]gui/simple-greeter/gdm-greeter-login-window.ui \ ++ ../gui/simple-greeter/gdm-greeter-panel.c \ ++ ../gui/simple-greeter/gdm-language-chooser-dialog.c \ ++ ../gui/simple-greeter/gdm-language-chooser-widget.c \ ++ ../gui/simple-greeter/gdm-language-option-widget.c \ ++ ../gui/simple-greeter/gdm-languages.c \ ++ ../gui/simple-greeter/gdm-option-widget.c \ ++ ../gui/simple-greeter/gdm-recent-option-widget.c \ ++ ../gui/simple-greeter/gdm-remote-login-window.c \ ++ ../gui/simple-greeter/gdm-session-option-widget.c \ ++ ../gui/simple-greeter/gdm-simple-greeter.schemas.in \ ++ ../gui/simple-greeter/gdm-timer.c \ ++ ../gui/simple-greeter/gdm-user-chooser-widget.c \ ++ ../gui/simple-greeter/greeter-main.c \ ++ ../utils/gdmflexiserver.c \ ++ ../utils/gdm-screenshot.c \ +--- gdm-2.91.94.orig/data/Makefile.in ++++ gdm-2.91.94/data/Makefile.in +@@ -83,9 +83,10 @@ am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(sessiondir)" \ +- "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)" ++ "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(polkitdir)" \ ++ "$(DESTDIR)$(schemasdir)" + DATA = $(dbusconf_DATA) $(dist_session_DATA) $(localealias_DATA) \ +- $(schemas_DATA) ++ $(polkit_DATA) $(schemas_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +@@ -159,7 +160,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -184,6 +184,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -234,7 +236,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -270,6 +271,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -308,7 +311,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -325,6 +327,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = $(localstatedir)/cache/gdm + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -347,6 +350,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -377,7 +381,6 @@ postlogindir = $(gdmconfdir)/PostLogin + workingdir = $(GDM_WORKING_DIR) + xauthdir = $(GDM_XAUTH_DIR) + screenshotdir = $(GDM_SCREENSHOT_DIR) +-cachedir = $(localstatedir)/cache/gdm + dbusconfdir = $(DBUS_SYS_DIR) + dbusconf_in_files = gdm.conf.in + dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) +@@ -388,11 +391,15 @@ localealiasdir = $(datadir)/gdm + localealias_DATA = locale.alias + sessiondir = $(datadir)/gnome-session/sessions + dist_session_DATA = gdm.session ++polkitdir = $(datadir)/polkit-1/actions ++polkit_in_files = gdm.policy.in ++polkit_DATA = $(polkit_in_files:.policy.in=.policy) + EXTRA_DIST = \ + $(schemas_in_files) \ + $(schemas_DATA) \ + $(dbusconf_in_files) \ + $(localealias_DATA) \ ++ $(polkit_in_files) \ + gdm.schemas.in.in \ + gdm.conf-custom.in \ + Xsession.in \ +@@ -418,7 +425,8 @@ CLEANFILES = \ + $(NULL) + + DISTCLEANFILES = \ +- $(dbusconf_DATA) \ ++ $(dbusconf_DATA) \ ++ $(polkit_DATA) \ + gdm.schemas \ + dconf-override-db \ + $(NULL) +@@ -529,6 +537,26 @@ uninstall-localealiasDATA: + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(localealiasdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(localealiasdir)" && rm -f $$files ++install-polkitDATA: $(polkit_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(polkitdir)" || $(MKDIR_P) "$(DESTDIR)$(polkitdir)" ++ @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkitdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(polkitdir)" || exit $$?; \ ++ done ++ ++uninstall-polkitDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(polkit_DATA)'; test -n "$(polkitdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(polkitdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(polkitdir)" && rm -f $$files + install-schemasDATA: $(schemas_DATA) + @$(NORMAL_INSTALL) + test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" +@@ -751,7 +779,7 @@ check: check-recursive + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(schemasdir)"; do \ ++ for dir in "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(localealiasdir)" "$(DESTDIR)$(polkitdir)" "$(DESTDIR)$(schemasdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-recursive +@@ -803,7 +831,7 @@ info: info-recursive + info-am: + + install-data-am: install-dbusconfDATA install-dist_sessionDATA \ +- install-localealiasDATA install-schemasDATA ++ install-localealiasDATA install-polkitDATA install-schemasDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive +@@ -849,7 +877,8 @@ ps: ps-recursive + ps-am: + + uninstall-am: uninstall-dbusconfDATA uninstall-dist_sessionDATA \ +- uninstall-localealiasDATA uninstall-schemasDATA ++ uninstall-localealiasDATA uninstall-polkitDATA \ ++ uninstall-schemasDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook + .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +@@ -865,14 +894,15 @@ uninstall-am: uninstall-dbusconfDATA uni + install-dist_sessionDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-localealiasDATA \ +- install-man install-pdf install-pdf-am install-ps \ +- install-ps-am install-schemasDATA 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 uninstall-dbusconfDATA \ +- uninstall-dist_sessionDATA uninstall-hook \ +- uninstall-localealiasDATA uninstall-schemasDATA ++ install-man install-pdf install-pdf-am install-polkitDATA \ ++ install-ps install-ps-am install-schemasDATA 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 \ ++ uninstall-dbusconfDATA uninstall-dist_sessionDATA \ ++ uninstall-hook uninstall-localealiasDATA uninstall-polkitDATA \ ++ uninstall-schemasDATA + + + Xsession: $(srcdir)/Xsession.in +@@ -897,6 +927,8 @@ gdm.conf-custom: $(srcdir)/gdm.conf-cust + + @INTLTOOL_SCHEMAS_RULE@ + ++@INTLTOOL_POLICY_RULE@ ++ + gdm.schemas.in: $(srcdir)/gdm.schemas.in.in + sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \ + -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \ +@@ -925,6 +957,8 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in + -e 's,[@]pixmapdir[@],$(pixmapdir),g' \ + -e 's,[@]sbindir[@],$(sbindir),g' \ + <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in ++check: ++ $(POLKIT_POLICY_FILE_VALIDATE) $(polkit_DATA) + + dconf-override-db: $(srcdir)/make-dconf-override-db.sh + $(srcdir)/make-dconf-override-db.sh +@@ -967,6 +1001,8 @@ install-data-hook: gdm.conf-custom Xsess + + $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(gdmconfdir)/Xsession + ++ $(INSTALL_SCRIPT) language-options $(DESTDIR)$(pkgdatadir)/language-options ++ + if test '!' -d $(DESTDIR)$(initdir); then \ + $(mkinstalldirs) $(DESTDIR)$(initdir); \ + chmod 755 $(DESTDIR)$(initdir); \ +--- gdm-2.91.94.orig/data/greeter-autostart/Makefile.in ++++ gdm-2.91.94/data/greeter-autostart/Makefile.in +@@ -117,7 +117,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -142,6 +141,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -192,7 +193,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -228,6 +228,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -266,7 +268,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -283,6 +284,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -305,6 +307,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/data/pixmaps/Makefile.in ++++ gdm-2.91.94/data/pixmaps/Makefile.in +@@ -156,7 +156,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -181,6 +180,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -231,7 +232,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -267,6 +267,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -305,7 +307,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -322,6 +323,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -344,6 +346,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/data/pixmaps/32x32/Makefile.in ++++ gdm-2.91.94/data/pixmaps/32x32/Makefile.in +@@ -118,7 +118,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -143,6 +142,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -193,7 +194,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -229,6 +229,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -267,7 +269,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -284,6 +285,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -306,6 +308,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/data/pixmaps/48x48/Makefile.in ++++ gdm-2.91.94/data/pixmaps/48x48/Makefile.in +@@ -118,7 +118,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -143,6 +142,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -193,7 +194,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -229,6 +229,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -267,7 +269,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -284,6 +285,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -306,6 +308,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/data/pixmaps/16x16/Makefile.in ++++ gdm-2.91.94/data/pixmaps/16x16/Makefile.in +@@ -118,7 +118,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -143,6 +142,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -193,7 +194,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -229,6 +229,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -267,7 +269,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -284,6 +285,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -306,6 +308,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/common/Makefile.in ++++ gdm-2.91.94/common/Makefile.in +@@ -53,7 +53,8 @@ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libgdmcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ++libgdmcommon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + am__libgdmcommon_la_SOURCES_DIST = gdm-address.h gdm-address.c \ + gdm-common.h gdm-common.c gdm-common-unknown-origin.h \ + gdm-common-unknown-origin.c gdm-profile.c gdm-profile.h \ +@@ -208,7 +209,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -233,6 +233,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -283,7 +285,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -319,6 +320,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -357,7 +360,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -374,6 +376,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -396,6 +399,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -508,6 +512,7 @@ libgdmcommon_la_CFLAGS = \ + $(NULL) + + libgdmcommon_la_LIBADD = \ ++ $(COMMON_LIBS) \ + $(NULL) + + libgdmcommon_la_LDFLAGS = \ +--- gdm-2.91.94.orig/gui/Makefile.in ++++ gdm-2.91.94/gui/Makefile.in +@@ -132,7 +132,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -157,6 +156,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -207,7 +208,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -243,6 +243,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -281,7 +283,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -298,6 +299,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -320,6 +322,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +@@ -338,7 +341,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NULL = +-SUBDIRS = simple-greeter $(NULL) $(am__append_1) ++SUBDIRS = simple-greeter gdmsetup $(NULL) $(am__append_1) + DIST_SUBDIRS = \ + simple-chooser \ + simple-greeter \ +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/Makefile.in +@@ -0,0 +1,766 @@ ++# Makefile.in generated by automake 1.11.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. ++# 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@ ++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@ ++bin_PROGRAMS = gdmsetup$(EXEEXT) $(am__EXEEXT_1) ++subdir = gui/gdmsetup ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++am__EXEEXT_1 = ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Utilitiesdir)" \ ++ "$(DESTDIR)$(uidir)" ++PROGRAMS = $(bin_PROGRAMS) ++am__objects_1 = ++am_gdmsetup_OBJECTS = gdmsetup.$(OBJEXT) gdm-user.$(OBJEXT) \ ++ gdm-user-manager.$(OBJEXT) gdm-sessions.$(OBJEXT) \ ++ $(am__objects_1) ++gdmsetup_OBJECTS = $(am_gdmsetup_OBJECTS) ++am__DEPENDENCIES_1 = ++gdmsetup_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++AM_V_lt = $(am__v_lt_$(V)) ++am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) ++am__v_lt_0 = --silent ++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_$(V)) ++am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) ++am__v_CC_0 = @echo " CC " $@; ++AM_V_at = $(am__v_at_$(V)) ++am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) ++am__v_at_0 = @ ++CCLD = $(CC) ++LINK = $(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 = $(gdmsetup_SOURCES) ++DIST_SOURCES = $(gdmsetup_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++DATA = $(Utilities_DATA) $(ui_DATA) ++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@ ++AT_BINDIR = @AT_BINDIR@ ++AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BINDIR = @BINDIR@ ++CANBERRA_GTK_CFLAGS = @CANBERRA_GTK_CFLAGS@ ++CANBERRA_GTK_LIBS = @CANBERRA_GTK_LIBS@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CHECK_CFLAGS = @CHECK_CFLAGS@ ++CHECK_LIBS = @CHECK_LIBS@ ++COMMON_CFLAGS = @COMMON_CFLAGS@ ++COMMON_LIBS = @COMMON_LIBS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DAEMON_CFLAGS = @DAEMON_CFLAGS@ ++DAEMON_LIBS = @DAEMON_LIBS@ ++DATADIR = @DATADIR@ ++DATADIRNAME = @DATADIRNAME@ ++DBUS_SYS_DIR = @DBUS_SYS_DIR@ ++DEBUG_CFLAGS = @DEBUG_CFLAGS@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ ++DOC_USER_FORMATS = @DOC_USER_FORMATS@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ ++EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ ++EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ ++EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ ++EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ ++EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ ++EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ ++EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@ ++EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@ ++FGREP = @FGREP@ ++GCONFTOOL = @GCONFTOOL@ ++GCONF_CFLAGS = @GCONF_CFLAGS@ ++GCONF_LIBS = @GCONF_LIBS@ ++GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ ++GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ ++GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ ++GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ ++GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ ++GDM_GROUPNAME = @GDM_GROUPNAME@ ++GDM_OLD_CONF = @GDM_OLD_CONF@ ++GDM_PID_FILE = @GDM_PID_FILE@ ++GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@ ++GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@ ++GDM_USERNAME = @GDM_USERNAME@ ++GDM_WORKING_DIR = @GDM_WORKING_DIR@ ++GDM_XAUTH_DIR = @GDM_XAUTH_DIR@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GREP = @GREP@ ++GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ ++GTHREAD_LIBS = @GTHREAD_LIBS@ ++GTK_CFLAGS = @GTK_CFLAGS@ ++GTK_LIBS = @GTK_LIBS@ ++HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@ ++HAVE_PAM = @HAVE_PAM@ ++HELP_DIR = @HELP_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@ ++LANG_CONFIG_FILE = @LANG_CONFIG_FILE@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBDIR = @LIBDIR@ ++LIBEXECDIR = @LIBEXECDIR@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIBWRAP_LIBS = @LIBWRAP_LIBS@ ++LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@ ++LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@ ++LIPO = @LIPO@ ++LN_S = @LN_S@ ++LOCALSTATEDIR = @LOCALSTATEDIR@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++MSGMERGE = @MSGMERGE@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OMF_DIR = @OMF_DIR@ ++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@ ++PAM_LIBS = @PAM_LIBS@ ++PAM_PREFIX = @PAM_PREFIX@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PKG_CONFIG = @PKG_CONFIG@ ++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ ++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ ++PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++RBAC_LIBS = @RBAC_LIBS@ ++SBINDIR = @SBINDIR@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ ++SHELL = @SHELL@ ++SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ ++SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ ++SIMPLE_GREETER_CFLAGS = @SIMPLE_GREETER_CFLAGS@ ++SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LIBS@ ++SOUND_PROGRAM = @SOUND_PROGRAM@ ++STRIP = @STRIP@ ++SYSCONFDIR = @SYSCONFDIR@ ++UPOWER = @UPOWER@ ++UPOWER_CFLAGS = @UPOWER_CFLAGS@ ++UPOWER_LIBS = @UPOWER_LIBS@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++WARN_CFLAGS = @WARN_CFLAGS@ ++WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@ ++XDMCP_LIBS = @XDMCP_LIBS@ ++XEVIE_OPTION = @XEVIE_OPTION@ ++XGETTEXT = @XGETTEXT@ ++XINERAMA_LIBS = @XINERAMA_LIBS@ ++XLIB_CFLAGS = @XLIB_CFLAGS@ ++XLIB_LIBS = @XLIB_LIBS@ ++XMKMF = @XMKMF@ ++XSESSION_SHELL = @XSESSION_SHELL@ ++X_CFLAGS = @X_CFLAGS@ ++X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PATH = @X_PATH@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++X_SERVER = @X_SERVER@ ++X_SERVER_PATH = @X_SERVER_PATH@ ++X_XNEST_CMD = @X_XNEST_CMD@ ++X_XNEST_CONFIG_OPTIONS = @X_XNEST_CONFIG_OPTIONS@ ++X_XNEST_UNSCALED_FONTPATH = @X_XNEST_UNSCALED_FONTPATH@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++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@ ++authdir = @authdir@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++cachedir = @cachedir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++dmconfdir = @dmconfdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gdmconfdir = @gdmconfdir@ ++gdmlocaledir = @gdmlocaledir@ ++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@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++pixmapdir = @pixmapdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++sysconfsubdir = @sysconfsubdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++NULL = ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/common \ ++ -DDMCONFDIR=\""$(dmconfdir)"\" \ ++ -DDATADIR=\""$(datadir)"\" \ ++ -DUIDIR=\""$(uidir)"\" \ ++ -DGNOMELOCALEDIR=\""$(gdmlocaledir)"\" \ ++ $(GDMSETUP_CFLAGS) \ ++ $(NULL) ++ ++gdmsetup_SOURCES = \ ++ gdmsetup.c \ ++ gdm-user.c \ ++ gdm-user-manager.c \ ++ gdm-sessions.c \ ++ $(NULL) ++ ++gdmsetup_LDADD = \ ++ $(GDMSETUP_LIBS) \ ++ $(NULL) ++ ++uidir = $(pkgdatadir) ++ui_DATA = \ ++ gdmsetup.ui \ ++ $(NULL) ++ ++Utilitiesdir = $(datadir)/applications ++Utilities_in_files = gdmsetup.desktop.in ++Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop) ++EXTRA_DIST = \ ++ $(ui_DATA) \ ++ $(Utilities_in_files) \ ++ $(NULL) ++ ++all: 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 gui/gdmsetup/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu gui/gdmsetup/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) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || 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 ++gdmsetup$(EXEEXT): $(gdmsetup_OBJECTS) $(gdmsetup_DEPENDENCIES) ++ @rm -f gdmsetup$(EXEEXT) ++ $(AM_V_CCLD)$(LINK) $(gdmsetup_OBJECTS) $(gdmsetup_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-sessions.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user-manager.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdmsetup.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 ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++.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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-UtilitiesDATA: $(Utilities_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(Utilitiesdir)" || $(MKDIR_P) "$(DESTDIR)$(Utilitiesdir)" ++ @list='$(Utilities_DATA)'; test -n "$(Utilitiesdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(Utilitiesdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(Utilitiesdir)" || exit $$?; \ ++ done ++ ++uninstall-UtilitiesDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(Utilities_DATA)'; test -n "$(Utilitiesdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(Utilitiesdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(Utilitiesdir)" && rm -f $$files ++install-uiDATA: $(ui_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" ++ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ ++ done ++ ++uninstall-uiDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(uidir)" && rm -f $$files ++ ++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 ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ 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; }; }'`; \ ++ 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 ++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; }; }'`; \ ++ 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" ++ ++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: check-am ++all-am: Makefile $(PROGRAMS) $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(Utilitiesdir)" "$(DESTDIR)$(uidir)"; 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: ++ $(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 ++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-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-UtilitiesDATA install-uiDATA ++ ++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-UtilitiesDATA uninstall-binPROGRAMS \ ++ uninstall-uiDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ++ clean-generic clean-libtool ctags distclean distclean-compile \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-UtilitiesDATA \ ++ install-am install-binPROGRAMS 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 install-uiDATA 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-UtilitiesDATA uninstall-am \ ++ uninstall-binPROGRAMS uninstall-uiDATA ++ ++@INTLTOOL_DESKTOP_RULE@ ++ ++# 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: +--- gdm-2.91.94.orig/gui/simple-greeter/Makefile.in ++++ gdm-2.91.94/gui/simple-greeter/Makefile.in +@@ -261,7 +261,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -286,6 +285,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -336,7 +337,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -372,6 +372,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -410,7 +412,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -427,6 +428,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -449,6 +451,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ +--- gdm-2.91.94.orig/gui/simple-chooser/Makefile.in ++++ gdm-2.91.94/gui/simple-chooser/Makefile.in +@@ -145,7 +145,6 @@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ + DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DLLTOOL = @DLLTOOL@ + DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ +@@ -170,6 +169,8 @@ GCONF_LIBS = @GCONF_LIBS@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ + GDMCHOOSER = @GDMCHOOSER@ ++GDMSETUP_CFLAGS = @GDMSETUP_CFLAGS@ ++GDMSETUP_LIBS = @GDMSETUP_LIBS@ + GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ + GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ + GDM_GROUPNAME = @GDM_GROUPNAME@ +@@ -220,7 +221,6 @@ LOCALSTATEDIR = @LOCALSTATEDIR@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MANIFEST_TOOL = @MANIFEST_TOOL@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +@@ -256,6 +256,8 @@ RBAC_LIBS = @RBAC_LIBS@ + SBINDIR = @SBINDIR@ + SED = @SED@ + SET_MAKE = @SET_MAKE@ ++SET_SESSION_CFLAGS = @SET_SESSION_CFLAGS@ ++SET_SESSION_LIBS = @SET_SESSION_LIBS@ + SHELL = @SHELL@ + SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ + SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ +@@ -294,7 +296,6 @@ 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_CXX = @ac_ct_CXX@ + ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +@@ -311,6 +312,7 @@ build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ + builddir = @builddir@ ++cachedir = @cachedir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + dmconfdir = @dmconfdir@ +@@ -333,6 +335,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + logdir = @logdir@ ++lt_ECHO = @lt_ECHO@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ diff -Nru gdm-2.32.1/debian/patches/00git_passwordless_login_crash.patch gdm-3.0.0/debian/patches/00git_passwordless_login_crash.patch --- gdm-2.32.1/debian/patches/00git_passwordless_login_crash.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/00git_passwordless_login_crash.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -From 66a8a9ed1bb96fdeb8288bb9537b7e1a9c1695c8 Mon Sep 17 00:00:00 2001 -From: Michael Braun -Date: Tue, 08 Mar 2011 21:52:56 +0000 -Subject: greeter: disable the login button in MODE_AUTHENTICATION if no query is pending - -If the user does not need a password to login with gdm, then hitting the -"log in" button causes gdm to crash. This seems to be due to an -AnswerQuery DBUS message being generated even if the password input -field is not visible and an password has not been requested. The user -has a real opportunity to hit this bug at least if pam_mkhomedir is in -use and needs some time to finish due to the size of the skeleton. - -This commit desensitizes the Login button when it's unavailable. - -https://bugzilla.gnome.org/show_bug.cgi?id=643176 ---- -Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.c -=================================================================== ---- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-login-window.c 2010-09-15 20:58:52.000000000 +0200 -+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-login-window.c 2011-03-09 19:40:30.803650892 +0100 -@@ -458,12 +458,15 @@ - case MODE_SELECTION: - /* should never have anything to return to from here */ - show = FALSE; -+ set_sensitive (login_window, TRUE); - break; - case MODE_TIMED_LOGIN: - /* should always have something to return to from here */ - show = TRUE; -+ set_sensitive (login_window, TRUE); - break; - case MODE_AUTHENTICATION: -+ set_sensitive (login_window, FALSE); - if (login_window->priv->num_queries > 1) { - /* if we are inside a pam conversation past - the first step */ -@@ -677,7 +680,6 @@ - switch_mode (login_window, dialog_mode); - } - -- set_sensitive (login_window, TRUE); - set_ready (login_window); - set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); - update_banner_message (login_window); diff -Nru gdm-2.32.1/debian/patches/02_x_server_location.patch gdm-3.0.0/debian/patches/02_x_server_location.patch --- gdm-2.32.1/debian/patches/02_x_server_location.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/02_x_server_location.patch 2011-04-08 14:32:20.000000000 +0000 @@ -1,11 +1,11 @@ Description: Change the default X server location to /usr/bin/X. This avoids having to build-depend on xserver-xorg. Bug: http://bugzilla.gnome.org/show_bug.cgi?id=588848 -Index: gdm-2.32.0/configure.ac +Index: gdm-3.0.0/configure.ac =================================================================== ---- gdm-2.32.0.orig/configure.ac 2010-09-27 19:05:57.000000000 +0200 -+++ gdm-2.32.0/configure.ac 2010-12-07 15:03:45.297502001 +0100 -@@ -1161,12 +1161,9 @@ +--- gdm-3.0.0.orig/configure.ac ++++ gdm-3.0.0/configure.ac +@@ -1157,12 +1157,9 @@ X_SERVER="/usr/bin/X" X_CONFIG_OPTIONS="-audit 0" else diff -Nru gdm-2.32.1/debian/patches/04_fix_external_program_directories.patch gdm-3.0.0/debian/patches/04_fix_external_program_directories.patch --- gdm-2.32.1/debian/patches/04_fix_external_program_directories.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/04_fix_external_program_directories.patch 2011-03-30 19:59:42.000000000 +0000 @@ -22,9 +22,9 @@ Type=Application _Name=GNOME Settings Daemon -TryExec=@LIBEXECDIR@/gnome-settings-daemon --Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins +-Exec=@LIBEXECDIR@/gnome-settings-daemon +TryExec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon -+Exec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins ++Exec=/usr/lib/gnome-settings-daemon/gnome-settings-daemon OnlyShowIn=GNOME; X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Notify=true @@ -47,8 +47,8 @@ ret = FALSE; error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error); -+ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error); +- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); ++ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); if (error != NULL) { g_warning ("Error starting settings daemon: %s", error->message); g_error_free (error); diff -Nru gdm-2.32.1/debian/patches/08_use_polkit_for_settings.patch gdm-3.0.0/debian/patches/08_use_polkit_for_settings.patch --- gdm-2.32.1/debian/patches/08_use_polkit_for_settings.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/08_use_polkit_for_settings.patch 2011-03-30 20:03:34.000000000 +0000 @@ -2,10 +2,10 @@ Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587750 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299 -Index: gdm-2.32.0/common/gdm-settings.c +Index: gdm-2.91.94/common/gdm-settings.c =================================================================== ---- gdm-2.32.0.orig/common/gdm-settings.c 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/common/gdm-settings.c 2010-12-07 15:34:08.167502002 +0100 +--- gdm-2.91.94.orig/common/gdm-settings.c ++++ gdm-2.91.94/common/gdm-settings.c @@ -36,6 +36,7 @@ #define DBUS_API_SUBJECT_TO_CHANGE #include @@ -151,10 +151,10 @@ } static gboolean -Index: gdm-2.32.0/common/gdm-settings.h +Index: gdm-2.91.94/common/gdm-settings.h =================================================================== ---- gdm-2.32.0.orig/common/gdm-settings.h 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/common/gdm-settings.h 2010-12-07 15:34:08.177502002 +0100 +--- gdm-2.91.94.orig/common/gdm-settings.h ++++ gdm-2.91.94/common/gdm-settings.h @@ -23,6 +23,7 @@ #define __GDM_SETTINGS_H @@ -177,10 +177,10 @@ G_END_DECLS -Index: gdm-2.32.0/common/gdm-settings.xml +Index: gdm-2.91.94/common/gdm-settings.xml =================================================================== ---- gdm-2.32.0.orig/common/gdm-settings.xml 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/common/gdm-settings.xml 2010-12-07 15:34:08.177502002 +0100 +--- gdm-2.91.94.orig/common/gdm-settings.xml ++++ gdm-2.91.94/common/gdm-settings.xml @@ -5,7 +5,12 @@ @@ -194,19 +194,19 @@ -Index: gdm-2.32.0/configure.ac +Index: gdm-2.91.94/configure.ac =================================================================== ---- gdm-2.32.0.orig/configure.ac 2010-12-07 15:34:08.047502002 +0100 -+++ gdm-2.32.0/configure.ac 2010-12-07 15:34:08.177502002 +0100 +--- gdm-2.91.94.orig/configure.ac ++++ gdm-2.91.94/configure.ac @@ -40,6 +40,7 @@ dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 +POLKIT_GOBJECT_REQUIRED_VERSION=0.92 - GLIB_REQUIRED_VERSION=2.22.0 - GTK_REQUIRED_VERSION=2.20.0 + GLIB_REQUIRED_VERSION=2.27.4 + GTK_REQUIRED_VERSION=2.91.1 PANGO_REQUIRED_VERSION=1.3.0 -@@ -60,6 +61,7 @@ +@@ -61,6 +62,7 @@ PKG_CHECK_MODULES(COMMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION @@ -214,18 +214,18 @@ gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION ) -@@ -68,6 +70,7 @@ +@@ -69,6 +71,7 @@ PKG_CHECK_MODULES(DAEMON, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_GOBJECT_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION - ) -Index: gdm-2.32.0/data/gdm.conf.in + accountsservice >= $ACCOUNTS_SERVICE_REQUIRED_VERSION +Index: gdm-2.91.94/data/gdm.conf.in =================================================================== ---- gdm-2.32.0.orig/data/gdm.conf.in 2010-09-15 20:58:11.000000000 +0200 -+++ gdm-2.32.0/data/gdm.conf.in 2010-12-07 15:34:08.177502002 +0100 +--- gdm-2.91.94.orig/data/gdm.conf.in ++++ gdm-2.91.94/data/gdm.conf.in @@ -34,8 +34,6 @@ @@ -246,10 +246,10 @@ -Index: gdm-2.32.0/data/gdm.policy.in +Index: gdm-2.91.94/data/gdm.policy.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.0/data/gdm.policy.in 2010-12-07 15:34:08.000000000 +0100 +--- /dev/null ++++ gdm-2.91.94/data/gdm.policy.in @@ -0,0 +1,18 @@ + + + + -Index: gdm-2.32.0/data/Makefile.am +Index: gdm-2.91.94/data/Makefile.am =================================================================== ---- gdm-2.32.0.orig/data/Makefile.am 2010-09-16 01:44:56.000000000 +0200 -+++ gdm-2.32.0/data/Makefile.am 2010-12-07 15:34:08.177502002 +0100 -@@ -46,6 +46,8 @@ +--- gdm-2.91.94.orig/data/Makefile.am ++++ gdm-2.91.94/data/Makefile.am +@@ -45,6 +45,8 @@ schemas_in_files = gdm.schemas.in schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) @@ -282,9 +282,9 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \ -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \ -@@ -78,11 +80,18 @@ - localealiasdir = $(datadir)/gdm - localealias_DATA = locale.alias +@@ -80,11 +82,18 @@ + sessiondir = $(datadir)/gnome-session/sessions + dist_session_DATA = gdm.session +polkitdir = $(datadir)/polkit-1/actions +polkit_in_files = gdm.policy.in @@ -301,7 +301,7 @@ gdm.schemas.in.in \ gdm.conf-custom.in \ Xsession.in \ -@@ -105,7 +114,8 @@ +@@ -110,7 +119,8 @@ $(NULL) DISTCLEANFILES = \ @@ -309,12 +309,12 @@ + $(dbusconf_DATA) \ + $(polkit_DATA) \ gdm.schemas \ + dconf-override-db \ $(NULL) - -Index: gdm-2.32.0/po/POTFILES.in +Index: gdm-2.91.94/po/POTFILES.in =================================================================== ---- gdm-2.32.0.orig/po/POTFILES.in 2010-09-15 20:58:11.000000000 +0200 -+++ gdm-2.32.0/po/POTFILES.in 2010-12-07 15:34:08.177502002 +0100 +--- gdm-2.91.94.orig/po/POTFILES.in ++++ gdm-2.91.94/po/POTFILES.in @@ -49,6 +49,7 @@ daemon/simple-slave-main.c daemon/test-session.c @@ -323,10 +323,10 @@ data/gdm.schemas.in.in data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in data/greeter-autostart/gdm-simple-greeter.desktop.in.in -Index: gdm-2.32.0/common/Makefile.am +Index: gdm-2.91.94/common/Makefile.am =================================================================== ---- gdm-2.32.0.orig/common/Makefile.am 2010-12-07 15:34:17.347502002 +0100 -+++ gdm-2.32.0/common/Makefile.am 2010-12-07 15:34:42.007502002 +0100 +--- gdm-2.91.94.orig/common/Makefile.am ++++ gdm-2.91.94/common/Makefile.am @@ -112,6 +112,7 @@ $(NULL) diff -Nru gdm-2.32.1/debian/patches/09_gdmsetup.patch gdm-3.0.0/debian/patches/09_gdmsetup.patch --- gdm-2.32.1/debian/patches/09_gdmsetup.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/09_gdmsetup.patch 2011-03-30 20:05:53.000000000 +0000 @@ -2,11 +2,11 @@ Bug: http://bugzilla.gnome.org/show_bug.cgi?id=587750 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299 -Index: gdm-2.32.1/configure.ac +Index: gdm-2.91.94/configure.ac =================================================================== ---- gdm-2.32.1.orig/configure.ac 2011-04-08 16:33:45.141921352 +1000 -+++ gdm-2.32.1/configure.ac 2011-04-08 16:33:46.921921354 +1000 -@@ -121,6 +121,14 @@ +--- gdm-2.91.94.orig/configure.ac ++++ gdm-2.91.94/configure.ac +@@ -123,6 +123,14 @@ AC_SUBST(UPOWER_CFLAGS) AC_SUBST(UPOWER_LIBS) @@ -20,19 +20,19 @@ + PKG_CHECK_MODULES(SIMPLE_GREETER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION -@@ -1399,6 +1407,7 @@ + gtk+-3.0 >= $GTK_REQUIRED_VERSION +@@ -1395,6 +1403,7 @@ daemon/Makefile docs/Makefile gui/Makefile +gui/gdmsetup/Makefile gui/simple-greeter/Makefile - gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile -Index: gdm-2.32.1/gui/gdmsetup/gdm-sessions.c + utils/Makefile +Index: gdm-2.91.94/gui/gdmsetup/gdm-sessions.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-sessions.c 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-sessions.c @@ -0,0 +1,265 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -299,10 +299,10 @@ + + return TRUE; +} -Index: gdm-2.32.1/gui/gdmsetup/gdm-sessions.h +Index: gdm-2.91.94/gui/gdmsetup/gdm-sessions.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-sessions.h 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-sessions.h @@ -0,0 +1,38 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -342,10 +342,10 @@ +G_END_DECLS + +#endif /* __GDM_SESSION_H */ -Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.c +Index: gdm-2.91.94/gui/gdmsetup/gdmsetup.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.c 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdmsetup.c @@ -0,0 +1,717 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -1064,10 +1064,10 @@ + + return 0; +} -Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.desktop.in +Index: gdm-2.91.94/gui/gdmsetup/gdmsetup.desktop.in =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.desktop.in 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdmsetup.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +_Name=Login Screen @@ -1081,10 +1081,10 @@ +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=gdm +X-GNOME-Bugzilla-Component=general -Index: gdm-2.32.1/gui/gdmsetup/gdmsetup.ui +Index: gdm-2.91.94/gui/gdmsetup/gdmsetup.ui =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdmsetup.ui 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdmsetup.ui @@ -0,0 +1,345 @@ + + @@ -1431,10 +1431,10 @@ + 1 + + -Index: gdm-2.32.1/gui/gdmsetup/gdm-user.c +Index: gdm-2.91.94/gui/gdmsetup/gdm-user.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user.c 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-user.c @@ -0,0 +1,1172 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -2608,10 +2608,10 @@ + + return pixbuf; +} -Index: gdm-2.32.1/gui/gdmsetup/gdm-user.h +Index: gdm-2.91.94/gui/gdmsetup/gdm-user.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user.h 2011-04-08 16:33:46.921921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-user.h @@ -0,0 +1,59 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -2672,10 +2672,10 @@ +G_END_DECLS + +#endif -Index: gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c +Index: gdm-2.91.94/gui/gdmsetup/gdm-user-manager.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c 2011-04-08 16:33:46.931921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-user-manager.c @@ -0,0 +1,1658 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -4335,10 +4335,10 @@ + + return GDM_USER_MANAGER (user_manager_object); +} -Index: gdm-2.32.1/gui/gdmsetup/gdm-user-manager.h +Index: gdm-2.91.94/gui/gdmsetup/gdm-user-manager.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user-manager.h 2011-04-08 16:33:46.931921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-user-manager.h @@ -0,0 +1,87 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -4427,10 +4427,10 @@ +G_END_DECLS + +#endif /* __GDM_USER_MANAGER_H */ -Index: gdm-2.32.1/gui/gdmsetup/gdm-user-private.h +Index: gdm-2.91.94/gui/gdmsetup/gdm-user-private.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user-private.h 2011-04-08 16:33:46.931921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/gdm-user-private.h @@ -0,0 +1,44 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -4476,10 +4476,10 @@ +G_END_DECLS + +#endif /* !__GDM_USER_PRIVATE__ */ -Index: gdm-2.32.1/gui/gdmsetup/Makefile.am +Index: gdm-2.91.94/gui/gdmsetup/Makefile.am =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/gui/gdmsetup/Makefile.am 2011-04-08 16:33:46.931921354 +1000 +--- /dev/null ++++ gdm-2.91.94/gui/gdmsetup/Makefile.am @@ -0,0 +1,40 @@ +NULL = + @@ -4521,11 +4521,11 @@ + $(ui_DATA) \ + $(Utilities_in_files) \ + $(NULL) -Index: gdm-2.32.1/po/POTFILES.in +Index: gdm-2.91.94/po/POTFILES.in =================================================================== ---- gdm-2.32.1.orig/po/POTFILES.in 2011-04-08 16:33:45.161921352 +1000 -+++ gdm-2.32.1/po/POTFILES.in 2011-04-08 16:33:46.931921354 +1000 -@@ -60,6 +60,9 @@ +--- gdm-2.91.94.orig/po/POTFILES.in ++++ gdm-2.91.94/po/POTFILES.in +@@ -61,6 +61,9 @@ data/greeter-autostart/metacity.desktop.in data/greeter-autostart/orca-screen-reader.desktop.in data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in @@ -4535,14 +4535,14 @@ gui/simple-chooser/gdm-host-chooser-dialog.c gui/simple-chooser/gdm-host-chooser-widget.c gui/simple-greeter/gdm-cell-renderer-timer.c -Index: gdm-2.32.1/gui/Makefile.am +Index: gdm-2.91.94/gui/Makefile.am =================================================================== ---- gdm-2.32.1.orig/gui/Makefile.am 2011-04-08 16:33:45.041921352 +1000 -+++ gdm-2.32.1/gui/Makefile.am 2011-04-08 16:33:46.931921354 +1000 -@@ -3,6 +3,7 @@ +--- gdm-2.91.94.orig/gui/Makefile.am ++++ gdm-2.91.94/gui/Makefile.am +@@ -2,6 +2,7 @@ + SUBDIRS = \ simple-greeter \ - user-switch-applet \ + gdmsetup \ $(NULL) diff -Nru gdm-2.32.1/debian/patches/10_xsplash.patch gdm-3.0.0/debian/patches/10_xsplash.patch --- gdm-2.32.1/debian/patches/10_xsplash.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/10_xsplash.patch 2011-04-08 14:32:32.000000000 +0000 @@ -2,10 +2,10 @@ Bug: https://wiki.ubuntu.com/DesktopTeam/Specs/Karmic/LoginExperience === modified file 'data/Init.in' -Index: gdm-2.32.0/data/Init.in +Index: gdm-3.0.0/data/Init.in =================================================================== ---- gdm-2.32.0.orig/data/Init.in 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/data/Init.in 2010-12-07 15:11:07.087501999 +0100 +--- gdm-3.0.0.orig/data/Init.in ++++ gdm-3.0.0/data/Init.in @@ -6,6 +6,11 @@ PATH="@X_PATH@:$PATH" OLD_IFS=$IFS @@ -18,10 +18,10 @@ gdmwhich () { COMMAND="$1" OUTPUT= -Index: gdm-2.32.0/data/PreSession.in +Index: gdm-3.0.0/data/PreSession.in =================================================================== ---- gdm-2.32.0.orig/data/PreSession.in 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/data/PreSession.in 2010-12-07 15:11:07.087501999 +0100 +--- gdm-3.0.0.orig/data/PreSession.in ++++ gdm-3.0.0/data/PreSession.in @@ -7,3 +7,8 @@ # Note that output goes into the .xsession-errors file for easy debugging # @@ -31,11 +31,11 @@ +#then +# /usr/bin/xsplash --daemon +#fi -Index: gdm-2.32.0/gui/simple-greeter/gdm-greeter-session.c +Index: gdm-3.0.0/gui/simple-greeter/gdm-greeter-session.c =================================================================== ---- gdm-2.32.0.orig/gui/simple-greeter/gdm-greeter-session.c 2010-09-15 20:58:11.000000000 +0200 -+++ gdm-2.32.0/gui/simple-greeter/gdm-greeter-session.c 2010-12-07 15:11:07.087501999 +0100 -@@ -457,6 +457,13 @@ +--- gdm-3.0.0.orig/gui/simple-greeter/gdm-greeter-session.c ++++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-session.c +@@ -423,6 +423,13 @@ toggle_panel (session, TRUE); toggle_login_window (session, TRUE); diff -Nru gdm-2.32.1/debian/patches/15_default_session.patch gdm-3.0.0/debian/patches/15_default_session.patch --- gdm-2.32.1/debian/patches/15_default_session.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/15_default_session.patch 2011-03-30 20:06:08.000000000 +0000 @@ -4,11 +4,11 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=594733 Bug-Ubuntu: https://launchpad.net/bugs/403291 -Index: gdm-2.32.0/configure.ac +Index: gdm-2.91.94/configure.ac =================================================================== ---- gdm-2.32.0.orig/configure.ac 2010-12-07 15:11:06.457502000 +0100 -+++ gdm-2.32.0/configure.ac 2010-12-07 15:11:17.377502002 +0100 -@@ -129,6 +129,13 @@ +--- gdm-2.91.94.orig/configure.ac ++++ gdm-2.91.94/configure.ac +@@ -131,6 +131,13 @@ AC_SUBST(GDMSETUP_CFLAGS) AC_SUBST(GDMSETUP_LIBS) @@ -21,11 +21,11 @@ + PKG_CHECK_MODULES(SIMPLE_GREETER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION -Index: gdm-2.32.0/daemon/gdm-session-direct.c + gtk+-3.0 >= $GTK_REQUIRED_VERSION +Index: gdm-2.91.94/daemon/gdm-session-direct.c =================================================================== ---- gdm-2.32.0.orig/daemon/gdm-session-direct.c 2010-09-16 00:53:43.000000000 +0200 -+++ gdm-2.32.0/daemon/gdm-session-direct.c 2010-12-07 15:11:17.387502002 +0100 +--- gdm-2.91.94.orig/daemon/gdm-session-direct.c ++++ gdm-2.91.94/daemon/gdm-session-direct.c @@ -63,6 +63,10 @@ #define GDM_SESSION_DBUS_INTERFACE "org.gnome.DisplayManager.Session" #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel" @@ -37,7 +37,7 @@ #ifndef GDM_SESSION_DEFAULT_PATH #define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" #endif -@@ -664,6 +668,26 @@ +@@ -619,6 +623,26 @@ char *name; GSequence *sessions; GSequenceIter *session; @@ -64,10 +64,10 @@ if (session_direct->priv->fallback_session_name != NULL) { /* verify that the cached version still exists */ -Index: gdm-2.32.0/utils/gdm-set-default-session.c +Index: gdm-2.91.94/utils/gdm-set-default-session.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.0/utils/gdm-set-default-session.c 2010-12-07 15:11:17.000000000 +0100 +--- /dev/null ++++ gdm-2.91.94/utils/gdm-set-default-session.c @@ -0,0 +1,271 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -340,10 +340,10 @@ + exit(return_code); + +} -Index: gdm-2.32.0/utils/Makefile.am +Index: gdm-2.91.94/utils/Makefile.am =================================================================== ---- gdm-2.32.0.orig/utils/Makefile.am 2010-08-27 16:54:37.000000000 +0200 -+++ gdm-2.32.0/utils/Makefile.am 2010-12-07 15:11:17.387502002 +0100 +--- gdm-2.91.94.orig/utils/Makefile.am ++++ gdm-2.91.94/utils/Makefile.am @@ -6,11 +6,13 @@ -DLOCALSTATEDIR=\""$(localstatedir)"\" \ -DGDM_SCREENSHOT_DIR=\""$(GDM_SCREENSHOT_DIR)"\"\ diff -Nru gdm-2.32.1/debian/patches/17_use_timed_login_after_autologin.patch gdm-3.0.0/debian/patches/17_use_timed_login_after_autologin.patch --- gdm-2.32.1/debian/patches/17_use_timed_login_after_autologin.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/17_use_timed_login_after_autologin.patch 2011-03-30 20:08:22.000000000 +0000 @@ -1,13 +1,13 @@ Description: Revert upstream change to not use timed login after autologin session Bug: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/396489 -Index: gdm-2.30.4/daemon/gdm-static-display.c +Index: gdm-2.91.94/daemon/gdm-static-display.c =================================================================== ---- gdm-2.30.4.orig/daemon/gdm-static-display.c 2010-06-16 18:32:38.000000000 +0200 -+++ gdm-2.30.4/daemon/gdm-static-display.c 2010-06-30 14:49:28.000000000 +0200 -@@ -121,6 +121,9 @@ - { - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); +--- gdm-2.91.94.orig/daemon/gdm-static-display.c ++++ gdm-2.91.94/daemon/gdm-static-display.c +@@ -123,6 +123,9 @@ + + GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE; + /* Only allow timed/automatic login once */ + GDM_STATIC_DISPLAY (display)->priv->enable_timed_login = FALSE; diff -Nru gdm-2.32.1/debian/patches/19_no_greeter_for_autologin.patch gdm-3.0.0/debian/patches/19_no_greeter_for_autologin.patch --- gdm-2.32.1/debian/patches/19_no_greeter_for_autologin.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/19_no_greeter_for_autologin.patch 2011-04-08 14:32:40.000000000 +0000 @@ -2,11 +2,11 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=596830 Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/435801 -Index: gdm-2.32.1/daemon/gdm-simple-slave.c +Index: gdm-3.0.0/daemon/gdm-simple-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:32:16.451921308 +1000 -@@ -1164,6 +1164,7 @@ +--- gdm-3.0.0.orig/daemon/gdm-simple-slave.c ++++ gdm-3.0.0/daemon/gdm-simple-slave.c +@@ -1263,6 +1263,7 @@ if (res) { gboolean enabled; int delay; @@ -14,7 +14,7 @@ /* FIXME: handle wait-for-go */ -@@ -1171,7 +1172,8 @@ +@@ -1270,7 +1271,8 @@ delay = 0; enabled = FALSE; diff -Nru gdm-2.32.1/debian/patches/24_respect_system_minuid.patch gdm-3.0.0/debian/patches/24_respect_system_minuid.patch --- gdm-2.32.1/debian/patches/24_respect_system_minuid.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/24_respect_system_minuid.patch 2011-03-30 20:15:16.000000000 +0000 @@ -7,10 +7,10 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/708911 Author: Kees Cook -Index: gdm-2.32.1/daemon/gdm-user-manager.c +Index: gdm-2.32.0/daemon/gdm-user-manager.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-user-manager.c 2011-04-08 16:32:15.051921308 +1000 -+++ gdm-2.32.1/daemon/gdm-user-manager.c 2011-04-08 16:32:20.451921310 +1000 +--- gdm-2.32.0.orig/daemon/gdm-user-manager.c 2011-01-28 13:35:30.077160491 -0800 ++++ gdm-2.32.0/daemon/gdm-user-manager.c 2011-01-28 13:48:46.848088701 -0800 @@ -29,6 +29,7 @@ #include #include @@ -122,10 +122,10 @@ /* sessions */ manager->priv->sessions = g_hash_table_new_full (g_str_hash, g_str_equal, -Index: gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c +Index: gdm-2.32.0/gui/gdmsetup/gdm-user-manager.c =================================================================== ---- gdm-2.32.1.orig/gui/gdmsetup/gdm-user-manager.c 2011-04-08 16:32:10.011921306 +1000 -+++ gdm-2.32.1/gui/gdmsetup/gdm-user-manager.c 2011-04-08 16:32:20.451921310 +1000 +--- gdm-2.32.0.orig/gui/gdmsetup/gdm-user-manager.c 2011-01-28 13:35:30.107155256 -0800 ++++ gdm-2.32.0/gui/gdmsetup/gdm-user-manager.c 2011-01-28 13:48:46.858086956 -0800 @@ -29,6 +29,7 @@ #include #include @@ -229,135 +229,4 @@ /* sessions */ manager->priv->sessions = g_hash_table_new_full (g_str_hash, g_str_equal, -Index: gdm-2.32.1/gui/simple-greeter/gdm-user-manager.c -=================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-user-manager.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/gui/simple-greeter/gdm-user-manager.c 2011-04-08 16:32:20.461921310 +1000 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_PATHS_H - #include -@@ -63,7 +64,7 @@ - #ifdef __sun - #define FALLBACK_MINIMAL_UID 100 - #else --#define FALLBACK_MINIMAL_UID 500 -+#define FALLBACK_MINIMAL_UID 1000 - #endif - - #ifndef _PATH_SHELLS -@@ -175,6 +176,7 @@ - gboolean load_passwd_pending; - - guint load_id; -+ guint minimal_uid; - guint reload_passwd_id; - guint ck_history_id; - guint ck_history_watchdog_id; -@@ -1347,6 +1349,10 @@ - goto failed; - } - -+ if (pwent->pw_uid < manager->priv->minimal_uid) { -+ return; -+ } -+ - /* check exclusions up front */ - if (username_in_exclude_list (manager, pwent->pw_name)) { - g_debug ("GdmUserManager: excluding user '%s'", pwent->pw_name); -@@ -1914,6 +1920,7 @@ - gboolean res; - char *username; - gulong frequency; -+ struct passwd *pwent; - GdmUser *user; - - frequency = 0; -@@ -1923,6 +1930,11 @@ - return; - } - -+ get_pwent_for_name (username, &pwent); -+ if (pwent && pwent->pw_uid < manager->priv->minimal_uid) { -+ return; -+ } -+ - if (username_in_exclude_list (manager, username)) { - g_debug ("GdmUserManager: excluding user '%s'", username); - g_free (username); -@@ -2154,6 +2166,7 @@ - - static void - reload_passwd_file (GHashTable *valid_shells, -+ GdmUserManager *manager, - GSList *exclude_users, - GSList *include_users, - gboolean include_all, -@@ -2234,7 +2247,7 @@ - pwent = fgetpwent (fp)) { - - /* Skip users below MinimalUID... */ -- if (pwent->pw_uid < FALLBACK_MINIMAL_UID) { -+ if (pwent->pw_uid < manager->priv->minimal_uid) { - continue; - } - -@@ -2389,6 +2402,7 @@ - g_debug ("GdmUserManager: reloading passwd file worker"); - - reload_passwd_file (data->shells, -+ data->manager, - data->exclude_users, - data->include_users, - data->include_all, -@@ -2500,6 +2514,38 @@ - maybe_set_is_loaded (manager); - } - -+static guint -+system_minimal_uid (void) -+{ -+ guint uid = FALLBACK_MINIMAL_UID; -+#ifndef __sun -+ char *defspath = "/etc/login.defs"; -+ FILE *fp; -+ char line[128]; -+ -+ errno = 0; -+ fp = fopen (defspath, "r"); -+ if (fp == NULL) { -+ g_warning ("Unable to open %s: %s", defspath, g_strerror (errno)); -+ goto out; -+ } -+ while (fgets (line, sizeof(line), fp)) { -+ if (strncmp (line, "UID_MIN", 7) == 0) { -+ char *ptr = line + 7; -+ int value; -+ while (*ptr && isblank (*ptr)) { ptr++; } -+ value = atoi (ptr); -+ if (value) uid = value; -+ break; -+ } -+ } -+ fclose (fp); -+out: -+#endif -+ return uid; -+} -+ -+ - static void - load_sessions (GdmUserManager *manager) - { -@@ -2921,6 +2967,7 @@ - GError *error; - - manager->priv = GDM_USER_MANAGER_GET_PRIVATE (manager); -+ manager->priv->minimal_uid = system_minimal_uid (); - - /* sessions */ - manager->priv->sessions = g_hash_table_new_full (g_str_hash, + diff -Nru gdm-2.32.1/debian/patches/27_save_root_window.patch gdm-3.0.0/debian/patches/27_save_root_window.patch --- gdm-2.32.1/debian/patches/27_save_root_window.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/27_save_root_window.patch 2011-03-30 20:16:26.000000000 +0000 @@ -7,12 +7,12 @@ This combined with starting the X server with -nr will give us a nice fade transition when g-s-d starts --- -Index: gdm-2.32.1/daemon/gdm-simple-slave.c +Index: gdm-2.91.94/daemon/gdm-simple-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-04-08 16:32:16.451921308 +1000 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:32:23.731921312 +1000 -@@ -1007,6 +1007,15 @@ - { +--- gdm-2.91.94.orig/daemon/gdm-simple-slave.c ++++ gdm-2.91.94/daemon/gdm-simple-slave.c +@@ -1106,6 +1106,15 @@ + /* Set the busy cursor */ gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); + @@ -27,20 +27,20 @@ } static void -Index: gdm-2.32.1/daemon/gdm-slave.c +Index: gdm-2.91.94/daemon/gdm-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-slave.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-slave.c 2011-04-08 16:32:23.731921312 +1000 +--- gdm-2.91.94.orig/daemon/gdm-slave.c ++++ gdm-2.91.94/daemon/gdm-slave.c @@ -43,6 +43,7 @@ #include #include /* for Display */ +#include /* for XA_PIXMAP */ #include /* for watch cursor */ + #include #include - -@@ -354,6 +355,77 @@ - return ret; +@@ -434,6 +435,77 @@ + } } +static void @@ -117,13 +117,13 @@ void gdm_slave_set_busy_cursor (GdmSlave *slave) { -Index: gdm-2.32.1/daemon/gdm-slave.h +Index: gdm-2.91.94/daemon/gdm-slave.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-slave.h 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-slave.h 2011-04-08 16:32:23.731921312 +1000 -@@ -74,6 +74,7 @@ +--- gdm-2.91.94.orig/daemon/gdm-slave.h ++++ gdm-2.91.94/daemon/gdm-slave.h +@@ -77,6 +77,7 @@ + void gdm_slave_set_initial_cursor_position (GdmSlave *slave); - gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave); void gdm_slave_set_busy_cursor (GdmSlave *slave); +void gdm_slave_save_root_windows (GdmSlave *slave); gboolean gdm_slave_run_script (GdmSlave *slave, diff -Nru gdm-2.32.1/debian/patches/28_plymouth_transition.patch gdm-3.0.0/debian/patches/28_plymouth_transition.patch --- gdm-2.32.1/debian/patches/28_plymouth_transition.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/28_plymouth_transition.patch 2011-03-30 20:17:41.000000000 +0000 @@ -5,10 +5,10 @@ This commit checks if plymouth is running, and if so, turns on the smooth transition between plymouth and X. -Index: gdm-2.32.1/daemon/gdm-server.c +Index: gdm-2.91.94/daemon/gdm-server.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-server.c 2011-04-08 16:32:05.000000000 +1000 -+++ gdm-2.32.1/daemon/gdm-server.c 2011-04-08 16:33:12.701921336 +1000 +--- gdm-2.91.94.orig/daemon/gdm-server.c ++++ gdm-2.91.94/daemon/gdm-server.c @@ -34,6 +34,9 @@ #include #include @@ -86,10 +86,10 @@ static void server_died (GdmServer *server) -Index: gdm-2.32.1/daemon/gdm-server.h +Index: gdm-2.91.94/daemon/gdm-server.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-server.h 2011-02-18 14:27:53.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-server.h 2011-04-08 16:33:12.701921336 +1000 +--- gdm-2.91.94.orig/daemon/gdm-server.h ++++ gdm-2.91.94/daemon/gdm-server.h @@ -56,6 +56,7 @@ GdmServer * gdm_server_new (const char *display_id, const char *auth_file); @@ -98,19 +98,19 @@ gboolean gdm_server_stop (GdmServer *server); char * gdm_server_get_display_device (GdmServer *server); -Index: gdm-2.32.1/daemon/gdm-simple-slave.c +Index: gdm-2.91.94/daemon/gdm-simple-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-04-08 16:32:54.851921328 +1000 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:33:12.701921336 +1000 -@@ -91,6 +91,7 @@ +--- gdm-2.91.94.orig/daemon/gdm-simple-slave.c ++++ gdm-2.91.94/daemon/gdm-simple-slave.c +@@ -88,6 +88,7 @@ + + guint start_session_when_ready : 1; + guint waiting_to_start_session : 1; ++ guint plymouth_is_running : 1; #ifdef HAVE_LOGINDEVPERM gboolean use_logindevperm; #endif -+ guint plymouth_is_running : 1; - }; - - enum { -@@ -1002,6 +1003,91 @@ +@@ -1098,6 +1099,91 @@ slave->priv->start_session_when_ready = FALSE; } @@ -202,7 +202,7 @@ static void setup_server (GdmSimpleSlave *slave) { -@@ -1016,6 +1102,10 @@ +@@ -1115,6 +1201,10 @@ */ gdm_slave_save_root_windows (GDM_SLAVE (slave)); @@ -213,7 +213,7 @@ } static void -@@ -1217,6 +1307,10 @@ +@@ -1316,6 +1406,10 @@ g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code); gdm_slave_stopped (GDM_SLAVE (slave)); @@ -224,7 +224,7 @@ } static void -@@ -1229,6 +1323,10 @@ +@@ -1328,6 +1422,10 @@ g_strsignal (signal_number)); gdm_slave_stopped (GDM_SLAVE (slave)); @@ -235,7 +235,7 @@ } static gboolean -@@ -1273,7 +1371,21 @@ +@@ -1372,7 +1470,21 @@ G_CALLBACK (on_server_ready), slave); @@ -258,7 +258,7 @@ if (! res) { g_warning (_("Could not start the X " "server (your graphical environment) " -@@ -1283,6 +1395,9 @@ +@@ -1382,6 +1494,9 @@ "In the meantime this display will be " "disabled. Please restart GDM when " "the problem is corrected.")); diff -Nru gdm-2.32.1/debian/patches/29_switch_user.patch gdm-3.0.0/debian/patches/29_switch_user.patch --- gdm-2.32.1/debian/patches/29_switch_user.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/29_switch_user.patch 2011-03-30 20:22:28.000000000 +0000 @@ -4,10 +4,10 @@ Subject: [PATCH] Add SwitchToUser() method which automatically selects that user in the greeter or switches to an already open session Bug: https://bugzilla.gnome.org/show_bug.cgi?id=606923 -Index: gdm-2.32.1/daemon/gdm-display.c +Index: gdm-2.91.94/daemon/gdm-display.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-display.c 2011-02-18 14:27:53.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-display.c 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/gdm-display.c ++++ gdm-2.91.94/daemon/gdm-display.c @@ -60,6 +60,7 @@ time_t creation_time; GTimer *slave_timer; @@ -94,11 +94,11 @@ PROP_STATUS, g_param_spec_int ("status", "status", -Index: gdm-2.32.1/daemon/gdm-greeter-server.c +Index: gdm-2.91.94/daemon/gdm-greeter-server.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-greeter-server.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-greeter-server.c 2011-04-08 16:33:17.011921338 +1000 -@@ -289,6 +289,14 @@ +--- gdm-2.91.94.orig/daemon/gdm-greeter-server.c ++++ gdm-2.91.94/daemon/gdm-greeter-server.c +@@ -281,6 +281,14 @@ } void @@ -113,7 +113,7 @@ gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server, const char *username, int delay) -@@ -762,6 +770,9 @@ +@@ -722,6 +730,9 @@ " \n" " \n" " \n" @@ -123,7 +123,7 @@ " \n" " \n" " \n" -@@ -1117,7 +1128,7 @@ +@@ -1077,7 +1088,7 @@ "display id", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); @@ -132,11 +132,11 @@ PROP_USER_NAME, g_param_spec_string ("user-name", "user name", -Index: gdm-2.32.1/daemon/gdm-greeter-server.h +Index: gdm-2.91.94/daemon/gdm-greeter-server.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-greeter-server.h 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-greeter-server.h 2011-04-08 16:33:17.011921338 +1000 -@@ -96,6 +96,8 @@ +--- gdm-2.91.94.orig/daemon/gdm-greeter-server.h ++++ gdm-2.91.94/daemon/gdm-greeter-server.h +@@ -92,6 +92,8 @@ void gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server, const char *text); @@ -145,10 +145,10 @@ void gdm_greeter_server_request_timed_login (GdmGreeterServer *greeter_server, const char *username, int delay); -Index: gdm-2.32.1/daemon/gdm-local-display-factory.c +Index: gdm-2.91.94/daemon/gdm-local-display-factory.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-local-display-factory.c 2011-04-08 16:32:13.671921308 +1000 -+++ gdm-2.32.1/daemon/gdm-local-display-factory.c 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/gdm-local-display-factory.c ++++ gdm-2.91.94/daemon/gdm-local-display-factory.c @@ -496,6 +496,121 @@ } } @@ -271,10 +271,10 @@ gboolean gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory, const char *parent_display_id, -Index: gdm-2.32.1/daemon/gdm-local-display-factory.h +Index: gdm-2.91.94/daemon/gdm-local-display-factory.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-local-display-factory.h 2011-04-08 16:32:13.671921308 +1000 -+++ gdm-2.32.1/daemon/gdm-local-display-factory.h 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/gdm-local-display-factory.h ++++ gdm-2.91.94/daemon/gdm-local-display-factory.h @@ -64,6 +64,10 @@ gboolean gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *factory, char **id, @@ -286,10 +286,10 @@ gboolean gdm_local_display_factory_start_guest_session (GdmLocalDisplayFactory *factory, const char *current_user_session, -Index: gdm-2.32.1/daemon/gdm-local-display-factory.xml +Index: gdm-2.91.94/daemon/gdm-local-display-factory.xml =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-local-display-factory.xml 2011-04-08 16:32:13.671921308 +1000 -+++ gdm-2.32.1/daemon/gdm-local-display-factory.xml 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/gdm-local-display-factory.xml ++++ gdm-2.91.94/daemon/gdm-local-display-factory.xml @@ -13,5 +13,9 @@ @@ -300,17 +300,20 @@ + -Index: gdm-2.32.1/daemon/gdm-simple-slave.c +Index: gdm-2.91.94/daemon/gdm-simple-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-04-08 16:33:12.701921336 +1000 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:33:17.011921338 +1000 -@@ -92,10 +92,13 @@ - gboolean use_logindevperm; - #endif +--- gdm-2.91.94.orig/daemon/gdm-simple-slave.c ++++ gdm-2.91.94/daemon/gdm-simple-slave.c +@@ -89,6 +89,8 @@ + guint start_session_when_ready : 1; + guint waiting_to_start_session : 1; guint plymouth_is_running : 1; + + gchar *username; - }; + #ifdef HAVE_LOGINDEVPERM + gboolean use_logindevperm; + #endif +@@ -96,6 +98,7 @@ enum { PROP_0, @@ -318,7 +321,7 @@ }; static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass); -@@ -626,6 +629,16 @@ +@@ -617,6 +620,16 @@ } static void @@ -335,7 +338,7 @@ on_session_conversation_started (GdmSession *session, GdmSimpleSlave *slave) { -@@ -642,6 +655,19 @@ +@@ -633,6 +646,19 @@ } } @@ -355,7 +358,7 @@ enabled = FALSE; gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); if (! enabled) { -@@ -1469,7 +1495,14 @@ +@@ -1568,7 +1594,14 @@ const GValue *value, GParamSpec *pspec) { @@ -370,7 +373,7 @@ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -1482,7 +1515,14 @@ +@@ -1581,7 +1614,14 @@ GValue *value, GParamSpec *pspec) { @@ -385,7 +388,7 @@ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -1519,6 +1559,14 @@ +@@ -1618,6 +1658,14 @@ g_type_class_add_private (klass, sizeof (GdmSimpleSlavePrivate)); @@ -400,7 +403,7 @@ dbus_g_object_type_install_info (GDM_TYPE_SIMPLE_SLAVE, &dbus_glib_gdm_simple_slave_object_info); } -@@ -1554,12 +1602,13 @@ +@@ -1653,12 +1701,13 @@ } GdmSlave * @@ -415,10 +418,10 @@ NULL); return GDM_SLAVE (object); -Index: gdm-2.32.1/daemon/gdm-simple-slave.h +Index: gdm-2.91.94/daemon/gdm-simple-slave.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.h 2011-02-18 14:27:53.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-simple-slave.h 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/gdm-simple-slave.h ++++ gdm-2.91.94/daemon/gdm-simple-slave.h @@ -48,7 +48,8 @@ } GdmSimpleSlaveClass; @@ -429,10 +432,10 @@ G_END_DECLS -Index: gdm-2.32.1/daemon/simple-slave-main.c +Index: gdm-2.91.94/daemon/simple-slave-main.c =================================================================== ---- gdm-2.32.1.orig/daemon/simple-slave-main.c 2011-04-08 16:32:12.881921306 +1000 -+++ gdm-2.32.1/daemon/simple-slave-main.c 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/daemon/simple-slave-main.c ++++ gdm-2.91.94/daemon/simple-slave-main.c @@ -45,6 +45,7 @@ #include "gdm-common.h" #include "gdm-simple-slave.h" @@ -462,10 +465,10 @@ if (slave == NULL) { goto out; } -Index: gdm-2.32.1/data/gdm.conf.in +Index: gdm-2.91.94/data/gdm.conf.in =================================================================== ---- gdm-2.32.1.orig/data/gdm.conf.in 2011-04-08 16:32:15.051921308 +1000 -+++ gdm-2.32.1/data/gdm.conf.in 2011-04-08 16:33:17.011921338 +1000 +--- gdm-2.91.94.orig/data/gdm.conf.in ++++ gdm-2.91.94/data/gdm.conf.in @@ -74,6 +74,9 @@ send_member="CreateTransientDisplay"/> priv->timed_login_already_enabled = TRUE; } @@ -581,7 +584,7 @@ void gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, const char *username, -@@ -1009,6 +1029,10 @@ +@@ -1019,6 +1039,10 @@ if (!login_window->priv->user_list_disabled) { gtk_widget_show (login_window->priv->user_chooser); @@ -592,24 +595,24 @@ } if (login_window->priv->timed_login_username != NULL -Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h +Index: gdm-2.91.94/gui/simple-greeter/gdm-greeter-login-window.h =================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-login-window.h 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h 2011-04-08 16:33:17.011921338 +1000 -@@ -77,6 +77,8 @@ - gboolean gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, - const char *text); +--- gdm-2.91.94.orig/gui/simple-greeter/gdm-greeter-login-window.h ++++ gdm-2.91.94/gui/simple-greeter/gdm-greeter-login-window.h +@@ -80,6 +80,8 @@ + void gdm_greeter_login_window_set_default_session_name (GdmGreeterLoginWindow *login_window, + const char *text); +void gdm_greeter_login_window_select_user (GdmGreeterLoginWindow *login_window, + const char *username); void gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, const char *username, int delay); -Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c +Index: gdm-2.91.94/gui/simple-greeter/gdm-greeter-session.c =================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-session.c 2011-04-08 16:32:10.791921306 +1000 -+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c 2011-04-08 16:33:17.011921338 +1000 -@@ -182,6 +182,15 @@ +--- gdm-2.91.94.orig/gui/simple-greeter/gdm-greeter-session.c ++++ gdm-2.91.94/gui/simple-greeter/gdm-greeter-session.c +@@ -167,6 +167,15 @@ } static void @@ -625,7 +628,7 @@ on_timed_login_requested (GdmGreeterClient *client, const char *text, int delay, -@@ -625,6 +634,10 @@ +@@ -587,6 +596,10 @@ G_CALLBACK (on_default_session_name_changed), session); g_signal_connect (session->priv->client, diff -Nru gdm-2.32.1/debian/patches/30_don_t_save_failsafe_session.patch gdm-3.0.0/debian/patches/30_don_t_save_failsafe_session.patch --- gdm-2.32.1/debian/patches/30_don_t_save_failsafe_session.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/30_don_t_save_failsafe_session.patch 2011-03-30 20:31:12.000000000 +0000 @@ -2,10 +2,10 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607703 Bug-Ubuntu: https://launchpad.net/bugs/509182 -Index: gdm-2.32.1/daemon/gdm-session-direct.c +Index: gdm-2.32.0/daemon/gdm-session-direct.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-session-direct.c 2011-04-08 16:32:14.361921308 +1000 -+++ gdm-2.32.1/daemon/gdm-session-direct.c 2011-04-08 16:33:19.711921340 +1000 +--- gdm-2.32.0.orig/daemon/gdm-session-direct.c 2010-12-07 15:19:56.837502001 +0100 ++++ gdm-2.32.0/daemon/gdm-session-direct.c 2010-12-07 15:21:37.417502001 +0100 @@ -177,6 +177,32 @@ } @@ -144,7 +144,7 @@ static char * get_session_command (GdmSessionDirect *session) { -@@ -2319,6 +2429,10 @@ +@@ -2311,6 +2421,10 @@ send_dbus_string_signal (impl, "SetSessionName", get_session_name (impl)); @@ -155,30 +155,30 @@ } static void -Index: gdm-2.32.1/daemon/gdm-session-settings.c +Index: gdm-2.32.0/daemon/gdm-session-settings.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-session-settings.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-session-settings.c 2011-04-08 16:33:19.711921340 +1000 +--- gdm-2.32.0.orig/daemon/gdm-session-settings.c 2010-08-27 16:54:37.000000000 +0200 ++++ gdm-2.32.0/daemon/gdm-session-settings.c 2010-12-07 15:21:37.417502001 +0100 @@ -35,6 +35,7 @@ - struct _GdmSessionSettingsPrivate { - char *session_name; + ActUserManager *user_manager; + ActUser *user; + gboolean failsafe; + char *session_name; char *language_name; - char *layout_name; }; @@ -57,6 +58,7 @@ PROP_SESSION_NAME, PROP_LANGUAGE_NAME, - PROP_LAYOUT_NAME, + PROP_IS_LOADED + PROP_IS_FAILSAFE, }; G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT) @@ -100,6 +102,11 @@ - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_LAYOUT_NAME, param_spec); + param_spec = g_param_spec_boolean ("is-loaded", NULL, NULL, + FALSE, G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_IS_LOADED, param_spec); + param_spec = g_param_spec_string ("is-failsafe", "Failsafe Session", + "Whether the session is a failsafe one", + NULL, @@ -262,19 +262,17 @@ key_file = g_key_file_new (); file_error = NULL; -Index: gdm-2.32.1/daemon/gdm-session-settings.h +Index: gdm-2.32.0/daemon/gdm-session-settings.h =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-session-settings.h 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-session-settings.h 2011-04-08 16:33:19.711921340 +1000 -@@ -63,12 +63,15 @@ +--- gdm-2.32.0.orig/daemon/gdm-session-settings.h 2010-08-27 16:54:37.000000000 +0200 ++++ gdm-2.32.0/daemon/gdm-session-settings.h 2010-12-07 15:21:37.417502001 +0100 +@@ -63,10 +63,13 @@ + gboolean gdm_session_settings_is_loaded (GdmSessionSettings *settings); char *gdm_session_settings_get_language_name (GdmSessionSettings *settings); - char *gdm_session_settings_get_layout_name (GdmSessionSettings *settings); char *gdm_session_settings_get_session_name (GdmSessionSettings *settings); +gboolean gdm_session_settings_get_is_failsafe (GdmSessionSettings *settings); void gdm_session_settings_set_language_name (GdmSessionSettings *settings, const char *language_name); - void gdm_session_settings_set_layout_name (GdmSessionSettings *settings, - const char *layout_name); void gdm_session_settings_set_session_name (GdmSessionSettings *settings, const char *session_name); +void gdm_session_settings_set_is_failsafe (GdmSessionSettings *settings, @@ -282,11 +280,11 @@ G_END_DECLS #endif /* GDM_SESSION_SETTINGS_H */ -Index: gdm-2.32.1/daemon/gdm-session-worker.c +Index: gdm-2.32.0/daemon/gdm-session-worker.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-session-worker.c 2011-03-29 03:51:12.000000000 +1100 -+++ gdm-2.32.1/daemon/gdm-session-worker.c 2011-04-08 16:33:19.711921340 +1000 -@@ -2179,6 +2179,14 @@ +--- gdm-2.32.0.orig/daemon/gdm-session-worker.c 2010-09-15 20:58:10.000000000 +0200 ++++ gdm-2.32.0/daemon/gdm-session-worker.c 2010-12-07 15:21:37.427502001 +0100 +@@ -2213,6 +2213,14 @@ } static void @@ -301,7 +299,7 @@ on_set_session_name (GdmSessionWorker *worker, DBusMessage *message) { -@@ -2201,6 +2209,28 @@ +@@ -2235,6 +2243,28 @@ } static void @@ -330,7 +328,7 @@ gdm_session_worker_set_language_name (GdmSessionWorker *worker, const char *language_name) { -@@ -2821,6 +2851,8 @@ +@@ -2855,6 +2885,8 @@ on_set_layout_name (worker, message); } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) { on_set_session_name (worker, message); diff -Nru gdm-2.32.1/debian/patches/32-hide-mouse-cursor.patch gdm-3.0.0/debian/patches/32-hide-mouse-cursor.patch --- gdm-2.32.1/debian/patches/32-hide-mouse-cursor.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/32-hide-mouse-cursor.patch 2011-04-08 14:32:51.000000000 +0000 @@ -2,25 +2,25 @@ Author: Martin Pitt Origin: Ubuntu -Index: gdm-2.32.1/daemon/gdm-simple-slave.c +Index: gdm-3.0.0/daemon/gdm-simple-slave.c =================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-04-08 16:33:17.011921338 +1000 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:33:23.621921342 +1000 -@@ -1117,9 +1117,6 @@ - static void - setup_server (GdmSimpleSlave *slave) - { +--- gdm-3.0.0.orig/daemon/gdm-simple-slave.c ++++ gdm-3.0.0/daemon/gdm-simple-slave.c +@@ -1216,9 +1216,6 @@ + /* Put cursor out of the way on first head */ + gdm_slave_set_initial_cursor_position (GDM_SLAVE (slave)); + - /* Set the busy cursor */ - gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); - /* The root window has a background that may be useful * to cross fade or transition from when setting the * login screen background. We read it here, and stuff -Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c +Index: gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.c =================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-login-window.c 2011-04-08 16:33:17.011921338 +1000 -+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c 2011-04-08 16:33:23.621921342 +1000 -@@ -171,7 +171,7 @@ +--- gdm-3.0.0.orig/gui/simple-greeter/gdm-greeter-login-window.c ++++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.c +@@ -174,7 +174,7 @@ { GdkCursor *cursor; diff -Nru gdm-2.32.1/debian/patches/36_language_environment_settings.patch gdm-3.0.0/debian/patches/36_language_environment_settings.patch --- gdm-2.32.1/debian/patches/36_language_environment_settings.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/36_language_environment_settings.patch 2011-03-18 22:39:10.000000000 +0000 @@ -1,41 +1,12 @@ -Description: Alters the way GDM handles language settings. -Bug-Ubuntu: https://launchpad.net/bugs/553162, https://launchpad.net/bugs/666565, https://launchpad.net/bugs/740754 +Description: Alters the way Xsession handles language settings. +Bug-Ubuntu: https://launchpad.net/bugs/553162, https://launchpad.net/bugs/666565 Forwarded: not-needed Author: Gunnar Hjalmarsson -Index: gdm-2.32.1/daemon/gdm-session-direct.c -=================================================================== ---- gdm-2.32.1.orig/daemon/gdm-session-direct.c 2011-04-08 16:34:14.821921366 +1000 -+++ gdm-2.32.1/daemon/gdm-session-direct.c 2011-04-08 16:34:15.661921368 +1000 -@@ -691,10 +691,23 @@ - static const char * - get_default_language_name (GdmSessionDirect *session) - { -+ char *langlist, *language; -+ - if (session->priv->saved_language != NULL) { - return session->priv->saved_language; - } - -+ langlist = getenv("LANGUAGE"); -+ if (langlist != NULL && strlen(langlist) > 0) { -+ char *colon = strchr (langlist, ':'); -+ if (colon) { -+ language = g_strndup (langlist, colon - langlist); -+ } else { -+ language = g_strdup (langlist); -+ } -+ return language; -+ } -+ - return setlocale (LC_MESSAGES, NULL); - } - -Index: gdm-2.32.1/data/Xsession.in -=================================================================== ---- gdm-2.32.1.orig/data/Xsession.in 2011-04-08 16:34:14.801921366 +1000 -+++ gdm-2.32.1/data/Xsession.in 2011-04-08 16:34:15.661921368 +1000 -@@ -146,11 +146,136 @@ +diff -Nur -x '*.orig' -x '*~' gdm-2.32.0//data/Xsession.in gdm-2.32.0.new//data/Xsession.in +--- gdm-2.32.0//data/Xsession.in 2010-08-27 23:45:29.000000000 +0200 ++++ gdm-2.32.0.new//data/Xsession.in 2011-02-23 18:02:53.519712072 +0100 +@@ -146,11 +146,135 @@ unset XKB_IN_USE @@ -128,7 +99,7 @@ +} + +# read /var/cache/gdm/$USER/dmrc and set LANGUAGE and LC_MESSAGES -+if [ -n "$GDM_LANG" -a $DESKTOP_SESSION != 'guest-restricted' ]; then ++if [ -n "$GDM_LANG" -a $GDMSESSION != 'guest-restricted' ]; then + if [ $GDM_LANG != ${GDM_LANG%.utf8*} ]; then + gdm_selected=${GDM_LANG%.*}${GDM_LANG#*.utf8} + elif [ $GDM_LANG != ${GDM_LANG%.UTF-8*} ]; then @@ -144,11 +115,10 @@ + [ "${line%=*}" = 'Langlist' ] && langlist=${line#*=} + [ "${line%=*}" = 'LCMess' ] && lcmess=${line#*=} + done < $dmrc -+ if [ -z "$langlist" -a -z "$lcmess" -a -f "$HOME/.xsession-errors.old" ]; then -+ # Both fields empty and not $USER's first login ever => we assume that this is -+ # $USER's first login since upgrading from a pre 2.32.0-0ubuntu2 GDM version, -+ # so we fake $gdm_selected in an attempt to get the language environment right -+ # from start and prevent an undesired surprise. ++ if [ -z "$langlist" -a -z "$lcmess" ]; then ++ # Both fields empty => we assume that this is $USER's first login since upgrading ++ # from a pre 2.32.0-0ubuntu2 GDM version, so we fake $gdm_selected in an attempt to ++ # get the language environment right from start and prevent an undesired surprise. + if [ -n "$LANGUAGE" ]; then + gdm_selected=${LANGUAGE%%:*} + if [ "$( grep -F Language $dmrc )" ]; then diff -Nru gdm-2.32.1/debian/patches/37_disable_resize_grip.patch gdm-3.0.0/debian/patches/37_disable_resize_grip.patch --- gdm-2.32.1/debian/patches/37_disable_resize_grip.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/37_disable_resize_grip.patch 2011-04-08 14:32:58.000000000 +0000 @@ -1,8 +1,8 @@ -Index: gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.c +Index: gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.c =================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-greeter-panel.c 2011-04-08 16:34:14.431921366 +1000 -+++ gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.c 2011-04-08 16:34:18.581921368 +1000 -@@ -889,7 +889,7 @@ +--- gdm-3.0.0.orig/gui/simple-greeter/gdm-greeter-panel.c ++++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.c +@@ -1071,7 +1071,7 @@ gdm_greeter_panel_init (GdmGreeterPanel *panel) { panel->priv = GDM_GREETER_PANEL_GET_PRIVATE (panel); diff -Nru gdm-2.32.1/debian/patches/38_user_chooser_focus.patch gdm-3.0.0/debian/patches/38_user_chooser_focus.patch --- gdm-2.32.1/debian/patches/38_user_chooser_focus.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/38_user_chooser_focus.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -From b971eb1038cb92ed8211b68a7d2a99a98d86ed7f Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Wed, 12 Jan 2011 18:38:46 +0100 -Subject: [PATCH] Correctly give focus to the user chooser on startup - -We manually handle how focus works in the GdmChooserWidget container, -and we try to automatically move the focus to the treeview inside the -chooser. However, it fails the first time because the treeview is not -realized yet and the logic in the code assumes that if focus moved to -the chooser, it moved to the treeview, so later attempt to get the focus -grabbed by the treeview are just ignored. - -It works fine when using gtk_widget_child_focus() to give the focus to -the treeview. And this makes more sense since the chooser is a container -anyway. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=629310 -Bug-Ubuntu: https://launchpad.net/bugs/687440 ---- - gui/simple-greeter/gdm-chooser-widget.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c -index db2d9b2..ebbfdb9 100644 ---- a/gui/simple-greeter/gdm-chooser-widget.c -+++ b/gui/simple-greeter/gdm-chooser-widget.c -@@ -910,17 +910,13 @@ _grab_focus (GtkWidget *widget) - - foc_widget = GDM_CHOOSER_WIDGET (widget)->priv->items_view; - g_debug ("GdmChooserWidget: grabbing focus"); -- if (! gtk_widget_get_realized (foc_widget)) { -- g_debug ("GdmChooserWidget: not grabbing focus - not realized"); -- return; -- } - - if (gtk_widget_has_focus (foc_widget)) { - g_debug ("GdmChooserWidget: not grabbing focus - already has it"); - return; - } - -- gtk_widget_grab_focus (foc_widget); -+ gtk_widget_child_focus (foc_widget, GTK_DIR_TAB_FORWARD); - } - - static void --- -1.7.3.4 diff -Nru gdm-2.32.1/debian/patches/39_grep_path.patch gdm-3.0.0/debian/patches/39_grep_path.patch --- gdm-2.32.1/debian/patches/39_grep_path.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/39_grep_path.patch 2011-04-08 14:33:01.000000000 +0000 @@ -1,7 +1,7 @@ -Index: gdm-2.32.1/data/Init.in +Index: gdm-3.0.0/data/Init.in =================================================================== ---- gdm-2.32.1.orig/data/Init.in 2011-04-08 16:33:58.721921358 +1000 -+++ gdm-2.32.1/data/Init.in 2011-04-08 16:34:20.841921370 +1000 +--- gdm-3.0.0.orig/data/Init.in ++++ gdm-3.0.0/data/Init.in @@ -55,7 +55,7 @@ UNAME=`gdmwhich uname` PROCESSOR=`$UNAME -p` diff -Nru gdm-2.32.1/debian/patches/40_one_lang_option_per_translation.patch gdm-3.0.0/debian/patches/40_one_lang_option_per_translation.patch --- gdm-2.32.1/debian/patches/40_one_lang_option_per_translation.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/40_one_lang_option_per_translation.patch 2011-03-30 20:41:44.000000000 +0000 @@ -3,11 +3,11 @@ Forwarded: not-needed Author: Gunnar Hjalmarsson -Index: gdm-2.32.1/data/Makefile.am +Index: gdm-2.91.94/data/Makefile.am =================================================================== ---- gdm-2.32.1.orig/data/Makefile.am 2011-04-08 16:33:40.071921350 +1000 -+++ gdm-2.32.1/data/Makefile.am 2011-04-08 16:34:22.251921370 +1000 -@@ -152,6 +152,8 @@ +--- gdm-2.91.94.orig/data/Makefile.am ++++ gdm-2.91.94/data/Makefile.am +@@ -171,6 +171,8 @@ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(gdmconfdir)/Xsession @@ -16,10 +16,10 @@ if test '!' -d $(DESTDIR)$(initdir); then \ $(mkinstalldirs) $(DESTDIR)$(initdir); \ chmod 755 $(DESTDIR)$(initdir); \ -Index: gdm-2.32.1/data/language-options +Index: gdm-2.91.94/data/language-options =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdm-2.32.1/data/language-options 2011-04-08 16:34:22.251921370 +1000 +--- /dev/null ++++ gdm-2.91.94/data/language-options @@ -0,0 +1,64 @@ +#!/usr/bin/perl +use strict; @@ -85,19 +85,19 @@ +# print the resulting list of language options +print join("\n", keys %intersection) || 'en'; + -Index: gdm-2.32.1/gui/simple-greeter/gdm-languages.c +Index: gdm-2.91.94/gui/simple-greeter/gdm-languages.c =================================================================== ---- gdm-2.32.1.orig/gui/simple-greeter/gdm-languages.c 2011-03-29 03:48:50.000000000 +1100 -+++ gdm-2.32.1/gui/simple-greeter/gdm-languages.c 2011-04-08 16:34:22.251921370 +1000 -@@ -49,6 +49,7 @@ - #define ARCHIVE_FILE LIBLOCALEDIR "/locale-archive" +--- gdm-2.91.94.orig/gui/simple-greeter/gdm-languages.c ++++ gdm-2.91.94/gui/simple-greeter/gdm-languages.c +@@ -50,6 +50,7 @@ + #define SYSTEM_ARCHIVE_FILE "/usr/lib/locale/locale-archive" #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes" #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale" +#define LANGUAGE_OPTIONS_SCRIPT DATADIR "/gdm/language-options" typedef struct _GdmLocale { char *id; -@@ -377,12 +378,6 @@ +@@ -384,12 +385,6 @@ name = g_strdup (language_name); } @@ -110,7 +110,7 @@ locale = g_new0 (GdmLocale, 1); gdm_parse_language_name (name, &locale->language_code, -@@ -603,21 +598,21 @@ +@@ -614,21 +609,21 @@ static void collect_locales (void) { @@ -140,7 +140,7 @@ } static gboolean -@@ -1018,6 +1013,7 @@ +@@ -1056,6 +1051,7 @@ char *language_code; char *territory_code; char *codeset_code; @@ -148,7 +148,7 @@ char *langinfo_codeset; char *translated_language; char *translated_territory; -@@ -1040,12 +1036,13 @@ +@@ -1078,12 +1074,13 @@ language_code = NULL; territory_code = NULL; codeset_code = NULL; @@ -163,7 +163,7 @@ if (language_code == NULL) { goto out; -@@ -1067,6 +1064,10 @@ +@@ -1105,6 +1102,10 @@ translated_territory); } @@ -174,7 +174,7 @@ language_name_get_codeset_details (name, &langinfo_codeset, &is_utf8); if (codeset_code == NULL && langinfo_codeset != NULL) { -@@ -1083,6 +1084,7 @@ +@@ -1121,6 +1122,7 @@ g_free (language_code); g_free (territory_code); g_free (codeset_code); diff -Nru gdm-2.32.1/debian/patches/41_pt_time_format.patch gdm-3.0.0/debian/patches/41_pt_time_format.patch --- gdm-2.32.1/debian/patches/41_pt_time_format.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/41_pt_time_format.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -From 97474c8fb6a3c6f533168672b918d2bedc1cf3ec Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Wed, 30 Mar 2011 10:42:36 +0200 -Subject: [PATCH] Fix time format for Portugal - -Portugal uses 24 hour format according to the locale: - -$ LANG=pt_PT.utf8 date -Qua Mar 29 20:43:34 CEST 2011 - -In https://launchpad.net/bugs/696560 a Portugese user confirmed this as well. - -Original patch by jbatista, thanks! - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=646209 -Bug-Ubuntu: https://launchpad.net/bugs/696560 ---- - po/pt.po | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -Index: gdm-2.32.0/po/pt.po -=================================================================== ---- gdm-2.32.0.orig/po/pt.po 2010-09-15 20:58:11.000000000 +0200 -+++ gdm-2.32.0/po/pt.po 2011-03-30 10:48:02.967617679 +0200 -@@ -538,28 +538,28 @@ - #. - #: ../gui/simple-greeter/gdm-clock-widget.c:70 - msgid "%a %b %e, %l:%M:%S %p" --msgstr "%a %b %e, %l:%M:%S %p" -+msgstr "%a %b %e, %H:%M:%S %p" - - #. translators: This is the time format to use when both - #. * the date and time without seconds are being shown together. - #. - #: ../gui/simple-greeter/gdm-clock-widget.c:76 - msgid "%a %b %e, %l:%M %p" --msgstr "%a %b %e, %l:%M %p" -+msgstr "%a %b %e, %H:%M %p" - - #. translators: This is the time format to use when there is - #. * no date, just weekday and time with seconds. - #. - #: ../gui/simple-greeter/gdm-clock-widget.c:83 - msgid "%a %l:%M:%S %p" --msgstr "%a %l:%M:%S %p" -+msgstr "%a %H:%M:%S %p" - - #. translators: This is the time format to use when there is - #. * no date, just weekday and time without seconds. - #. - #: ../gui/simple-greeter/gdm-clock-widget.c:92 - msgid "%a %l:%M %p" --msgstr "%a %l:%M %p" -+msgstr "%a %H:%M" - - #: ../gui/simple-greeter/gdm-greeter-login-window.c:290 - msgid "Automatically logging in…" diff -Nru gdm-2.32.1/debian/patches/42_no_ecryptfs_autologin.patch gdm-3.0.0/debian/patches/42_no_ecryptfs_autologin.patch --- gdm-2.32.1/debian/patches/42_no_ecryptfs_autologin.patch 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/42_no_ecryptfs_autologin.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -Description: Don't autologin if using ecryptfs - if you do then the home directory is empty as you need the password entered via PAM to decrypt it. This is not a perfect solution as the home directory may not be mounted yet. -Author: Robert Ancell -Bug: http://launchpad.net/bugs/284443 - -Index: gdm-2.32.1/daemon/gdm-simple-slave.c -=================================================================== ---- gdm-2.32.1.orig/daemon/gdm-simple-slave.c 2011-04-08 16:34:06.801921362 +1000 -+++ gdm-2.32.1/daemon/gdm-simple-slave.c 2011-04-08 16:34:24.741921372 +1000 -@@ -638,6 +638,24 @@ - slave->priv->username = g_strdup (username); - } - -+static gboolean -+using_ecryptfs (const gchar *username) -+{ -+ gchar *path; -+ struct stat statbuf; -+ struct passwd *info; -+ int r; -+ -+ info = getpwnam (username); -+ if (!info) -+ return FALSE; -+ -+ path = g_build_filename (info->pw_dir, ".ecryptfs", "auto-mount", NULL); -+ r = g_stat (path, &statbuf); -+ g_free (path); -+ return r == 0; -+} -+ - static void - on_session_conversation_started (GdmSession *session, - GdmSimpleSlave *slave) -@@ -670,7 +688,8 @@ - - enabled = FALSE; - gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); -- if (! enabled) { -+ if (! enabled || using_ecryptfs (username)) { -+ g_free (username); - return; - } - -@@ -1295,8 +1314,7 @@ - delay = 0; - enabled = FALSE; - gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); -- g_free (username); -- if (! enabled || delay > 0) { -+ if (! enabled || delay > 0 || using_ecryptfs (username)) { - start_greeter (slave); - create_new_session (slave); - } else { -@@ -1304,6 +1322,7 @@ - gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/Init", GDM_USERNAME); - reset_session (slave); - } -+ g_free (username); - } else { - if (slave->priv->connection_attempts >= MAX_CONNECT_ATTEMPTS) { - g_warning ("Unable to connect to display after %d tries - bailing out", slave->priv->connection_attempts); diff -Nru gdm-2.32.1/debian/patches/series gdm-3.0.0/debian/patches/series --- gdm-2.32.1/debian/patches/series 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/patches/series 2011-04-08 16:02:19.000000000 +0000 @@ -1,35 +1,30 @@ -00git_passwordless_login_crash.patch - 02_x_server_location.patch 04_fix_external_program_directories.patch 05_initial_server_on_vt7.patch 06_run_xsession.d.patch 08_use_polkit_for_settings.patch 09_gdmserver_gconf_settings.patch -09_gdmsetup.patch +#09_gdmsetup.patch 10_xsplash.patch 11_crash_for_apport.patch 14_guest_session.patch -15_default_session.patch +#15_default_session.patch 16_gdmserver_user_manager.patch -17_use_timed_login_after_autologin.patch +#17_use_timed_login_after_autologin.patch 19_no_greeter_for_autologin.patch 20_upstart.patch -24_respect_system_minuid.patch +#24_respect_system_minuid.patch 25_update_gconf_directories.patch 26_no_debug.patch 27_save_root_window.patch 28_plymouth_transition.patch 29_switch_user.patch -30_don_t_save_failsafe_session.patch +#30_don_t_save_failsafe_session.patch 32-hide-mouse-cursor.patch -33-multi-keyboard-layouts.patch +#33-multi-keyboard-layouts.patch 34_disable_a11y_default.patch -35_langlist_and_lsmess_dmrc_fields.patch +#35_langlist_and_lsmess_dmrc_fields.patch 36_language_environment_settings.patch 37_disable_resize_grip.patch -38_user_chooser_focus.patch 39_grep_path.patch 40_one_lang_option_per_translation.patch -41_pt_time_format.patch -42_no_ecryptfs_autologin.patch diff -Nru gdm-2.32.1/debian/rules gdm-3.0.0/debian/rules --- gdm-2.32.1/debian/rules 2011-04-08 06:50:30.000000000 +0000 +++ gdm-3.0.0/debian/rules 2011-04-08 16:19:29.000000000 +0000 @@ -22,7 +22,7 @@ endif binary-post-install/gdm:: - install -m644 debian/gdm-autologin.pam debian/gdm/etc/pam.d/gdm-autologin + #install -m644 debian/gdm-autologin.pam debian/gdm/etc/pam.d/gdm-autologin install -m644 debian/gdm.pam debian/gdm/etc/pam.d/gdm install -D -m644 debian/xterm.desktop debian/gdm/usr/share/xsessions/xterm.desktop install -D -m644 debian/xsession.desktop debian/gdm/usr/share/xsessions/xsession.desktop @@ -30,8 +30,8 @@ # move custom.conf to the examples mkdir -p debian/gdm/usr/share/doc/gdm/examples mv debian/gdm/etc/gdm/custom.conf debian/gdm/usr/share/doc/gdm/examples - mv debian/gdm/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server debian/gdm/usr/lib/bonobo/servers/GNOME_FastUserSwitchAppletGdm.server - rm -r debian/gdm/usr/lib/bonobo debian/gdm/usr/share/gnome-2.0 debian/gdm/usr/lib/gdm/gdm-user-switch-applet + #mv debian/gdm/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server debian/gdm/usr/lib/bonobo/servers/GNOME_FastUserSwitchAppletGdm.server + #rm -r debian/gdm/usr/lib/bonobo debian/gdm/usr/share/gnome-2.0 debian/gdm/usr/lib/gdm/gdm-user-switch-applet # install default settings mkdir debian/gdm/var/lib/gdm/.gconf.defaults install -m 664 debian/%gconf-tree.xml debian/gdm/var/lib/gdm/.gconf.defaults diff -Nru gdm-2.32.1/docs/id/gdm.xml gdm-3.0.0/docs/id/gdm.xml --- gdm-2.32.1/docs/id/gdm.xml 2011-03-28 16:57:54.000000000 +0000 +++ gdm-3.0.0/docs/id/gdm.xml 2011-04-04 14:47:46.000000000 +0000 @@ -82,32 +82,12 @@ 2010.Andika Triwidada (andika@gmail.com) - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation - License (GFDL), Version 1.1 or any later version published - by the Free Software Foundation with no Invariant Sections, - no Front-Cover Texts, and no Back-Cover Texts. You can find - a copy of the GFDL at this link or in the file COPYING-DOCS - distributed with this manual. - + Hak diberikan untuk menyalin, mendistribusikan, dan/atau mengubah dokumen ini di bawah persyaratan GNU Free Documentation License (GFDL, Lisensi Dokumentasi Bebas GNU), Versi 1.1 atau sebarang versi setelahnya yang dipublikasikan oleh Free Software Foundation tanpa Invariant Section, tanpa Front-Cover Texts, dan tanpa Back-Cover Texts. Anda dapat menemukan salinan dari GFDL pada taut ini atau di dalam berkas COPYING-DOCS yang didistribusikan bersama panduan ini. Manual ini adalah bagian dari suatu koleksi manual GNOME yang disebarkan di bawah GDFL. Bila Anda ingin menyebarkan manual ini secara terpisah dari koleksi, Anda dapat melakukannya dengan menambahkan salinan lisensi ke manual, sebagaimana dijelaskan di bagian 6 dari lisensi. - - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and the members of - the GNOME Documentation Project are made aware of those - trademarks, then the names are in capital letters or initial - capital letters. - - - - DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED - UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE - WITH THE FURTHER UNDERSTANDING THAT: + Banyak nama yang dipakai oleh perusahaan-perusahaan untuk membedakan produk dan layanan mereka diklaim sebagai merek dagang. Ketika nama-nama tersebut muncul di dalam sebarang dokumentasi GNOME, and anggota Projek Dokumentasi GNOME disadarkan atas merek dagang tersebut, maka nama-nama akan ditulis dalam huruf besar atau huruf awal huruf besar. - + DOKUMEN DAN VERSI YANG DOKUMEN YANG DIMODIFIKASI DISEDIAKAN DI BAWAH PERSYARATAN LISENSI GNU FREE DOCUMENTATION DENGAN PENGERTIAN LEBIH LANJUT BAHWA: DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR @@ -147,8 +127,7 @@ THE POSSIBILITY OF SUCH DAMAGES. - - + @@ -168,26 +147,15 @@ FreeDesktop - Organisasi yang menyediakan standar desktop, seperti misalnya Spesifikasi Entri Desktop yang dipakai oleh GDM. http://www.freedesktop.org. GDM - Manajer Tampilan GNOME. Dipakai untuk menjelaskan paket perangkat lunak secara utuh. - - Greeter - The graphical login window (gdm-simple-greeter). - + Greeter - Jendela log masuk grafis (gdm-simple-greeter). PAM - Pluggable Authentication Mechanism XDMCP - X Display Manage Protocol - - Xserver - An implementation of the X Window System. For example the - Xorg Xserver provided by the X.org Foundation - http://www.x.org. - + Xserver - Suatu implementasi Sistem X Window. Misalnya Xserver Xorg yang disediakan oleh X.org Foundation http://www.x.org. - - Paths that start with a word in angle brackets are relative to the - installation prefix. I.e. <share>/pixmaps/ - refers to /usr/share/pixmaps if GDM was - configured with --prefix=/usr. - + Path yang diawali dengan suatu kata yang diapit oleh tanda lebih dari dan kurang dari, posisinya relatif terhadap prefiks instalasi. Artinya <share>/pixmaps/ mengacu ke /usr/share/pixmaps bila GDM ditata dengan --prefix=/usr. @@ -198,43 +166,15 @@ Perkenalan - - The GNOME Display Manager (GDM) is a display manager that implements - all significant features required for managing attached and remote - displays. GDM was written from scratch and does not contain any XDM or - X Consortium code. - + Manajer Tampilan GNOME (GNOME Display Manager, GDM) adalah manajer tampilan yang mengimplementasikan semua fitur signifikan yang diperlukan untuk mengelola tampilan yang tersambung langsung dan jarak jauh. GDM ditulis dari awal dan tidak memuat sebarang kode XDM atau X Consortium. - - Note that GDM is configurable, and many configuration settings have - an impact on security. Issues to be aware of are highlighted in this - document. - + Catat bahwa GDM dapat dikonfigurasi, dan banyak tatanan konfigurasi memiliki dampak keamanan. Masalah-masalah yang mesti diwaspadai disorot pada dokumen ini. - - Please note that some Operating Systems configure GDM to behave - differently than the default values as described in this document. If - GDM does not seem to behave as documented, then check to see if any - related configuration may be different than described here. - + Mohon dicatat bahwa beberap Sistem Operasi menata GDM untuk berperilaku berbeda dengan nilai bawaan sebagaimana dijelaskan dalam dokumen ini. Bila GDM sepertinya tidak berperilaku seperti yang didokumentasikan, maka periksalah bila ada konfigurasi terkait yang mungkin berbeda dengan yang dijelaskan disini. - - For further information about GDM, refer to the project website at - - http://www.gnome.org/projects/gdm and the project - Wiki - http://live.gnome.org/GDM. - + Untuk informasi lebih lanjut tentang GDM, silakan mengacu ke situs web projek di http://www.gnome.org/projects/gdm dan Wiki projek http://live.gnome.org/GDM. - - For discussion or queries about GDM, refer to the -
gdm-list@gnome.org
mail list. This - list is archived, and is a good resource to check to seek answers to - common questions. This list is archived at - - http://mail.gnome.org/archives/gdm-list/ and has a search - facility to look for messages with keywords. - + Untuk diskusi atau pertanyaan tentang GDM, silakan mengacu ke milis
gdm-list@gnome.org
. List ini diarsipkan, dan merupakan sumber daya yang bagus untuk memeriksa dan mencari jawaban atas pertanyaan umum. List ini diarsipkan di http://mail.gnome.org/archives/gdm-list/ dan memiliki fasilitas pencarian untuk mencari pesan dengan kata kunci. Please submit any bug reports or enhancement requests to the @@ -1079,7 +1019,7 @@ - Autostart Configuration + Konfigurasi Autostart The <share>/gdm/autostart/LoginWindow @@ -1635,7 +1575,7 @@ - Greeter Configuration Keys + Kunci Konfigurasi Greeter /apps/gdm/simple-greeter/banner_message_enable @@ -2175,45 +2115,14 @@ the Introduction section of the document. - - If GDM is failing to work properly, it is always a good idea to include - debug information. To enable debugging, set the debug/Enable key to - "true" in the <etc>/gdm/custom.conf - file and restart GDM. Then use GDM to the point where it fails, and - debug output will be sent to the system log file - (<var>/log/messages or - <var>/adm/messages depending on your Operating - System). If you share this output with the GDM community via a bug - report or email, please only include the GDM related debug information - and not the entire file since it can be large. If you do not see any - GDM syslog output, you may need to configure syslog (refer to the - syslog man page). - + Bila GDM gagal bekerja dengan benar, sangat baik untuk menyertakan informasi awakutu. Untuk mengaktifkan pengawakutuan, tata kunci debug/Enable ke "true" di berkas <etc>/gdm/custom.conf dan mulai ulang GDM. Lalu gunakan GDM sampai titik kegagalan, dan keluaran awakutu akan dikirim ke berkas log sistem (<var>/log/messages atau <var>/adm/messages bergantung kepada Sistem Operasi Anda). Bila Anda berbagi keluaran ini dengan komunitas GDM melalui laporan kutu atau surel, mohon hanya sertakan informasi awakutu yang terkait GDM dan bukan seluruh berkas karena itu bisa jadi besar. Bila Anda tidak melihat keluaran syslog GDM apapun, mungkin Anda perlu menata ulang syslog (lihat halaman man syslog). GDM Tidak Akan Dimulai - - There are a many problems that can cause GDM to fail to start, but - this section will discuss a few common problems and how to approach - tracking down a problem with GDM starting. Some problems will - cause GDM to respond with an error message or dialog when it tries - to start, but it can be difficult to track down problems when GDM - fails silently. - + Banyak masalah yang dapat menyebabkan GDM gagal berjalan, tapi bagian ini akan membahas beberapa masalah umum dan bagaimana melacak suatu masalah memulai GDM. Beberapa masalah akan menyebabkan GDM merespon dengan pesan galat atau dialog ketika ia mencoba memulai, tapi bisa menjadi sulit melacak masalah ketika GDM gagal diam-diam. - - First make sure that the Xserver is configured properly. The - GDM configuration file contains a command in the [server-Standard] - section that is used for starting the Xserver. Verify that this - command works on your system. Running this command from the - console should start the Xserver. If it fails, then the problem - is likely with your Xserver configuration. Refer to your Xserver - error log for an idea of what the problem may be. The problem may - also be that your Xserver requires different command-line options. - If so, then modify the Xserver command in the GDM configuration file - so that it is correct for your system. - + Pertama pastikan bahwa Xserver ditata dengan benar. Berkas konfigurasi GDM memuat suatu perintah di bagian [server-Standard] yang dipakai untuk memulai Xserver. Periksa bahwa perintah ini bekerja baik pada sistem Anda. Menjalankan perintah ini dari konsol mestinya memulai Xserver. Bila gagal, maka masalahnya boleh jadi pada konfigurasi Xserver Anda. Lihat log galat Xserver Anda untuk ide apa kemungkinan masalahnya. Masalah mungkin juga karena bahwa Xserver Anda memerlukan opsi perintah baris yang berbeda. Bila begitu, maka ubahlah perintah Xserver di berkas konfigurasi GDM sehingga tepat bagi sistem Anda. Also make sure that the /tmp directory has diff -Nru gdm-2.32.1/docs/id/id.po gdm-3.0.0/docs/id/id.po --- gdm-2.32.1/docs/id/id.po 2011-03-28 16:57:55.000000000 +0000 +++ gdm-3.0.0/docs/id/id.po 2011-04-04 14:47:47.000000000 +0000 @@ -1,13 +1,13 @@ # Indonesian translation of gdm manual # Copyright (C) 2010 THE gdm manual'S COPYRIGHT HOLDER # This file is distributed under the same license as the gdm package. -# Andika Triwidada , 2010. +# Andika Triwidada , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gdm master\n" -"POT-Creation-Date: 2010-08-09 11:11+0000\n" -"PO-Revision-Date: 2010-08-09 19:48+0700\n" +"POT-Creation-Date: 2011-01-09 18:57+0000\n" +"PO-Revision-Date: 2011-01-10 20:09+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: GNOME Indonesian Translation Team \n" "MIME-Version: 1.0\n" @@ -113,11 +113,14 @@ msgid "2001" msgstr "2001" -#: C/gdm.xml:68(year) C/gdm.xml:73(year) C/gdm.xml:79(year) +#: C/gdm.xml:68(year) +#: C/gdm.xml:73(year) +#: C/gdm.xml:79(year) msgid "2003" msgstr "2003" -#: C/gdm.xml:69(year) C/gdm.xml:80(year) +#: C/gdm.xml:69(year) +#: C/gdm.xml:80(year) msgid "2004" msgstr "2004" @@ -125,11 +128,13 @@ msgid "George Lebl" msgstr "George Lebl" -#: C/gdm.xml:74(year) C/gdm.xml:83(year) +#: C/gdm.xml:74(year) +#: C/gdm.xml:83(year) msgid "2007" msgstr "2007" -#: C/gdm.xml:75(year) C/gdm.xml:84(year) +#: C/gdm.xml:75(year) +#: C/gdm.xml:84(year) msgid "2008" msgstr "2008" @@ -150,115 +155,53 @@ msgstr "Sun Microsystems, Inc." #: C/gdm.xml:2(para) -msgid "" -"Permission is granted to copy, distribute and/or modify this document under " -"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " -"later version published by the Free Software Foundation with no Invariant " -"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " -"in the file COPYING-DOCS distributed with this manual." -msgstr "" +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Hak diberikan untuk menyalin, mendistribusikan, dan/atau mengubah dokumen ini di bawah persyaratan GNU Free Documentation License (GFDL, Lisensi Dokumentasi Bebas GNU), Versi 1.1 atau sebarang versi setelahnya yang dipublikasikan oleh Free Software Foundation tanpa Invariant Section, tanpa Front-Cover Texts, dan tanpa Back-Cover Texts. Anda dapat menemukan salinan dari GFDL pada taut ini atau di dalam berkas COPYING-DOCS yang didistribusikan bersama panduan ini." #: C/gdm.xml:12(para) -msgid "" -"This manual is part of a collection of GNOME manuals distributed under the " -"GFDL. If you want to distribute this manual separately from the collection, " -"you can do so by adding a copy of the license to the manual, as described in " -"section 6 of the license." -msgstr "" -"Manual ini adalah bagian dari suatu koleksi manual GNOME yang disebarkan di " -"bawah GDFL. Bila Anda ingin menyebarkan manual ini secara terpisah dari " -"koleksi, Anda dapat melakukannya dengan menambahkan salinan lisensi ke " -"manual, sebagaimana dijelaskan di bagian 6 dari lisensi." +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "Manual ini adalah bagian dari suatu koleksi manual GNOME yang disebarkan di bawah GDFL. Bila Anda ingin menyebarkan manual ini secara terpisah dari koleksi, Anda dapat melakukannya dengan menambahkan salinan lisensi ke manual, sebagaimana dijelaskan di bagian 6 dari lisensi." #: C/gdm.xml:19(para) -msgid "" -"Many of the names used by companies to distinguish their products and " -"services are claimed as trademarks. Where those names appear in any GNOME " -"documentation, and the members of the GNOME Documentation Project are made " -"aware of those trademarks, then the names are in capital letters or initial " -"capital letters." -msgstr "" +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "Banyak nama yang dipakai oleh perusahaan-perusahaan untuk membedakan produk dan layanan mereka diklaim sebagai merek dagang. Ketika nama-nama tersebut muncul di dalam sebarang dokumentasi GNOME, and anggota Projek Dokumentasi GNOME disadarkan atas merek dagang tersebut, maka nama-nama akan ditulis dalam huruf besar atau huruf awal huruf besar." #: C/gdm.xml:35(para) -msgid "" -"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " -"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " -"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " -"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " -"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " -"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " -"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " -"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " -"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " -"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " -"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" msgstr "" #: C/gdm.xml:55(para) -msgid "" -"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " -"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " -"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " -"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " -"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " -"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " -"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " -"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " -"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " -"POSSIBILITY OF SUCH DAMAGES." +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." msgstr "" #: C/gdm.xml:28(para) -msgid "" -"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " -"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " -"" -msgstr "" +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "DOKUMEN DAN VERSI YANG DOKUMEN YANG DIMODIFIKASI DISEDIAKAN DI BAWAH PERSYARATAN LISENSI GNU FREE DOCUMENTATION DENGAN PENGERTIAN LEBIH LANJUT BAHWA: " -#: C/gdm.xml:90(releaseinfo) C/gdm.xml:101(para) -msgid "" -"This manual describes version 2.26.0 of the GNOME Display Manager. It was " -"last updated on 02/10/2009." -msgstr "" -"Manual ini menjelaskan Manajer Tampilan GNOME versi 2.26.0. Terakhir " -"diperbarui pada 02/10/2009." +#: C/gdm.xml:90(releaseinfo) +#: C/gdm.xml:101(para) +msgid "This manual describes version 2.26.0 of the GNOME Display Manager. It was last updated on 02/10/2009." +msgstr "Manual ini menjelaskan Manajer Tampilan GNOME versi 2.26.0. Terakhir diperbarui pada 02/10/2009." #: C/gdm.xml:99(title) msgid "Terms and Conventions Used in This Manual" msgstr "Istilah dan Konvensi yang Dipakai di Manual Ini" #: C/gdm.xml:106(para) -msgid "" -"Chooser - A program used to select a remote host for managing a display " -"remotely on the attached display (gdm-host-chooser)." -msgstr "" -"Chooser - Suatu program yang dipakai untuk memilih suatu host jauh untuk " -"mengelola tampilan dari jauh pada tampilan yang tersambung (gdm-" -"host-chooser)." +msgid "Chooser - A program used to select a remote host for managing a display remotely on the attached display (gdm-host-chooser)." +msgstr "Chooser - Suatu program yang dipakai untuk memilih suatu host jauh untuk mengelola tampilan dari jauh pada tampilan yang tersambung (gdm-host-chooser)." #: C/gdm.xml:111(para) -msgid "" -"FreeDesktop - The organization providing desktop standards, such as the " -"Desktop Entry Specification used by GDM. http://www.freedesktop.org." -msgstr "" -"FreeDesktop - Organisasi yang menyediakan standar desktop, seperti misalnya " -"Spesifikasi Entri Desktop yang dipakai oleh GDM. http://www.freedesktop.org." +msgid "FreeDesktop - The organization providing desktop standards, such as the Desktop Entry Specification used by GDM. http://www.freedesktop.org." +msgstr "FreeDesktop - Organisasi yang menyediakan standar desktop, seperti misalnya Spesifikasi Entri Desktop yang dipakai oleh GDM. http://www.freedesktop.org." #: C/gdm.xml:117(para) -msgid "" -"GDM - GNOME Display Manager. Used to describe the software package as a " -"whole." -msgstr "" -"GDM - Manajer Tampilan GNOME. Dipakai untuk menjelaskan paket perangkat " -"lunak secara utuh." +msgid "GDM - GNOME Display Manager. Used to describe the software package as a whole." +msgstr "GDM - Manajer Tampilan GNOME. Dipakai untuk menjelaskan paket perangkat lunak secara utuh." #: C/gdm.xml:122(para) -msgid "" -"Greeter - The graphical login window (gdm-simple-greeter)." -msgstr "" +msgid "Greeter - The graphical login window (gdm-simple-greeter)." +msgstr "Greeter - Jendela log masuk grafis (gdm-simple-greeter)." #: C/gdm.xml:126(para) msgid "PAM - Pluggable Authentication Mechanism" @@ -269,19 +212,12 @@ msgstr "XDMCP - X Display Manage Protocol" #: C/gdm.xml:134(para) -msgid "" -"Xserver - An implementation of the X Window System. For example the Xorg " -"Xserver provided by the X.org Foundation http://www.x.org." -msgstr "" +msgid "Xserver - An implementation of the X Window System. For example the Xorg Xserver provided by the X.org Foundation http://www.x.org." +msgstr "Xserver - Suatu implementasi Sistem X Window. Misalnya Xserver Xorg yang disediakan oleh X.org Foundation http://www.x.org." #: C/gdm.xml:140(para) -msgid "" -"Paths that start with a word in angle brackets are relative to the " -"installation prefix. I.e. <share>/pixmaps/ refers " -"to /usr/share/pixmaps if GDM was configured with " -"--prefix=/usr." -msgstr "" +msgid "Paths that start with a word in angle brackets are relative to the installation prefix. I.e. <share>/pixmaps/ refers to /usr/share/pixmaps if GDM was configured with --prefix=/usr." +msgstr "Path yang diawali dengan suatu kata yang diapit oleh tanda lebih dari dan kurang dari, posisinya relatif terhadap prefiks instalasi. Artinya <share>/pixmaps/ mengacu ke /usr/share/pixmaps bila GDM ditata dengan --prefix=/usr." #: C/gdm.xml:151(title) msgid "Overview" @@ -292,49 +228,27 @@ msgstr "Perkenalan" #: C/gdm.xml:156(para) -msgid "" -"The GNOME Display Manager (GDM) is a display manager that implements all " -"significant features required for managing attached and remote displays. GDM " -"was written from scratch and does not contain any XDM or X Consortium code." -msgstr "" +msgid "The GNOME Display Manager (GDM) is a display manager that implements all significant features required for managing attached and remote displays. GDM was written from scratch and does not contain any XDM or X Consortium code." +msgstr "Manajer Tampilan GNOME (GNOME Display Manager, GDM) adalah manajer tampilan yang mengimplementasikan semua fitur signifikan yang diperlukan untuk mengelola tampilan yang tersambung langsung dan jarak jauh. GDM ditulis dari awal dan tidak memuat sebarang kode XDM atau X Consortium." #: C/gdm.xml:163(para) -msgid "" -"Note that GDM is configurable, and many configuration settings have an " -"impact on security. Issues to be aware of are highlighted in this document." -msgstr "" +msgid "Note that GDM is configurable, and many configuration settings have an impact on security. Issues to be aware of are highlighted in this document." +msgstr "Catat bahwa GDM dapat dikonfigurasi, dan banyak tatanan konfigurasi memiliki dampak keamanan. Masalah-masalah yang mesti diwaspadai disorot pada dokumen ini." #: C/gdm.xml:169(para) -msgid "" -"Please note that some Operating Systems configure GDM to behave differently " -"than the default values as described in this document. If GDM does not seem " -"to behave as documented, then check to see if any related configuration may " -"be different than described here." -msgstr "" +msgid "Please note that some Operating Systems configure GDM to behave differently than the default values as described in this document. If GDM does not seem to behave as documented, then check to see if any related configuration may be different than described here." +msgstr "Mohon dicatat bahwa beberap Sistem Operasi menata GDM untuk berperilaku berbeda dengan nilai bawaan sebagaimana dijelaskan dalam dokumen ini. Bila GDM sepertinya tidak berperilaku seperti yang didokumentasikan, maka periksalah bila ada konfigurasi terkait yang mungkin berbeda dengan yang dijelaskan disini." #: C/gdm.xml:176(para) -msgid "" -"For further information about GDM, refer to the project website at http://www.gnome." -"org/projects/gdm and the project Wiki http://live.gnome.org/GDM." -msgstr "" +msgid "For further information about GDM, refer to the project website at http://www.gnome.org/projects/gdm and the project Wiki http://live.gnome.org/GDM." +msgstr "Untuk informasi lebih lanjut tentang GDM, silakan mengacu ke situs web projek di http://www.gnome.org/projects/gdm dan Wiki projek http://live.gnome.org/GDM." #: C/gdm.xml:184(para) -msgid "" -"For discussion or queries about GDM, refer to the
gdm-" -"list@gnome.org
mail list. This list is archived, and is a " -"good resource to check to seek answers to common questions. This list is " -"archived at http://mail.gnome.org/archives/gdm-list/ and has a search " -"facility to look for messages with keywords." -msgstr "" +msgid "For discussion or queries about GDM, refer to the
gdm-list@gnome.org
mail list. This list is archived, and is a good resource to check to seek answers to common questions. This list is archived at http://mail.gnome.org/archives/gdm-list/ and has a search facility to look for messages with keywords." +msgstr "Untuk diskusi atau pertanyaan tentang GDM, silakan mengacu ke milis
gdm-list@gnome.org
. List ini diarsipkan, dan merupakan sumber daya yang bagus untuk memeriksa dan mencari jawaban atas pertanyaan umum. List ini diarsipkan di http://mail.gnome.org/archives/gdm-list/ dan memiliki fasilitas pencarian untuk mencari pesan dengan kata kunci." #: C/gdm.xml:194(para) -msgid "" -"Please submit any bug reports or enhancement requests to the \"gdm\" " -"category in http://" -"bugzilla.gnome.org." +msgid "Please submit any bug reports or enhancement requests to the \"gdm\" category in http://bugzilla.gnome.org." msgstr "" #: C/gdm.xml:203(title) @@ -342,31 +256,15 @@ msgstr "Stabilitas Antar Muka" #: C/gdm.xml:205(para) -msgid "" -"GDM 2.20 and earlier supported stable configuration interfaces. However, the " -"codebase was completely rewritten for GDM 2.22, and is not completely " -"backward compatible with older releases. This is in part because things work " -"differently, so some options just don't make sense, in part because some " -"options never made sense, and in part because some functionality has not " -"been reimplemented yet." +msgid "GDM 2.20 and earlier supported stable configuration interfaces. However, the codebase was completely rewritten for GDM 2.22, and is not completely backward compatible with older releases. This is in part because things work differently, so some options just don't make sense, in part because some options never made sense, and in part because some functionality has not been reimplemented yet." msgstr "" #: C/gdm.xml:214(para) -msgid "" -"Interfaces which continue to be supported in a stable fashion include the " -"Init, PreSession, PostSession, PostLogin, and Xsession scripts. Some daemon " -"configuration options in the <etc>/gdm/custom.conf file continue to be supported. Also, the ~/.dmrc, and face browser image locations are still supported." +msgid "Interfaces which continue to be supported in a stable fashion include the Init, PreSession, PostSession, PostLogin, and Xsession scripts. Some daemon configuration options in the <etc>/gdm/custom.conf file continue to be supported. Also, the ~/.dmrc, and face browser image locations are still supported." msgstr "" #: C/gdm.xml:223(para) -msgid "" -"GDM 2.20 and earlier supported the ability to manage multiple displays with " -"separate graphics cards, such as used in terminal server environments, login " -"in a window via a program like Xnest or Xephyr, the gdmsetup program, XML-" -"based greeter themes, and the ability to run the XDMCP chooser from the " -"login screen. These features were not added back during the 2.22 rewrite." +msgid "GDM 2.20 and earlier supported the ability to manage multiple displays with separate graphics cards, such as used in terminal server environments, login in a window via a program like Xnest or Xephyr, the gdmsetup program, XML-based greeter themes, and the ability to run the XDMCP chooser from the login screen. These features were not added back during the 2.22 rewrite." msgstr "" #: C/gdm.xml:235(title) @@ -380,74 +278,27 @@ #. technical aspects. #. #: C/gdm.xml:246(para) -msgid "" -"GDM is responsible for managing displays on the system. This includes " -"authenticating users, starting the user session, and terminating the user " -"session. GDM is configurable and the ways it can be configured are described " -"in the \"Configuring GDM\" section of this document. GDM is also accessible " -"for users with disabilities." +msgid "GDM is responsible for managing displays on the system. This includes authenticating users, starting the user session, and terminating the user session. GDM is configurable and the ways it can be configured are described in the \"Configuring GDM\" section of this document. GDM is also accessible for users with disabilities." msgstr "" #: C/gdm.xml:254(para) -msgid "" -"GDM provides the ability to manage the main console display, and displays " -"launched via VT. It is integrated with other programs, such as the Fast User " -"Switch Applet (FUSA) and gnome-screensaver to manage multiple displays on " -"the console via the Xserver Virtual Terminal (VT) interface. It also can " -"manage XDMCP displays." +msgid "GDM provides the ability to manage the main console display, and displays launched via VT. It is integrated with other programs, such as the Fast User Switch Applet (FUSA) and gnome-screensaver to manage multiple displays on the console via the Xserver Virtual Terminal (VT) interface. It also can manage XDMCP displays." msgstr "" #: C/gdm.xml:262(para) -msgid "" -"Regardless of the display type, GDM will do the following when it manages " -"the display. It will start an Xserver process, then run the Init script as the root user, and start the greeter program on the " -"display." +msgid "Regardless of the display type, GDM will do the following when it manages the display. It will start an Xserver process, then run the Init script as the root user, and start the greeter program on the display." msgstr "" #: C/gdm.xml:269(para) -msgid "" -"The greeter program is run as the unprivileged \"gdm\" user/group. This user " -"and group are described in the \"Security\" section of this document. The " -"main function of the greeter program is to authenticate the user. The " -"authentication process is driven by Pluggable Authentication Modules (PAM). " -"The PAM modules determine what prompts (if any) are shown to the user to " -"authenticate. On the average system, the greeter program will request a " -"username and password for authentication. However some systems may be " -"configured to use alternative mechanisms such as a fingerprint or SmartCard " -"reader. GDM and PAM can be configured to not require any input, which will " -"cause GDM to automatically log in and simply start a session, which can be " -"useful for some environments, such as for kiosks." +msgid "The greeter program is run as the unprivileged \"gdm\" user/group. This user and group are described in the \"Security\" section of this document. The main function of the greeter program is to authenticate the user. The authentication process is driven by Pluggable Authentication Modules (PAM). The PAM modules determine what prompts (if any) are shown to the user to authenticate. On the average system, the greeter program will request a username and password for authentication. However some systems may be configured to use alternative mechanisms such as a fingerprint or SmartCard reader. GDM and PAM can be configured to not require any input, which will cause GDM to automatically log in and simply start a session, which can be useful for some environments, such as for kiosks." msgstr "" #: C/gdm.xml:285(para) -msgid "" -"In addition to authentication, the greeter program allows the user to select " -"which session to start and which language to use. Sessions are defined by " -"files that end in the .desktop suffix and more information about these files " -"can be found in the \"GDM User Session and Language Configuration\" section " -"of this document. By default, GDM is configured to display a face browser so " -"the user can select their user account by clicking on an image instead of " -"having to type their username. GDM keeps track of the user's default session " -"and language in the user's ~/.dmrc and will use these " -"defaults if the user did not pick a session or language in the login GUI." +msgid "In addition to authentication, the greeter program allows the user to select which session to start and which language to use. Sessions are defined by files that end in the .desktop suffix and more information about these files can be found in the \"GDM User Session and Language Configuration\" section of this document. By default, GDM is configured to display a face browser so the user can select their user account by clicking on an image instead of having to type their username. GDM keeps track of the user's default session and language in the user's ~/.dmrc and will use these defaults if the user did not pick a session or language in the login GUI." msgstr "" #: C/gdm.xml:298(para) -msgid "" -"After authenticating a user, the daemon runs the PostLogin script as root, then runs the PreSession " -"script as root. After running these scripts, the user session is started. " -"When the user exits their session, the PostSession " -"script is run as root. These scripts are provided as hooks for distributions " -"and end-users to customize how sessions are managed. For example, using " -"these hooks you could set up a machine which creates the user's $HOME " -"directory on the fly, and erases it on logout. The difference between the " -"PostLogin and PreSession scripts " -"is that PostLogin is run before the pam_open_session " -"call so is the right place to do anything which should be run before the " -"user session is initialized. The PreSession script is " -"called after session initialization." +msgid "After authenticating a user, the daemon runs the PostLogin script as root, then runs the PreSession script as root. After running these scripts, the user session is started. When the user exits their session, the PostSession script is run as root. These scripts are provided as hooks for distributions and end-users to customize how sessions are managed. For example, using these hooks you could set up a machine which creates the user's $HOME directory on the fly, and erases it on logout. The difference between the PostLogin and PreSession scripts is that PostLogin is run before the pam_open_session call so is the right place to do anything which should be run before the user session is initialized. The PreSession script is called after session initialization." msgstr "" #: C/gdm.xml:318(title) @@ -455,26 +306,11 @@ msgstr "Panel Greeter" #: C/gdm.xml:319(para) -msgid "" -"The GDM greeter program displays a panel docked at the bottom of the screen " -"which provides additional functionality. When a user is selected, the panel " -"allows the user to select which session, language, and keyboard layout to " -"use after logging in. The keyboard layout selector also changes the keyboard " -"layout used when typing your password. The panel also contains an area for " -"login services to leave status icons. Some example status icons include a " -"battery icon for current battery usage, and an icon for enabling " -"accessibility features. The greeter program also provides buttons which " -"allow the user to shutdown or restart the system. It is possible to " -"configure GDM to not provide the shutdown and restart buttons, if desired. " -"GDM can also be configured via PolicyKit (or via RBAC on Solaris) to require " -"the user have appropriate authorization before accepting the shutdown or " -"restart request." +msgid "The GDM greeter program displays a panel docked at the bottom of the screen which provides additional functionality. When a user is selected, the panel allows the user to select which session, language, and keyboard layout to use after logging in. The keyboard layout selector also changes the keyboard layout used when typing your password. The panel also contains an area for login services to leave status icons. Some example status icons include a battery icon for current battery usage, and an icon for enabling accessibility features. The greeter program also provides buttons which allow the user to shutdown or restart the system. It is possible to configure GDM to not provide the shutdown and restart buttons, if desired. GDM can also be configured via PolicyKit (or via RBAC on Solaris) to require the user have appropriate authorization before accepting the shutdown or restart request." msgstr "" #: C/gdm.xml:336(para) -msgid "" -"Note that keyboard layout features are only available on systems that " -"support libxklavier." +msgid "Note that keyboard layout features are only available on systems that support libxklavier." msgstr "" #: C/gdm.xml:343(title) @@ -482,22 +318,11 @@ msgstr "Aksesibilitas" #: C/gdm.xml:345(para) -msgid "" -"GDM supports \"Accessible Login\", allowing users to log into their desktop " -"session even if they cannot easily use the screen, mouse, or keyboard in the " -"usual way. Accessible Technology (AT) features such as an on-screen " -"keyboard, screen reader, screen magnifier, and Xserver AccessX keyboard " -"accessibility are available. It is also possible to enable large text or " -"high contrast icons and controls, if needed. Refer to the \"Accessibility " -"Configuration\" section of the document for more information how various " -"accessibility features can be configured." +msgid "GDM supports \"Accessible Login\", allowing users to log into their desktop session even if they cannot easily use the screen, mouse, or keyboard in the usual way. Accessible Technology (AT) features such as an on-screen keyboard, screen reader, screen magnifier, and Xserver AccessX keyboard accessibility are available. It is also possible to enable large text or high contrast icons and controls, if needed. Refer to the \"Accessibility Configuration\" section of the document for more information how various accessibility features can be configured." msgstr "" #: C/gdm.xml:357(para) -msgid "" -"On some Operating Systems, it is necessary to make sure that the GDM user is " -"a member of the \"audio\" group for AT programs that require audio output " -"(such as text-to-speech) to be functional." +msgid "On some Operating Systems, it is necessary to make sure that the GDM user is a member of the \"audio\" group for AT programs that require audio output (such as text-to-speech) to be functional." msgstr "" #: C/gdm.xml:365(title) @@ -505,43 +330,19 @@ msgstr "Peramban Wajah GDM" #: C/gdm.xml:367(para) -msgid "" -"The Face Browser is the interface which allows users to select their " -"username by clicking on an image. This feature can be enabled or disabled " -"via the /apps/gdm/simple-greeter/disable_user_list GConf key and is on by " -"default. When disabled, users must type their complete username by hand. " -"When enabled, it displays all local users which are available for login on " -"the system (all user accounts defined in the /etc/passwd file that have a " -"valid shell and sufficiently high UID) and remote users that have recently " -"logged in. The face browser in GDM 2.20 and earlier would attempt to display " -"all remote users, which caused performance problems in large, enterprise " -"deployments." +msgid "The Face Browser is the interface which allows users to select their username by clicking on an image. This feature can be enabled or disabled via the /apps/gdm/simple-greeter/disable_user_list GConf key and is on by default. When disabled, users must type their complete username by hand. When enabled, it displays all local users which are available for login on the system (all user accounts defined in the /etc/passwd file that have a valid shell and sufficiently high UID) and remote users that have recently logged in. The face browser in GDM 2.20 and earlier would attempt to display all remote users, which caused performance problems in large, enterprise deployments." msgstr "" #: C/gdm.xml:381(para) -msgid "" -"The Face Browser is configured to display the users who log in most " -"frequently at the top of the list. This helps to ensure that users who log " -"in frequently can quickly find their login image." +msgid "The Face Browser is configured to display the users who log in most frequently at the top of the list. This helps to ensure that users who log in frequently can quickly find their login image." msgstr "" #: C/gdm.xml:387(para) -msgid "" -"The Face Browser supports \"type-ahead search\" which dynamically moves the " -"face selection as the user types to the corresponding username in the list. " -"This means that a user with a long username will only have to type the first " -"few characters of the username before the correct item in the list gets " -"selected." +msgid "The Face Browser supports \"type-ahead search\" which dynamically moves the face selection as the user types to the corresponding username in the list. This means that a user with a long username will only have to type the first few characters of the username before the correct item in the list gets selected." msgstr "" #: C/gdm.xml:395(para) -msgid "" -"The icons used by GDM can be installed globally by the sysadmin or can be " -"located in the user's home directories. If installed globally they should be " -"in the <share>/pixmaps/faces/ directory and the " -"filename should be the name of the user. Face image files should be a " -"standard image that GTK+ can read, such as PNG or JPEG. Face icons placed in " -"the global face directory must be readable to the GDM user." +msgid "The icons used by GDM can be installed globally by the sysadmin or can be located in the user's home directories. If installed globally they should be in the <share>/pixmaps/faces/ directory and the filename should be the name of the user. Face image files should be a standard image that GTK+ can read, such as PNG or JPEG. Face icons placed in the global face directory must be readable to the GDM user." msgstr "" #. @@ -549,36 +350,19 @@ #. seems to use ~/.gnome/gdm. Error? #. #: C/gdm.xml:411(para) -msgid "" -"If there is no global icon for the user, GDM will look in the user's $HOME " -"directory for the image file. GDM will first look for the user's face image " -"in ~/.face. If not found, it will try ~/.face." -"icon. If still not found, it will use the value defined for " -"\"face/picture=\" in the ~/.gnome2/gdm file." +msgid "If there is no global icon for the user, GDM will look in the user's $HOME directory for the image file. GDM will first look for the user's face image in ~/.face. If not found, it will try ~/.face.icon. If still not found, it will use the value defined for \"face/picture=\" in the ~/.gnome2/gdm file." msgstr "" #: C/gdm.xml:420(para) -msgid "" -"If a user has no defined face image, GDM will use the \"stock_person\" icon " -"defined in the current GTK+ theme. If no such image is defined, it will " -"fallback to a generic face image." +msgid "If a user has no defined face image, GDM will use the \"stock_person\" icon defined in the current GTK+ theme. If no such image is defined, it will fallback to a generic face image." msgstr "" #: C/gdm.xml:426(para) -msgid "" -"Please note that loading and scaling face icons located in remote user home " -"directories can be a very time-consuming task. Since it not practical to " -"load images over NIS or NFS, GDM does not attempt to load face images from " -"remote home directories." +msgid "Please note that loading and scaling face icons located in remote user home directories can be a very time-consuming task. Since it not practical to load images over NIS or NFS, GDM does not attempt to load face images from remote home directories." msgstr "" #: C/gdm.xml:433(para) -msgid "" -"When the browser is turned on, valid usernames on the computer are exposed " -"for everyone to see. If XDMCP is enabled, then the usernames are exposed to " -"remote users. This, of course, limits security somewhat since a malicious " -"user does not need to guess valid usernames. In some very restrictive " -"environments the face browser may not be appropriate." +msgid "When the browser is turned on, valid usernames on the computer are exposed for everyone to see. If XDMCP is enabled, then the usernames are exposed to remote users. This, of course, limits security somewhat since a malicious user does not need to guess valid usernames. In some very restrictive environments the face browser may not be appropriate." msgstr "" #: C/gdm.xml:445(title) @@ -590,50 +374,27 @@ #. chooser is missing. #. #: C/gdm.xml:454(para) -msgid "" -"The GDM daemon can be configured to listen for and manage X Display Manage " -"Protocol (XDMCP) requests from remote displays. By default XDMCP support is " -"turned off, but can be enabled if desired. If GDM is built with TCP Wrapper " -"support, then the daemon will only grant access to hosts specified in the " -"GDM service section in the TCP Wrappers configuration file." +msgid "The GDM daemon can be configured to listen for and manage X Display Manage Protocol (XDMCP) requests from remote displays. By default XDMCP support is turned off, but can be enabled if desired. If GDM is built with TCP Wrapper support, then the daemon will only grant access to hosts specified in the GDM service section in the TCP Wrappers configuration file." msgstr "" #: C/gdm.xml:463(para) -msgid "" -"GDM includes several measures making it more resistant to denial of service " -"attacks on the XDMCP service. A lot of the protocol parameters, handshaking " -"timeouts, etc. can be fine tuned. The default configuration should work " -"reasonably on most systems." +msgid "GDM includes several measures making it more resistant to denial of service attacks on the XDMCP service. A lot of the protocol parameters, handshaking timeouts, etc. can be fine tuned. The default configuration should work reasonably on most systems." msgstr "" #: C/gdm.xml:470(para) -msgid "" -"GDM by default listens for XDMCP requests on the normal UDP port used for " -"XDMCP, port 177, and will respond to QUERY and BROADCAST_QUERY requests by " -"sending a WILLING packet to the originator." +msgid "GDM by default listens for XDMCP requests on the normal UDP port used for XDMCP, port 177, and will respond to QUERY and BROADCAST_QUERY requests by sending a WILLING packet to the originator." msgstr "" #: C/gdm.xml:476(para) -msgid "" -"GDM can also be configured to honor INDIRECT queries and present a host " -"chooser to the remote display. GDM will remember the user's choice and " -"forward subsequent requests to the chosen manager. GDM also supports an " -"extension to the protocol which will make it forget the redirection once the " -"user's connection succeeds. This extension is only supported if both daemons " -"are GDM. It is transparent and will be ignored by XDM or other daemons that " -"implement XDMCP." +msgid "GDM can also be configured to honor INDIRECT queries and present a host chooser to the remote display. GDM will remember the user's choice and forward subsequent requests to the chosen manager. GDM also supports an extension to the protocol which will make it forget the redirection once the user's connection succeeds. This extension is only supported if both daemons are GDM. It is transparent and will be ignored by XDM or other daemons that implement XDMCP." msgstr "" #: C/gdm.xml:486(para) -msgid "" -"If XDMCP seems to not be working, make sure that all machines are specified " -"in /etc/hosts." +msgid "If XDMCP seems to not be working, make sure that all machines are specified in /etc/hosts." msgstr "" #: C/gdm.xml:491(para) -msgid "" -"Refer to the \"Security\" section for information about security concerns " -"when using XDMCP." +msgid "Refer to the \"Security\" section for information about security concerns when using XDMCP." msgstr "" #: C/gdm.xml:498(title) @@ -641,34 +402,19 @@ msgstr "Log" #: C/gdm.xml:500(para) -msgid "" -"GDM uses syslog to log errors and status. It can also log debugging " -"information, which can be useful for tracking down problems if GDM is not " -"working properly. Debug output can be enabled by setting the debug/Enable " -"key to \"true\" in the <etc>/gdm/custom.conf file." +msgid "GDM uses syslog to log errors and status. It can also log debugging information, which can be useful for tracking down problems if GDM is not working properly. Debug output can be enabled by setting the debug/Enable key to \"true\" in the <etc>/gdm/custom.conf file." msgstr "" #: C/gdm.xml:508(para) -msgid "" -"Output from the various Xservers is stored in the GDM log directory, which " -"is normally <var>/log/gdm/. Any Xserver messages " -"are saved to a file associated with the display value, <" -"display>.log." +msgid "Output from the various Xservers is stored in the GDM log directory, which is normally <var>/log/gdm/. Any Xserver messages are saved to a file associated with the display value, <display>.log." msgstr "" #: C/gdm.xml:515(para) -msgid "" -"The session output is piped through the GDM daemon to the ~/." -"xsession-errors file. The file is overwritten on each login, so " -"logging out and logging back into the same user via GDM will cause any " -"messages from the previous session to be lost." +msgid "The session output is piped through the GDM daemon to the ~/.xsession-errors file. The file is overwritten on each login, so logging out and logging back into the same user via GDM will cause any messages from the previous session to be lost." msgstr "" #: C/gdm.xml:522(para) -msgid "" -"Note that if GDM can not create this file for some reason, then a fallback " -"file will be created named ~/.xsession-errors.XXXXXXXX " -"where the XXXXXXXX are some random characters." +msgid "Note that if GDM can not create this file for some reason, then a fallback file will be created named ~/.xsession-errors.XXXXXXXX where the XXXXXXXX are some random characters." msgstr "" #: C/gdm.xml:530(title) @@ -676,19 +422,11 @@ msgstr "Pindah Pengguna Dengan Cepat" #: C/gdm.xml:532(para) -msgid "" -"GDM allows multiple users to be logged in at the same time. After one user " -"is logged in, additional users can log in via the User Switcher on the GNOME " -"Panel, or from the \"Switch User\" button in Lock Screen dialog of GNOME " -"Screensaver. The active session can be changed back and forth using the same " -"mechanism. Note that some distributions may not add the User Switcher to the " -"default panel configuration. It can be added using the panel context menu." +msgid "GDM allows multiple users to be logged in at the same time. After one user is logged in, additional users can log in via the User Switcher on the GNOME Panel, or from the \"Switch User\" button in Lock Screen dialog of GNOME Screensaver. The active session can be changed back and forth using the same mechanism. Note that some distributions may not add the User Switcher to the default panel configuration. It can be added using the panel context menu." msgstr "" #: C/gdm.xml:541(para) -msgid "" -"Note this feature is available on systems that support Virtual Terminals. " -"This feature will not function if Virtual Terminals is not available." +msgid "Note this feature is available on systems that support Virtual Terminals. This feature will not function if Virtual Terminals is not available." msgstr "" #: C/gdm.xml:552(title) @@ -700,43 +438,19 @@ msgstr "Grup dan Pengguna GDM" #: C/gdm.xml:557(para) -msgid "" -"For security reasons a dedicated user and group id are recommended for " -"proper operation. This user and group are normally \"gdm\" on most systems, " -"but can be configured to any user or group. All GDM GUI programs are run as " -"this user, so that the programs which interact with the user are run in a " -"sandbox. This user and group should have limited privilege." +msgid "For security reasons a dedicated user and group id are recommended for proper operation. This user and group are normally \"gdm\" on most systems, but can be configured to any user or group. All GDM GUI programs are run as this user, so that the programs which interact with the user are run in a sandbox. This user and group should have limited privilege." msgstr "" #: C/gdm.xml:566(para) -msgid "" -"The only special privilege the \"gdm\" user requires is the ability to read " -"and write Xauth files to the <var>/run/gdm " -"directory. The <var>/run/gdm directory should " -"have root:gdm ownership and 1777 permissions." +msgid "The only special privilege the \"gdm\" user requires is the ability to read and write Xauth files to the <var>/run/gdm directory. The <var>/run/gdm directory should have root:gdm ownership and 1777 permissions." msgstr "" #: C/gdm.xml:574(para) -msgid "" -"You should not, under any circumstances, configure the GDM user/group to a " -"user which a user could easily gain access to, such as the user " -"nobody. Any user who gains access to an Xauth key can " -"snoop on and control running GUI programs running in the associated session " -"or perform a denial-of-service attack on it. It is important to ensure that " -"the system is configured properly so that only the \"gdm\" user has access " -"to these files and that it is not easy to login to this account. For " -"example, the account should be setup to not have a password or allow non-" -"root users to login to the account." +msgid "You should not, under any circumstances, configure the GDM user/group to a user which a user could easily gain access to, such as the user nobody. Any user who gains access to an Xauth key can snoop on and control running GUI programs running in the associated session or perform a denial-of-service attack on it. It is important to ensure that the system is configured properly so that only the \"gdm\" user has access to these files and that it is not easy to login to this account. For example, the account should be setup to not have a password or allow non-root users to login to the account." msgstr "" #: C/gdm.xml:587(para) -msgid "" -"The GDM greeter configuration is stored in GConf. To allow the GDM user to " -"be able to write configuration, it is necessary for the \"gdm\" user to have " -"a writable $HOME directory. Users may configure the default GConf " -"configuration as desired to avoid the need to provide the \"gdm\" user with " -"a writable $HOME directory. However, some features of GDM may be disabled if " -"it is unable to write state information to GConf configuration." +msgid "The GDM greeter configuration is stored in GConf. To allow the GDM user to be able to write configuration, it is necessary for the \"gdm\" user to have a writable $HOME directory. Users may configure the default GConf configuration as desired to avoid the need to provide the \"gdm\" user with a writable $HOME directory. However, some features of GDM may be disabled if it is unable to write state information to GConf configuration." msgstr "" #: C/gdm.xml:599(title) @@ -744,82 +458,35 @@ msgstr "PAM" #: C/gdm.xml:601(para) -msgid "" -"GDM uses PAM for login authentication. PAM stands for Pluggable " -"Authentication Module, and is used by most programs that request " -"authentication on your computer. It allows the administrator to configure " -"specific authentication behavior for different login programs (such as ssh, " -"login GUI, screensaver, etc.)" +msgid "GDM uses PAM for login authentication. PAM stands for Pluggable Authentication Module, and is used by most programs that request authentication on your computer. It allows the administrator to configure specific authentication behavior for different login programs (such as ssh, login GUI, screensaver, etc.)" msgstr "" #: C/gdm.xml:609(para) -msgid "" -"PAM is complicated and highly configurable, and this documentation does not " -"intend to explain this in detail. Instead, it is intended to give an " -"overview of how PAM configuration relates with GDM, how PAM is commonly " -"configured with GDM, and known issues. It is expected that a person needing " -"to do PAM configuration would need to do further reading of PAM " -"documentation to understand how to configure PAM and to understand terms " -"used in this section." +msgid "PAM is complicated and highly configurable, and this documentation does not intend to explain this in detail. Instead, it is intended to give an overview of how PAM configuration relates with GDM, how PAM is commonly configured with GDM, and known issues. It is expected that a person needing to do PAM configuration would need to do further reading of PAM documentation to understand how to configure PAM and to understand terms used in this section." msgstr "" #: C/gdm.xml:619(para) -msgid "" -"PAM configuration has different, but similar, interfaces on different " -"Operating Systems, so check the pam." -"d or pam.conf man " -"page for details. Be sure you read the PAM documentation and are comfortable " -"with the security implications of any changes you intend to make to your " -"configuration." +msgid "PAM configuration has different, but similar, interfaces on different Operating Systems, so check the pam.d or pam.conf man page for details. Be sure you read the PAM documentation and are comfortable with the security implications of any changes you intend to make to your configuration." msgstr "" #: C/gdm.xml:629(para) -msgid "" -"Note that, by default, GDM uses the \"gdm\" PAM service name for normal " -"login and the \"gdm-autologin\" PAM service name for automatic login. These " -"services may not be defined in your pam.d or pam.conf configured file. If " -"there is no entry, then GDM will use the default PAM behavior. On most " -"systems this should work fine. However, the automatic login feature may not " -"work if the gdm-autologin service is not defined." +msgid "Note that, by default, GDM uses the \"gdm\" PAM service name for normal login and the \"gdm-autologin\" PAM service name for automatic login. These services may not be defined in your pam.d or pam.conf configured file. If there is no entry, then GDM will use the default PAM behavior. On most systems this should work fine. However, the automatic login feature may not work if the gdm-autologin service is not defined." msgstr "" #: C/gdm.xml:639(para) -msgid "" -"The PostLogin script is run before pam_open_session is " -"called, and the PreSession script is called after. This " -"allows the system administrator to add any scripting to the login process " -"either before or after PAM initializes the session." +msgid "The PostLogin script is run before pam_open_session is called, and the PreSession script is called after. This allows the system administrator to add any scripting to the login process either before or after PAM initializes the session." msgstr "" #: C/gdm.xml:647(para) -msgid "" -"If you wish to make GDM work with other types of authentication mechanisms " -"(such as a fingerprint or SmartCard reader), then you should implement this " -"by using a PAM service module for the desired authentication type rather " -"than by trying to modify the GDM code directly. Refer to the PAM " -"documentation on your system. How to do this is frequently discussed on the " -"
gdm-list@gnome.org
mail list, so you can " -"refer to the list archives for more information." +msgid "If you wish to make GDM work with other types of authentication mechanisms (such as a fingerprint or SmartCard reader), then you should implement this by using a PAM service module for the desired authentication type rather than by trying to modify the GDM code directly. Refer to the PAM documentation on your system. How to do this is frequently discussed on the
gdm-list@gnome.org
mail list, so you can refer to the list archives for more information." msgstr "" #: C/gdm.xml:658(para) -msgid "" -"PAM does have some limitations regarding being able to work with multiple " -"types of authentication at the same time, like supporting the ability to " -"accept either SmartCard and the ability to type the username and password " -"into the login program. There are techniques that are used to make this " -"work, and it is best to research how this problem is commonly solved when " -"setting up such a configuration." +msgid "PAM does have some limitations regarding being able to work with multiple types of authentication at the same time, like supporting the ability to accept either SmartCard and the ability to type the username and password into the login program. There are techniques that are used to make this work, and it is best to research how this problem is commonly solved when setting up such a configuration." msgstr "" #: C/gdm.xml:667(para) -msgid "" -"If automatic login does not work on a system, check to see if the \"gdm-" -"autologin\" PAM stack is defined in the PAM configuration. For this to work, " -"it is necessary to use a PAM module that simply does no authentication, or " -"which simply returns PAM_SUCCESS from all of its public interfaces. Assuming " -"your system has a pam_allow.so PAM module which does this, a PAM " -"configuration to enable \"gdm-autologin\" would look like this:" +msgid "If automatic login does not work on a system, check to see if the \"gdm-autologin\" PAM stack is defined in the PAM configuration. For this to work, it is necessary to use a PAM module that simply does no authentication, or which simply returns PAM_SUCCESS from all of its public interfaces. Assuming your system has a pam_allow.so PAM module which does this, a PAM configuration to enable \"gdm-autologin\" would look like this:" msgstr "" #: C/gdm.xml:677(screen) @@ -834,9 +501,7 @@ msgstr "" #: C/gdm.xml:685(para) -msgid "" -"The above setup will cause no lastlog entry to be generated. If a lastlog " -"entry is desired, then use the following for the session:" +msgid "The above setup will cause no lastlog entry to be generated. If a lastlog entry is desired, then use the following for the session:" msgstr "" #: C/gdm.xml:690(screen) @@ -847,14 +512,7 @@ msgstr "" #: C/gdm.xml:694(para) -msgid "" -"If the computer is used by several people, which makes automatic login " -"unsuitable, you may want to allow some users to log in without entering " -"their password. This feature can be enabled as a per-user option in the " -"users-admin tool from the gnome-system-tools; it is achieved by checking " -"that the user is member a Unix group called \"nopasswdlogin\" before asking " -"for a password. For this to work, the PAM configuration file for the \"gdm\" " -"service must include a line such as:" +msgid "If the computer is used by several people, which makes automatic login unsuitable, you may want to allow some users to log in without entering their password. This feature can be enabled as a per-user option in the users-admin tool from the gnome-system-tools; it is achieved by checking that the user is member a Unix group called \"nopasswdlogin\" before asking for a password. For this to work, the PAM configuration file for the \"gdm\" service must include a line such as:" msgstr "" #: C/gdm.xml:705(screen) @@ -869,15 +527,7 @@ msgstr "utmp dan wtmp" #: C/gdm.xml:714(para) -msgid "" -"GDM generates utmp and wtmp User Accounting Database entries upon session " -"login and logout. The utmp database contains user access and accounting " -"information that is accessed by commands such as finger, " -"last, login, and who. The wtmp database contains the history of user access and " -"accounting information for the utmp database. Refer to the utmp and wtmp man pages on your system for more information." +msgid "GDM generates utmp and wtmp User Accounting Database entries upon session login and logout. The utmp database contains user access and accounting information that is accessed by commands such as finger, last, login, and who. The wtmp database contains the history of user access and accounting information for the utmp database. Refer to the utmp and wtmp man pages on your system for more information." msgstr "" #: C/gdm.xml:729(title) @@ -885,26 +535,11 @@ msgstr "Skema Otentikasi Xserver" #: C/gdm.xml:731(para) -msgid "" -"Xserver authorization files are stored in a newly created subdirectory of " -"<var>/run/gdm at start up. These files are used " -"to store and share a \"password\" between X clients and the Xserver. This " -"\"password\" is unique for each session logged in, so users from one session " -"can't snoop on users from another." +msgid "Xserver authorization files are stored in a newly created subdirectory of <var>/run/gdm at start up. These files are used to store and share a \"password\" between X clients and the Xserver. This \"password\" is unique for each session logged in, so users from one session can't snoop on users from another." msgstr "" #: C/gdm.xml:739(para) -msgid "" -"GDM only supports the MIT-MAGIC-COOKIE-1 Xserver authentication scheme. " -"Normally little is gained from the other schemes, and no effort has been " -"made to implement them so far. Be especially careful about using XDMCP " -"because the Xserver authentication cookie goes over the wire as clear text. " -"If snooping is possible, then an attacker could simply snoop your " -"authentication password as you log in, regardless of the authentication " -"scheme being used. If snooping is possible and undesirable, then you should " -"use ssh for tunneling an X connection rather then using XDMCP. You could " -"think of XDMCP as a sort of graphical telnet, having the same security " -"issues. In most cases, ssh -Y should be preferred over GDM's XDMCP features." +msgid "GDM only supports the MIT-MAGIC-COOKIE-1 Xserver authentication scheme. Normally little is gained from the other schemes, and no effort has been made to implement them so far. Be especially careful about using XDMCP because the Xserver authentication cookie goes over the wire as clear text. If snooping is possible, then an attacker could simply snoop your authentication password as you log in, regardless of the authentication scheme being used. If snooping is possible and undesirable, then you should use ssh for tunneling an X connection rather then using XDMCP. You could think of XDMCP as a sort of graphical telnet, having the same security issues. In most cases, ssh -Y should be preferred over GDM's XDMCP features." msgstr "" #: C/gdm.xml:756(title) @@ -912,21 +547,11 @@ msgstr "Keamanan XDMCP" #: C/gdm.xml:758(para) -msgid "" -"Even though your display is protected by cookies, XEvents and thus " -"keystrokes typed when entering passwords will still go over the wire in " -"clear text. It is trivial to capture these." +msgid "Even though your display is protected by cookies, XEvents and thus keystrokes typed when entering passwords will still go over the wire in clear text. It is trivial to capture these." msgstr "" #: C/gdm.xml:764(para) -msgid "" -"XDMCP is primarily useful for running thin clients such as in terminal labs. " -"Those thin clients will only ever need the network to access the server, and " -"so it seems like the best security policy to have those thin clients on a " -"separate network that cannot be accessed by the outside world, and can only " -"connect to the server. The only point from which you need to access outside " -"is the server. This type of set up should never use an unmanaged hub or " -"other sniffable network." +msgid "XDMCP is primarily useful for running thin clients such as in terminal labs. Those thin clients will only ever need the network to access the server, and so it seems like the best security policy to have those thin clients on a separate network that cannot be accessed by the outside world, and can only connect to the server. The only point from which you need to access outside is the server. This type of set up should never use an unmanaged hub or other sniffable network." msgstr "" #: C/gdm.xml:777(title) @@ -934,18 +559,11 @@ msgstr "Kendali Akses XDMCP" #: C/gdm.xml:779(para) -msgid "" -"XDMCP access control is done using TCP wrappers. It is possible to compile " -"GDM without TCP wrapper support, so this feature may not be supported on " -"some Operating Systems." +msgid "XDMCP access control is done using TCP wrappers. It is possible to compile GDM without TCP wrapper support, so this feature may not be supported on some Operating Systems." msgstr "" #: C/gdm.xml:785(para) -msgid "" -"You should use the daemon name gdm in the <" -"etc>/hosts.allow and <etc>/hosts.deny files. For example to deny computers from .evil.domain from logging in, then add" +msgid "You should use the daemon name gdm in the <etc>/hosts.allow and <etc>/hosts.deny files. For example to deny computers from .evil.domain from logging in, then add" msgstr "" #: C/gdm.xml:792(screen) @@ -958,8 +576,7 @@ "gdm: .evil.domain\n" #: C/gdm.xml:795(para) -msgid "" -"to <etc>/hosts.deny. You may also need to add" +msgid "to <etc>/hosts.deny. You may also need to add" msgstr "" #: C/gdm.xml:799(screen) @@ -972,10 +589,7 @@ "gdm: .your.domain\n" #: C/gdm.xml:802(para) -msgid "" -"to your <etc>/hosts.allow if you normally " -"disallow all services from all hosts. See the hosts.allow(5) man page for details." +msgid "to your <etc>/hosts.allow if you normally disallow all services from all hosts. See the hosts.allow(5) man page for details." msgstr "" #: C/gdm.xml:811(title) @@ -983,27 +597,15 @@ msgstr "Keamanan Firewall" #: C/gdm.xml:813(para) -msgid "" -"Even though GDM tries to outsmart potential attackers trying to take " -"advantage of XDMCP, it is still advised that you block the XDMCP port " -"(normally UDP port 177) on your firewall unless really needed. GDM guards " -"against denial of service attacks, but the X protocol is still inherently " -"insecure and should only be used in controlled environments. Also each " -"remote connection takes up lots of resources, so it is much easier to do a " -"denial of service attack via XDMCP than attacking a webserver." +msgid "Even though GDM tries to outsmart potential attackers trying to take advantage of XDMCP, it is still advised that you block the XDMCP port (normally UDP port 177) on your firewall unless really needed. GDM guards against denial of service attacks, but the X protocol is still inherently insecure and should only be used in controlled environments. Also each remote connection takes up lots of resources, so it is much easier to do a denial of service attack via XDMCP than attacking a webserver." msgstr "" #: C/gdm.xml:824(para) -msgid "" -"It is also wise to block all of the Xserver ports. These are TCP ports 6000+ " -"(one for each display number) on your firewall. Note that GDM will use " -"display numbers 20 and higher for flexible on-demand servers." +msgid "It is also wise to block all of the Xserver ports. These are TCP ports 6000+ (one for each display number) on your firewall. Note that GDM will use display numbers 20 and higher for flexible on-demand servers." msgstr "" #: C/gdm.xml:831(para) -msgid "" -"X is not a very safe protocol when using it over the Internet, and XDMCP is " -"even less safe." +msgid "X is not a very safe protocol when using it over the Internet, and XDMCP is even less safe." msgstr "" #: C/gdm.xml:838(title) @@ -1014,19 +616,11 @@ #. TODO - Should we say more? #. #: C/gdm.xml:846(para) -msgid "" -"GDM may be configured to use PolicyKit to allow the system administrator to " -"control whether the login screen should provide the shutdown and restart " -"buttons on the greeter screen." +msgid "GDM may be configured to use PolicyKit to allow the system administrator to control whether the login screen should provide the shutdown and restart buttons on the greeter screen." msgstr "" #: C/gdm.xml:852(para) -msgid "" -"These buttons are controlled by the org.freedesktop.consolekit." -"system.stop-multiple-users and org.freedesktop." -"consolekit.system.restart-multiple-users actions respectively. " -"Policy for these actions can be set up using the polkit-gnome-authorization " -"tool, or the polkit-auth command line program." +msgid "These buttons are controlled by the org.freedesktop.consolekit.system.stop-multiple-users and org.freedesktop.consolekit.system.restart-multiple-users actions respectively. Policy for these actions can be set up using the polkit-gnome-authorization tool, or the polkit-auth command line program." msgstr "" #: C/gdm.xml:864(title) @@ -1034,17 +628,11 @@ msgstr "RBAC (Role Based Access Control)" #: C/gdm.xml:866(para) -msgid "" -"GDM may be configured to use RBAC instead of PolicyKit. In this case the " -"RBAC configuration is used to control whether the login screen should " -"provide the shutdown and restart buttons on the greeter screen." +msgid "GDM may be configured to use RBAC instead of PolicyKit. In this case the RBAC configuration is used to control whether the login screen should provide the shutdown and restart buttons on the greeter screen." msgstr "" #: C/gdm.xml:872(para) -msgid "" -"For example, on Solaris, the \"solaris.system.shutdown\" authorization is " -"used to control this. Simply modify the /etc/user_attr " -"file so that the \"gdm\" user has this authorization." +msgid "For example, on Solaris, the \"solaris.system.shutdown\" authorization is used to control this. Simply modify the /etc/user_attr file so that the \"gdm\" user has this authorization." msgstr "" #: C/gdm.xml:885(title) @@ -1058,41 +646,19 @@ #. the "Configure" section? #. #: C/gdm.xml:896(para) -msgid "" -"GDM includes support for publishing user login information with the user and " -"login session accounting framework known as ConsoleKit. ConsoleKit is able " -"to keep track of all the users currently logged in. In this respect, it can " -"be used as a replacement for the utmp or utmpx files that are available on " -"most Unix-like Operating Systems." +msgid "GDM includes support for publishing user login information with the user and login session accounting framework known as ConsoleKit. ConsoleKit is able to keep track of all the users currently logged in. In this respect, it can be used as a replacement for the utmp or utmpx files that are available on most Unix-like Operating Systems." msgstr "" #: C/gdm.xml:904(para) -msgid "" -"When GDM is about to create a new login process for a user it will call a " -"privileged method of ConsoleKit in order to open a new session for this " -"user. At this time GDM also provides ConsoleKit with information about this " -"user session such as: the user ID, the X11 Display name that will be " -"associated with the session, the host-name from which the session originates " -"(useful in the case of an XDMCP session), whether or not this session is " -"attached, etc. As the entity that initiates the user process, GDM is in a " -"unique position to know about the user session and to be trusted to provide " -"these bits of information. The use of this privileged method is restricted " -"by the use of the D-Bus system message bus security policy." +msgid "When GDM is about to create a new login process for a user it will call a privileged method of ConsoleKit in order to open a new session for this user. At this time GDM also provides ConsoleKit with information about this user session such as: the user ID, the X11 Display name that will be associated with the session, the host-name from which the session originates (useful in the case of an XDMCP session), whether or not this session is attached, etc. As the entity that initiates the user process, GDM is in a unique position to know about the user session and to be trusted to provide these bits of information. The use of this privileged method is restricted by the use of the D-Bus system message bus security policy." msgstr "" #: C/gdm.xml:918(para) -msgid "" -"In case a user with an existing session has authenticated at GDM and " -"requests to resume that existing session, GDM calls a privileged method of " -"ConsoleKit to unlock that session. The exact details of what happens when " -"the session receives this unlock signal are undefined and session-specific. " -"However, most sessions will unlock a screensaver in response." +msgid "In case a user with an existing session has authenticated at GDM and requests to resume that existing session, GDM calls a privileged method of ConsoleKit to unlock that session. The exact details of what happens when the session receives this unlock signal are undefined and session-specific. However, most sessions will unlock a screensaver in response." msgstr "" #: C/gdm.xml:927(para) -msgid "" -"When the user chooses to log out, or if GDM or the session quit unexpectedly " -"the user session will be unregistered from ConsoleKit." +msgid "When the user chooses to log out, or if GDM or the session quit unexpectedly the user session will be unregistered from ConsoleKit." msgstr "" #: C/gdm.xml:936(title) @@ -1100,12 +666,7 @@ msgstr "Konfigurasi" #: C/gdm.xml:938(para) -msgid "" -"GDM has a number of configuration interfaces. These include scripting " -"integration points, daemon configuration, greeter configuration, general " -"session settings, integration with gnome-settings-daemon configuration, and " -"session configuration. These types of integration are described in detail " -"below." +msgid "GDM has a number of configuration interfaces. These include scripting integration points, daemon configuration, greeter configuration, general session settings, integration with gnome-settings-daemon configuration, and session configuration. These types of integration are described in detail below." msgstr "" #: C/gdm.xml:947(title) @@ -1113,9 +674,7 @@ msgstr "Titik Integrasi Scripting" #: C/gdm.xml:949(para) -msgid "" -"The GDM script integration points can be found in the <etc>/" -"gdm/ directory:" +msgid "The GDM script integration points can be found in the <etc>/gdm/ directory:" msgstr "" #: C/gdm.xml:954(screen) @@ -1130,107 +689,51 @@ msgstr "" #: C/gdm.xml:962(para) -msgid "" -"The Init, PostLogin, " -"PreSession, and PostSession " -"scripts all work as described below." +msgid "The Init, PostLogin, PreSession, and PostSession scripts all work as described below." msgstr "" #: C/gdm.xml:968(para) -msgid "" -"For each type of script, the default one which will be executed is called " -"\"Default\" and is stored in a directory associated with the script type. So " -"the default Init script is <etc>/gdm/" -"Init/Default. A per-display script can be provided, and if it " -"exists it will be run instead of the default script. Such scripts are stored " -"in the same directory as the default script and have the same name as the " -"Xserver DISPLAY value for that display. For example, if the <" -"Init>/:0 script exists, it will be run for DISPLAY \":0\"." +msgid "For each type of script, the default one which will be executed is called \"Default\" and is stored in a directory associated with the script type. So the default Init script is <etc>/gdm/Init/Default. A per-display script can be provided, and if it exists it will be run instead of the default script. Such scripts are stored in the same directory as the default script and have the same name as the Xserver DISPLAY value for that display. For example, if the <Init>/:0 script exists, it will be run for DISPLAY \":0\"." msgstr "" #: C/gdm.xml:980(para) -msgid "" -"All of these scripts are run with root privilege and return 0 if run " -"successfully, and a non-zero return code if there was any failure that " -"should cause the login session to be aborted. Also note that GDM will block " -"until the scripts finish, so if any of these scripts hang, this will cause " -"the login process to also hang." +msgid "All of these scripts are run with root privilege and return 0 if run successfully, and a non-zero return code if there was any failure that should cause the login session to be aborted. Also note that GDM will block until the scripts finish, so if any of these scripts hang, this will cause the login process to also hang." msgstr "" #: C/gdm.xml:988(para) -msgid "" -"When the Xserver for the login GUI has been successfully started, but before " -"the login GUI is actually displayed, GDM will run the Init script. This script is useful for starting programs that should be " -"run while the login screen is showing, or for doing any special " -"initialization if required." +msgid "When the Xserver for the login GUI has been successfully started, but before the login GUI is actually displayed, GDM will run the Init script. This script is useful for starting programs that should be run while the login screen is showing, or for doing any special initialization if required." msgstr "" #: C/gdm.xml:996(para) -msgid "" -"After the user has been successfully authenticated GDM will run the " -"PostLogin script. This is done before any session setup " -"has been done, including before the pam_open_session call. This script is " -"useful for doing any session initialization that needs to happen before the " -"session starts. For example, you might setup the user's $HOME directory if " -"needed." +msgid "After the user has been successfully authenticated GDM will run the PostLogin script. This is done before any session setup has been done, including before the pam_open_session call. This script is useful for doing any session initialization that needs to happen before the session starts. For example, you might setup the user's $HOME directory if needed." msgstr "" #: C/gdm.xml:1005(para) -msgid "" -"After the user session has been initialized, GDM will run the " -"PreSession script. This script is useful for doing any " -"session initialization that needs to happen after the session has been " -"initialized. It can be used for session management or accounting, for " -"example." +msgid "After the user session has been initialized, GDM will run the PreSession script. This script is useful for doing any session initialization that needs to happen after the session has been initialized. It can be used for session management or accounting, for example." msgstr "" #: C/gdm.xml:1013(para) -msgid "" -"When a user terminates their session, GDM will run the " -"PostSession script. Note that the Xserver will have " -"been stopped by the time this script is run, so it should not be accessed." +msgid "When a user terminates their session, GDM will run the PostSession script. Note that the Xserver will have been stopped by the time this script is run, so it should not be accessed." msgstr "" #: C/gdm.xml:1020(para) -msgid "" -"Note that the PostSession script will be run even when " -"the display fails to respond due to an I/O error or similar. Thus, there is " -"no guarantee that X applications will work during script execution." +msgid "Note that the PostSession script will be run even when the display fails to respond due to an I/O error or similar. Thus, there is no guarantee that X applications will work during script execution." msgstr "" #: C/gdm.xml:1027(para) -msgid "" -"All of the above scripts will set the $RUNNING_UNDER_GDM environment variable to yes. If the scripts " -"are also shared with other display managers, this allows you to identify " -"when GDM is calling these scripts, so you can run specific code when GDM is " -"used." +msgid "All of the above scripts will set the $RUNNING_UNDER_GDM environment variable to yes. If the scripts are also shared with other display managers, this allows you to identify when GDM is calling these scripts, so you can run specific code when GDM is used." msgstr "" #: C/gdm.xml:1037(title) msgid "Autostart Configuration" -msgstr "" +msgstr "Konfigurasi Autostart" #: C/gdm.xml:1039(para) -msgid "" -"The <share>/gdm/autostart/LoginWindow directory " -"contains files in the format specified by the \"FreeDesktop.org Desktop " -"Application Autostart Specification\". Standard features in the " -"specification may be used to specify programs that should auto-restart or " -"only be launched if a GConf configuration value is set, etc." +msgid "The <share>/gdm/autostart/LoginWindow directory contains files in the format specified by the \"FreeDesktop.org Desktop Application Autostart Specification\". Standard features in the specification may be used to specify programs that should auto-restart or only be launched if a GConf configuration value is set, etc." msgstr "" #: C/gdm.xml:1048(para) -msgid "" -"Any .desktop files in this directory will cause the " -"associated program to automatically start with the login GUI greeter. By " -"default, GDM is shipped with files which will autostart the gdm-simple-" -"greeter login GUI greeter itself, the gnome-power-manager application, the " -"gnome-settings-daemon, and the metacity window manager. These programs are " -"needed for the greeter program to work. In addition, desktop files are " -"provided for starting various AT programs if the configuration values " -"specified in the Accessibility Configuration section below are set." +msgid "Any .desktop files in this directory will cause the associated program to automatically start with the login GUI greeter. By default, GDM is shipped with files which will autostart the gdm-simple-greeter login GUI greeter itself, the gnome-power-manager application, the gnome-settings-daemon, and the metacity window manager. These programs are needed for the greeter program to work. In addition, desktop files are provided for starting various AT programs if the configuration values specified in the Accessibility Configuration section below are set." msgstr "" #: C/gdm.xml:1062(title) @@ -1238,14 +741,7 @@ msgstr "Skrip Xsession" #: C/gdm.xml:1064(para) -msgid "" -"There is also an Xsession script located at " -"<etc>/gdm/Xsession which is called between the " -"PreSession and the PostSession " -"scripts. This script does not support per-display like the other scripts. " -"This script is used for actually starting the user session. This script is " -"run as the user, and it will run whatever session was specified by the " -"Desktop session file the user selected to start." +msgid "There is also an Xsession script located at <etc>/gdm/Xsession which is called between the PreSession and the PostSession scripts. This script does not support per-display like the other scripts. This script is used for actually starting the user session. This script is run as the user, and it will run whatever session was specified by the Desktop session file the user selected to start." msgstr "" #: C/gdm.xml:1077(title) @@ -1253,38 +749,19 @@ msgstr "Konfigurasi Daemon" #: C/gdm.xml:1079(para) -msgid "" -"The GDM daemon is configured using the <etc>/gdm/custom." -"conf file. Default values are stored in GConf in the " -"gdm.schemas file. It is recommended that end-users " -"modify the <etc>/gdm/custom.conf file because the " -"schemas file may be overwritten when the user updates their system to have a " -"newer version of GDM." +msgid "The GDM daemon is configured using the <etc>/gdm/custom.conf file. Default values are stored in GConf in the gdm.schemas file. It is recommended that end-users modify the <etc>/gdm/custom.conf file because the schemas file may be overwritten when the user updates their system to have a newer version of GDM." msgstr "" #: C/gdm.xml:1089(para) -msgid "" -"Note that older versions of GDM supported additional configuration options " -"which are no longer supported in the latest versions of GDM." +msgid "Note that older versions of GDM supported additional configuration options which are no longer supported in the latest versions of GDM." msgstr "" #: C/gdm.xml:1094(para) -msgid "" -"The <etc>/gdm/custom.conf file is in the " -"keyfile format. Keywords in brackets define group " -"sections, strings before an equal sign (=) are keys and the data after equal " -"sign represents their value. Empty lines or lines starting with the hash " -"mark (#) are ignored." +msgid "The <etc>/gdm/custom.conf file is in the keyfile format. Keywords in brackets define group sections, strings before an equal sign (=) are keys and the data after equal sign represents their value. Empty lines or lines starting with the hash mark (#) are ignored." msgstr "" #: C/gdm.xml:1102(para) -msgid "" -"The file <etc>/gdm/custom.conf supports the " -"\"[daemon]\", \"[security]\", and \"[xdmcp]\" group sections. Within each " -"group, there are particular key/value pairs that can be specified to modify " -"how GDM behaves. For example, to enable timed login and specify the timed " -"login user to be a user named \"you\", you would modify the file so it " -"contains the following lines:" +msgid "The file <etc>/gdm/custom.conf supports the \"[daemon]\", \"[security]\", and \"[xdmcp]\" group sections. Within each group, there are particular key/value pairs that can be specified to modify how GDM behaves. For example, to enable timed login and specify the timed login user to be a user named \"you\", you would modify the file so it contains the following lines:" msgstr "" #: C/gdm.xml:1112(screen) @@ -1302,8 +779,7 @@ #: C/gdm.xml:1118(para) msgid "A full list of supported configuration keys follow:" -msgstr "" -"Daftar lengkap dari kunci konfigurasi yang didukung adalah sebagai berikut:" +msgstr "Daftar lengkap dari kunci konfigurasi yang didukung adalah sebagai berikut:" #: C/gdm.xml:1123(title) msgid "[chooser]" @@ -1319,14 +795,8 @@ msgstr "Multicast=false" #: C/gdm.xml:1130(para) -msgid "" -"If true and IPv6 is enabled, the chooser will send a multicast query to the " -"local network and collect responses from the hosts who have joined multicast " -"group." -msgstr "" -"Bila true dan IPv6 diaktifkan, chooser akan mengirim suatu query multicast " -"ke jaringan lokal dan mengumpulkan jawaban dari host yang telah bergabung ke " -"grup multicast." +msgid "If true and IPv6 is enabled, the chooser will send a multicast query to the local network and collect responses from the hosts who have joined multicast group." +msgstr "Bila true dan IPv6 diaktifkan, chooser akan mengirim suatu query multicast ke jaringan lokal dan mengumpulkan jawaban dari host yang telah bergabung ke grup multicast." #: C/gdm.xml:1139(term) msgid "MulticastAddr" @@ -1355,19 +825,7 @@ msgstr "TimedLoginEnable=false" #: C/gdm.xml:1157(para) -msgid "" -"If the user given in TimedLogin should be logged in " -"after a number of seconds (set with TimedLoginDelay) of " -"inactivity on the login screen. This is useful for public access terminals " -"or perhaps even home use. If the user uses the keyboard or browses the " -"menus, the timeout will be reset to TimedLoginDelay or " -"30 seconds, whichever is higher. If the user does not enter a username but " -"just hits the ENTER key while the login program is requesting the username, " -"then GDM will assume the user wants to login immediately as the timed user. " -"Note that no password will be asked for this user so you should be careful, " -"although if using PAM it can be configured to require password entry before " -"allowing login. Refer to the \"Security->PAM\" section of the manual for " -"more information, or for help if this feature does not seem to work." +msgid "If the user given in TimedLogin should be logged in after a number of seconds (set with TimedLoginDelay) of inactivity on the login screen. This is useful for public access terminals or perhaps even home use. If the user uses the keyboard or browses the menus, the timeout will be reset to TimedLoginDelay or 30 seconds, whichever is higher. If the user does not enter a username but just hits the ENTER key while the login program is requesting the username, then GDM will assume the user wants to login immediately as the timed user. Note that no password will be asked for this user so you should be careful, although if using PAM it can be configured to require password entry before allowing login. Refer to the \"Security->PAM\" section of the manual for more information, or for help if this feature does not seem to work." msgstr "" #: C/gdm.xml:1179(term) @@ -1380,19 +838,12 @@ msgstr "TimedLogin=" #: C/gdm.xml:1182(para) -msgid "" -"This is the user that should be logged in after a specified number of " -"seconds of inactivity." +msgid "This is the user that should be logged in after a specified number of seconds of inactivity." msgstr "" -#: C/gdm.xml:1186(para) C/gdm.xml:1230(para) -msgid "" -"If the value ends with a vertical bar | (the pipe symbol), then GDM will " -"execute the program specified and use whatever value is returned on standard " -"out from the program as the user. The program is run with the DISPLAY " -"environment variable set so that it is possible to specify the user in a per-" -"display fashion. For example if the value is \"/usr/bin/getloginuser|\", " -"then the program \"/usr/bin/getloginuser\" will be run to get the user value." +#: C/gdm.xml:1186(para) +#: C/gdm.xml:1230(para) +msgid "If the value ends with a vertical bar | (the pipe symbol), then GDM will execute the program specified and use whatever value is returned on standard out from the program as the user. The program is run with the DISPLAY environment variable set so that it is possible to specify the user in a per-display fashion. For example if the value is \"/usr/bin/getloginuser|\", then the program \"/usr/bin/getloginuser\" will be run to get the user value." msgstr "" #: C/gdm.xml:1200(term) @@ -1405,9 +856,7 @@ msgstr "TimedLoginDelay=30" #: C/gdm.xml:1203(para) -msgid "" -"Delay in seconds before the TimedLogin user will be " -"logged in." +msgid "Delay in seconds before the TimedLogin user will be logged in." msgstr "" #: C/gdm.xml:1211(term) @@ -1420,10 +869,7 @@ msgstr "AutomaticLoginEnable=false" #: C/gdm.xml:1214(para) -msgid "" -"If true, the user given in AutomaticLogin should be " -"logged in immediately. This feature is like timed login with a delay of 0 " -"seconds." +msgid "If true, the user given in AutomaticLogin should be logged in immediately. This feature is like timed login with a delay of 0 seconds." msgstr "" #: C/gdm.xml:1223(term) @@ -1436,9 +882,7 @@ msgstr "AutomaticLogin=" #: C/gdm.xml:1226(para) -msgid "" -"This is the user that should be logged in immediately if " -"AutomaticLoginEnable is true." +msgid "This is the user that should be logged in immediately if AutomaticLoginEnable is true." msgstr "" #: C/gdm.xml:1244(term) @@ -1451,10 +895,7 @@ msgstr "User=gdm" #: C/gdm.xml:1247(para) -msgid "" -"The username under which the greeter and other GUI programs are run. Refer " -"to the Group configuration key and to the \"Security-" -">GDM User And Group\" section of this document for more information." +msgid "The username under which the greeter and other GUI programs are run. Refer to the Group configuration key and to the \"Security->GDM User And Group\" section of this document for more information." msgstr "" #: C/gdm.xml:1257(term) @@ -1467,10 +908,7 @@ msgstr "Group=gdm" #: C/gdm.xml:1260(para) -msgid "" -"The group name under which the greeter and other GUI programs are run. Refer " -"to the User configuration key and to the \"Security->" -"GDM User And Group\" section of this document for more information." +msgid "The group name under which the greeter and other GUI programs are run. Refer to the User configuration key and to the \"Security->GDM User And Group\" section of this document for more information." msgstr "" #: C/gdm.xml:1272(title) @@ -1481,22 +919,19 @@ msgid "[debug]" msgstr "[debug]" -#: C/gdm.xml:1278(term) C/gdm.xml:1408(term) +#: C/gdm.xml:1278(term) +#: C/gdm.xml:1408(term) msgid "Enable" msgstr "Enable" -#: C/gdm.xml:1280(synopsis) C/gdm.xml:1410(synopsis) +#: C/gdm.xml:1280(synopsis) +#: C/gdm.xml:1410(synopsis) #, no-wrap msgid "Enable=false" msgstr "Enable=false" #: C/gdm.xml:1281(para) -msgid "" -"To enable debugging, set the debug/Enable key to \"true\" in the " -"<etc>/gdm/custom.conf file and restart GDM. Then " -"debug output will be sent to the system log file (<var>/log/" -"messages or <var>/adm/messages " -"depending on your Operating System)." +msgid "To enable debugging, set the debug/Enable key to \"true\" in the <etc>/gdm/custom.conf file and restart GDM. Then debug output will be sent to the system log file (<var>/log/messages or <var>/adm/messages depending on your Operating System)." msgstr "" #: C/gdm.xml:1296(title) @@ -1517,29 +952,15 @@ msgstr "IncludeAll=true" #: C/gdm.xml:1305(para) -msgid "" -"If true, then the face browser will show all users on the local machine. If " -"false, the face browser will only show users who have recently logged in." +msgid "If true, then the face browser will show all users on the local machine. If false, the face browser will only show users who have recently logged in." msgstr "" #: C/gdm.xml:1311(para) -msgid "" -"When this key is true, GDM will call fgetpwent() to get a list of local " -"users on the system. Any users with a user id less than 500 (or 100 if " -"running on Solaris) are filtered out. The Face Browser also will display any " -"users that have previously logged in on the system (for example NIS/LDAP " -"users). It gets this list via calling the ck-history " -"ConsoleKit interface. It will also filter out any users which do not have a " -"valid shell (valid shells are any shell that getusershell() returns - /sbin/" -"nologin or /bin/false are considered invalid shells even if getusershell() " -"returns them)." +msgid "When this key is true, GDM will call fgetpwent() to get a list of local users on the system. Any users with a user id less than 500 (or 100 if running on Solaris) are filtered out. The Face Browser also will display any users that have previously logged in on the system (for example NIS/LDAP users). It gets this list via calling the ck-history ConsoleKit interface. It will also filter out any users which do not have a valid shell (valid shells are any shell that getusershell() returns - /sbin/nologin or /bin/false are considered invalid shells even if getusershell() returns them)." msgstr "" #: C/gdm.xml:1324(para) -msgid "" -"If false, then GDM more simply only displays users that have previously " -"logged in on the system (local or NIS/LDAP users) by calling the ck-" -"history ConsoleKit interface." +msgid "If false, then GDM more simply only displays users that have previously logged in on the system (local or NIS/LDAP users) by calling the ck-history ConsoleKit interface." msgstr "" #: C/gdm.xml:1333(term) @@ -1552,9 +973,7 @@ msgstr "Include=" #: C/gdm.xml:1336(para) -msgid "" -"Set to a list of users to always include in the Face Browser. This value is " -"set to a list of users separated by commas. By default, the value is empty." +msgid "Set to a list of users to always include in the Face Browser. This value is set to a list of users separated by commas. By default, the value is empty." msgstr "" #: C/gdm.xml:1345(term) @@ -1567,12 +986,7 @@ msgstr "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap" #: C/gdm.xml:1348(para) -msgid "" -"Set to a list of users to always exclude in the Face Browser. This value is " -"set to a list of users separated by commas. Note that the setting in the " -"custom.conf overrides the default value, so if you wish " -"to add additional users to the list, then you need to set the value to the " -"default value with additional users appended to the list." +msgid "Set to a list of users to always exclude in the Face Browser. This value is set to a list of users separated by commas. Note that the setting in the custom.conf overrides the default value, so if you wish to add additional users to the list, then you need to set the value to the default value with additional users appended to the list." msgstr "" #: C/gdm.xml:1362(title) @@ -1593,11 +1007,7 @@ msgstr "DisallowTCP=true" #: C/gdm.xml:1371(para) -msgid "" -"If true, then always append -nolisten tcp to the " -"command line when starting attached Xservers, thus disallowing TCP " -"connection. This is a more secure configuration if you are not using remote " -"connections." +msgid "If true, then always append -nolisten tcp to the command line when starting attached Xservers, thus disallowing TCP connection. This is a more secure configuration if you are not using remote connections." msgstr "" #: C/gdm.xml:1383(title) @@ -1618,51 +1028,34 @@ msgstr "DisplaysPerHost=1" #: C/gdm.xml:1392(para) -msgid "" -"To prevent attackers from filling up the pending queue, GDM will only allow " -"one connection for each remote computer. If you want to provide display " -"services to computers with more than one screen, you should increase this " -"value." +msgid "To prevent attackers from filling up the pending queue, GDM will only allow one connection for each remote computer. If you want to provide display services to computers with more than one screen, you should increase this value." msgstr "" #: C/gdm.xml:1399(para) -msgid "" -"Note that the number of attached DISPLAYS allowed is not limited. Only " -"remote connections via XDMCP are limited by this configuration option." +msgid "Note that the number of attached DISPLAYS allowed is not limited. Only remote connections via XDMCP are limited by this configuration option." msgstr "" #: C/gdm.xml:1411(para) -msgid "" -"Setting this to true enables XDMCP support allowing remote displays/X " -"terminals to be managed by GDM." +msgid "Setting this to true enables XDMCP support allowing remote displays/X terminals to be managed by GDM." msgstr "" #: C/gdm.xml:1416(para) -msgid "" -"gdm listens for requests on UDP port 177. See the Port " -"option for more information." +msgid "gdm listens for requests on UDP port 177. See the Port option for more information." msgstr "" #: C/gdm.xml:1421(para) -msgid "" -"If GDM is compiled to support it, access from remote displays can be " -"controlled using the TCP Wrappers library. The service name is " -"gdm" +msgid "If GDM is compiled to support it, access from remote displays can be controlled using the TCP Wrappers library. The service name is gdm" msgstr "" #: C/gdm.xml:1427(para) msgid "" "You should add \n" "gdm:.my.domain\n" -" to your <etc>/hosts.allow, depending on " -"your TCP Wrappers configuration. See the hosts.allow man page for details." +" to your <etc>/hosts.allow, depending on your TCP Wrappers configuration. See the hosts.allow man page for details." msgstr "" #: C/gdm.xml:1438(para) -msgid "" -"Please note that XDMCP is not a particularly secure protocol and that it is " -"a good idea to block UDP port 177 on your firewall unless you really need it." +msgid "Please note that XDMCP is not a particularly secure protocol and that it is a good idea to block UDP port 177 on your firewall unless you really need it." msgstr "" #: C/gdm.xml:1447(term) @@ -1675,10 +1068,7 @@ msgstr "HonorIndirect=true" #: C/gdm.xml:1450(para) -msgid "" -"Enables XDMCP INDIRECT choosing (i.e. remote execution of " -"gdmchooser) for X-terminals which do not supply their " -"own display browser." +msgid "Enables XDMCP INDIRECT choosing (i.e. remote execution of gdmchooser) for X-terminals which do not supply their own display browser." msgstr "" #: C/gdm.xml:1459(term) @@ -1691,16 +1081,11 @@ msgstr "MaxPending=4" #: C/gdm.xml:1462(para) -msgid "" -"To avoid denial of service attacks, GDM has fixed size queue of pending " -"connections. Only MaxPending displays can start at the same time." +msgid "To avoid denial of service attacks, GDM has fixed size queue of pending connections. Only MaxPending displays can start at the same time." msgstr "" #: C/gdm.xml:1468(para) -msgid "" -"Please note that this parameter does not limit the number of remote displays " -"which can be managed. It only limits the number of displays initiating a " -"connection simultaneously." +msgid "Please note that this parameter does not limit the number of remote displays which can be managed. It only limits the number of displays initiating a connection simultaneously." msgstr "" #: C/gdm.xml:1477(term) @@ -1713,10 +1098,7 @@ msgstr "MaxSessions=16" #: C/gdm.xml:1480(para) -msgid "" -"Determines the maximum number of remote display connections which will be " -"managed simultaneously. I.e. the total number of remote displays that can " -"use your host." +msgid "Determines the maximum number of remote display connections which will be managed simultaneously. I.e. the total number of remote displays that can use your host." msgstr "" #: C/gdm.xml:1489(term) @@ -1729,23 +1111,15 @@ msgstr "MaxWait=30" #: C/gdm.xml:1492(para) -msgid "" -"When GDM is ready to manage a display an ACCEPT packet is sent to it " -"containing a unique session id which will be used in future XDMCP " -"conversations." +msgid "When GDM is ready to manage a display an ACCEPT packet is sent to it containing a unique session id which will be used in future XDMCP conversations." msgstr "" #: C/gdm.xml:1498(para) -msgid "" -"GDM will then place the session id in the pending queue waiting for the " -"display to respond with a MANAGE request." +msgid "GDM will then place the session id in the pending queue waiting for the display to respond with a MANAGE request." msgstr "" #: C/gdm.xml:1503(para) -msgid "" -"If no response is received within MaxWait seconds, GDM will declare the " -"display dead and erase it from the pending queue freeing up the slot for " -"other displays." +msgid "If no response is received within MaxWait seconds, GDM will declare the display dead and erase it from the pending queue freeing up the slot for other displays." msgstr "" #: C/gdm.xml:1512(term) @@ -1758,14 +1132,7 @@ msgstr "MaxWaitIndirect=30" #: C/gdm.xml:1515(para) -msgid "" -"The MaxWaitIndirect parameter determines the maximum number of seconds " -"between the time where a user chooses a host and the subsequent indirect " -"query where the user is connected to the host. When the timeout is exceeded, " -"the information about the chosen host is forgotten and the indirect slot " -"freed up for other displays. The information may be forgotten earlier if " -"there are more hosts trying to send indirect queries then " -"MaxPendingIndirect." +msgid "The MaxWaitIndirect parameter determines the maximum number of seconds between the time where a user chooses a host and the subsequent indirect query where the user is connected to the host. When the timeout is exceeded, the information about the chosen host is forgotten and the indirect slot freed up for other displays. The information may be forgotten earlier if there are more hosts trying to send indirect queries then MaxPendingIndirect." msgstr "" #: C/gdm.xml:1529(term) @@ -1778,22 +1145,11 @@ msgstr "PingIntervalSeconds=60" #: C/gdm.xml:1532(para) -msgid "" -"If the Xserver does not respond in the specified number of seconds, then the " -"connection is stopped and the session ended. When this happens the slave " -"daemon dies with an ALARM signal. Note that GDM 2.20 and earlier multiplied " -"this setting by 2, so it may be necessary to increase the timeout if " -"upgrading from GDM 2.20 and earlier to a newer version." +msgid "If the Xserver does not respond in the specified number of seconds, then the connection is stopped and the session ended. When this happens the slave daemon dies with an ALARM signal. Note that GDM 2.20 and earlier multiplied this setting by 2, so it may be necessary to increase the timeout if upgrading from GDM 2.20 and earlier to a newer version." msgstr "" #: C/gdm.xml:1541(para) -msgid "" -"Note that GDM in the past used to have a PingInterval " -"configuration key which was also in minutes. For most purposes you'd want " -"this setting to be lower than one minute. However since in most cases where " -"XDMCP would be used (such as terminal labs), a lag of more than 15 or so " -"seconds would really mean that the terminal was turned off or restarted and " -"you would want to end the session." +msgid "Note that GDM in the past used to have a PingInterval configuration key which was also in minutes. For most purposes you'd want this setting to be lower than one minute. However since in most cases where XDMCP would be used (such as terminal labs), a lag of more than 15 or so seconds would really mean that the terminal was turned off or restarted and you would want to end the session." msgstr "" #: C/gdm.xml:1554(term) @@ -1806,9 +1162,7 @@ msgstr "Port=177" #: C/gdm.xml:1557(para) -msgid "" -"The UDP port number gdm should listen to for XDMCP " -"requests. Do not change this unless you know what you are doing." +msgid "The UDP port number gdm should listen to for XDMCP requests. Do not change this unless you know what you are doing." msgstr "" #: C/gdm.xml:1566(term) @@ -1821,15 +1175,7 @@ msgstr "Willing=<etc>/gdm/Xwilling" #: C/gdm.xml:1569(para) -msgid "" -"When the machine sends a WILLING packet back after a QUERY it sends a string " -"that gives the current status of this server. The default message is the " -"system ID, but it is possible to create a script that displays customized " -"message. If this script does not exist or this key is empty the default " -"message is sent. If this script succeeds and produces some output, the first " -"line of it's output is sent (and only the first line). It runs at most once " -"every 3 seconds to prevent possible denial of service by flooding the " -"machine with QUERY packets." +msgid "When the machine sends a WILLING packet back after a QUERY it sends a string that gives the current status of this server. The default message is the system ID, but it is possible to create a script that displays customized message. If this script does not exist or this key is empty the default message is sent. If this script succeeds and produces some output, the first line of it's output is sent (and only the first line). It runs at most once every 3 seconds to prevent possible denial of service by flooding the machine with QUERY packets." msgstr "" #: C/gdm.xml:1588(title) @@ -1837,27 +1183,25 @@ msgstr "Konfigurasi Greeter Sederhana" #: C/gdm.xml:1590(para) -msgid "" -"The GDM default greeter is called the simple Greeter and is configured via " -"GConf. Default values are stored in GConf in the gdm-simple-" -"greeter.schemas file. These defaults can be overridden if the " -"\"gdm\" user has a writable $HOME directory to store GConf settings. These " -"values can be edited using the gconftool-2 or " -"gconf-editor programs. The following configuration " -"options are supported:" +msgid "The GDM default greeter is called the simple Greeter and is configured via GConf. Default values are stored in GConf in the gdm-simple-greeter.schemas file. These defaults can be overridden if the \"gdm\" user has a writable $HOME directory to store GConf settings. These values can be edited using the gconftool-2 or gconf-editor programs. The following configuration options are supported:" msgstr "" #: C/gdm.xml:1601(title) msgid "Greeter Configuration Keys" -msgstr "" +msgstr "Kunci Konfigurasi Greeter" #: C/gdm.xml:1604(term) msgid "/apps/gdm/simple-greeter/banner_message_enable" msgstr "/apps/gdm/simple-greeter/banner_message_enable" -#: C/gdm.xml:1606(synopsis) C/gdm.xml:1627(synopsis) C/gdm.xml:1638(synopsis) -#: C/gdm.xml:1703(synopsis) C/gdm.xml:1768(synopsis) C/gdm.xml:1779(synopsis) -#: C/gdm.xml:1790(synopsis) C/gdm.xml:1801(synopsis) +#: C/gdm.xml:1606(synopsis) +#: C/gdm.xml:1627(synopsis) +#: C/gdm.xml:1638(synopsis) +#: C/gdm.xml:1703(synopsis) +#: C/gdm.xml:1768(synopsis) +#: C/gdm.xml:1779(synopsis) +#: C/gdm.xml:1790(synopsis) +#: C/gdm.xml:1801(synopsis) #, no-wrap msgid "false (boolean)" msgstr "false (boolean)" @@ -1892,9 +1236,7 @@ msgstr "/apps/gdm/simple-greeter/disable_user_list" #: C/gdm.xml:1639(para) -msgid "" -"If true, then the face browser with known users is not shown in the login " -"window." +msgid "If true, then the face browser with known users is not shown in the login window." msgstr "" #: C/gdm.xml:1647(term) @@ -1914,25 +1256,18 @@ msgid "/apps/gdm/simple-greeter/recent-languages" msgstr "/apps/gdm/simple-greeter/recent-languages" -#: C/gdm.xml:1659(synopsis) C/gdm.xml:1681(synopsis) +#: C/gdm.xml:1659(synopsis) +#: C/gdm.xml:1681(synopsis) #, no-wrap msgid "[] (string list)" msgstr "[] (daftar string)" #: C/gdm.xml:1660(para) -msgid "" -"Set to a list of languages to be shown by default in the login window. " -"Default value is \"[]\". With the default setting only the system default " -"language is shown and the option \"Other...\" which pops-up a dialog box " -"showing a full list of available languages which the user can select." +msgid "Set to a list of languages to be shown by default in the login window. Default value is \"[]\". With the default setting only the system default language is shown and the option \"Other...\" which pops-up a dialog box showing a full list of available languages which the user can select." msgstr "" #: C/gdm.xml:1668(para) -msgid "" -"Users are not intended to change this setting by hand. Instead GDM keeps " -"track of any languages selected in this configuration key, and will show " -"them in the language combo box along with the \"Other...\" choice. This way, " -"commonly selected languages are easier to select." +msgid "Users are not intended to change this setting by hand. Instead GDM keeps track of any languages selected in this configuration key, and will show them in the language combo box along with the \"Other...\" choice. This way, commonly selected languages are easier to select." msgstr "" #: C/gdm.xml:1679(term) @@ -1940,20 +1275,11 @@ msgstr "/apps/gdm/simple-greeter/recent-layouts" #: C/gdm.xml:1682(para) -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login panel. " -"Default value is \"[]\". With the default setting only the system default " -"keyboard layout is shown and the option \"Other...\" which pops-up a dialog " -"box showing a full list of available keyboard layouts which the user can " -"select." +msgid "Set to a list of keyboard layouts to be shown by default in the login panel. Default value is \"[]\". With the default setting only the system default keyboard layout is shown and the option \"Other...\" which pops-up a dialog box showing a full list of available keyboard layouts which the user can select." msgstr "" #: C/gdm.xml:1690(para) -msgid "" -"Users are not intended to change this setting by hand. Instead GDM keeps " -"track of any keyboard layouts selected in this configuration key, and will " -"show them in the keyboard layout combo box along with the \"Other...\" " -"choice. This way, commonly selected keyboard layouts are easier to select." +msgid "Users are not intended to change this setting by hand. Instead GDM keeps track of any keyboard layouts selected in this configuration key, and will show them in the keyboard layout combo box along with the \"Other...\" choice. This way, commonly selected keyboard layouts are easier to select." msgstr "" #: C/gdm.xml:1701(term) @@ -1961,8 +1287,7 @@ msgstr "/apps/gdm/simple-greeter/wm_use_compiz" #: C/gdm.xml:1704(para) -msgid "" -"Controls whether compiz is used as the window manager instead of metacity." +msgid "Controls whether compiz is used as the window manager instead of metacity." msgstr "" #: C/gdm.xml:1714(title) @@ -1970,9 +1295,7 @@ msgstr "Konfigurasi Aksesibilitas" #: C/gdm.xml:1716(para) -msgid "" -"This section describes the accessibility configuration options available in " -"GDM." +msgid "This section describes the accessibility configuration options available in GDM." msgstr "" #: C/gdm.xml:1722(title) @@ -1980,34 +1303,15 @@ msgstr "Dialog Aksesibilitas GDM Dan Kunci GConf" #: C/gdm.xml:1724(para) -msgid "" -"The GDM greeter panel at the login screen displays an accessibility icon. " -"Clicking on that icon opens the GDM Accessibility Dialog. In the GDM " -"Accessibility Dialog, there is a list of checkboxes, so the user can enable " -"or disable the associated assistive tools." +msgid "The GDM greeter panel at the login screen displays an accessibility icon. Clicking on that icon opens the GDM Accessibility Dialog. In the GDM Accessibility Dialog, there is a list of checkboxes, so the user can enable or disable the associated assistive tools." msgstr "" #: C/gdm.xml:1731(para) -msgid "" -"The checkboxes that correspond to the on-screen keyboard, screen magnifier " -"and screen reader assistive tools act on the three GConf keys that are " -"described in the next section of this document. By enabling or disabling " -"these checkboxes, the associated GConf key is set to \"true\" or \"false\". " -"When the GConf key is set to true, the assistive tools linked to this GConf " -"key are launched. When the GConf key is set to \"false\", any running " -"assistive tool linked to this GConf key are terminated. These GConf keys are " -"not automatically reset to a default state after the user has logged in. " -"Consequently, the assistive tools that were running during the last GDM " -"login session will automatically be launched at the next GDM login session." +msgid "The checkboxes that correspond to the on-screen keyboard, screen magnifier and screen reader assistive tools act on the three GConf keys that are described in the next section of this document. By enabling or disabling these checkboxes, the associated GConf key is set to \"true\" or \"false\". When the GConf key is set to true, the assistive tools linked to this GConf key are launched. When the GConf key is set to \"false\", any running assistive tool linked to this GConf key are terminated. These GConf keys are not automatically reset to a default state after the user has logged in. Consequently, the assistive tools that were running during the last GDM login session will automatically be launched at the next GDM login session." msgstr "" #: C/gdm.xml:1745(para) -msgid "" -"The other checkboxes in the GDM Accessibility Dialog do not have " -"corresponding GConf keys because no additional program is launched to " -"provide the accessibility features that they offer. These other options " -"correspond to accessibility features that are provided by the Xserver, which " -"is always running during the GDM session." +msgid "The other checkboxes in the GDM Accessibility Dialog do not have corresponding GConf keys because no additional program is launched to provide the accessibility features that they offer. These other options correspond to accessibility features that are provided by the Xserver, which is always running during the GDM session." msgstr "" #: C/gdm.xml:1755(title) @@ -2015,8 +1319,7 @@ msgstr "Kunci GConf Aksesibilitas" #: C/gdm.xml:1757(para) -msgid "" -"GDM offers the following GConf keys to control its accessibility features:" +msgid "GDM offers the following GConf keys to control its accessibility features:" msgstr "" #: C/gdm.xml:1763(title) @@ -2028,64 +1331,39 @@ msgstr "/desktop/gnome/interface/accessibility" #: C/gdm.xml:1769(para) -msgid "" -"Controls whether the Accessibility infrastructure will be started with the " -"GDM GUI. This is needed for many accessibility technology programs to work." -msgstr "" -"Mengendalikan apakah infrastruktur Aksesibilitas akan dimulai dengan GUI " -"GDM. Ini diperlukan oleh banyak program teknologi aksesibilitas agar bekerja." +msgid "Controls whether the Accessibility infrastructure will be started with the GDM GUI. This is needed for many accessibility technology programs to work." +msgstr "Mengendalikan apakah infrastruktur Aksesibilitas akan dimulai dengan GUI GDM. Ini diperlukan oleh banyak program teknologi aksesibilitas agar bekerja." #: C/gdm.xml:1777(term) msgid "/desktop/gnome/applications/at/screen_magnifier_enabled" msgstr "/desktop/gnome/applications/at/screen_magnifier_enabled" #: C/gdm.xml:1780(para) -msgid "" -"If set, then the assistive tools linked to this GConf key will be started " -"with the GDM GUI program. By default this is a screen magnifier application." -msgstr "" -"Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai " -"dengan program GUI GDM. Secara baku ini adalah aplikasi pembesaran layar." +msgid "If set, then the assistive tools linked to this GConf key will be started with the GDM GUI program. By default this is a screen magnifier application." +msgstr "Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai dengan program GUI GDM. Secara baku ini adalah aplikasi pembesaran layar." #: C/gdm.xml:1788(term) msgid "/desktop/gnome/applications/at/screen_keyboard_enabled" msgstr "/desktop/gnome/applications/at/screen_keyboard_enabled" #: C/gdm.xml:1791(para) -msgid "" -"If set, then the assistive tools linked to this GConf key will be started " -"with the GDM GUI program. By default this is an on-screen keyboard " -"application." -msgstr "" -"Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai " -"dengan program GUI GDM. Secara baku ini adalah aplikasi papan tik di layar." +msgid "If set, then the assistive tools linked to this GConf key will be started with the GDM GUI program. By default this is an on-screen keyboard application." +msgstr "Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai dengan program GUI GDM. Secara baku ini adalah aplikasi papan tik di layar." #: C/gdm.xml:1799(term) msgid "/desktop/gnome/applications/at/screen_reader_enabled" msgstr "/desktop/gnome/applications/at/screen_reader_enabled" #: C/gdm.xml:1802(para) -msgid "" -"If set, then the assistive tools linked to this GConf key will be started " -"with the GDM GUI program. By default this is a screen reader application." -msgstr "" -"Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai " -"dengan program GUI GDM. Secara baku ini adalah aplikasi pembaca layar." +msgid "If set, then the assistive tools linked to this GConf key will be started with the GDM GUI program. By default this is a screen reader application." +msgstr "Bila ditata, alat asistif yang dikaitkan ke kunci GConf ini akan dimulai dengan program GUI GDM. Secara baku ini adalah aplikasi pembaca layar." #: C/gdm.xml:1813(title) msgid "Linking GConf Keys to Accessbility Tools" msgstr "Mengaitkan Kunci GConf ke Alat Aksesibilitas" #: C/gdm.xml:1815(para) -msgid "" -"For the screen_magnifier_enabled, the screen_keyboard_enabled, and the " -"screen_reader_enabled GConf keys, the assistive tool which gets launched " -"depends on the desktop files located in the GDM autostart directory as " -"described in the \"Autostart Configuration\" section of this manual. Any " -"desktop file in the GDM autostart directory can be linked to these GConf key " -"via specifying that GConf key in the AutostartCondition value in the desktop " -"file. So the exact AutostartCondition line in the desktop file could be one " -"of the following:" +msgid "For the screen_magnifier_enabled, the screen_keyboard_enabled, and the screen_reader_enabled GConf keys, the assistive tool which gets launched depends on the desktop files located in the GDM autostart directory as described in the \"Autostart Configuration\" section of this manual. Any desktop file in the GDM autostart directory can be linked to these GConf key via specifying that GConf key in the AutostartCondition value in the desktop file. So the exact AutostartCondition line in the desktop file could be one of the following:" msgstr "" #: C/gdm.xml:1827(screen) @@ -2102,12 +1380,7 @@ "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_reader_enabled\n" #: C/gdm.xml:1833(para) -msgid "" -"When an accessibility key is true, then any program which is linked to that " -"key in a GDM autostart desktop file will be launched (unless the Hidden key " -"is set to true in that desktop file). A single GConf key can even start " -"multiple assistive tools if there are multiple desktop files with this " -"AutostartCondition in the GDM autostart directory." +msgid "When an accessibility key is true, then any program which is linked to that key in a GDM autostart desktop file will be launched (unless the Hidden key is set to true in that desktop file). A single GConf key can even start multiple assistive tools if there are multiple desktop files with this AutostartCondition in the GDM autostart directory." msgstr "" #: C/gdm.xml:1843(title) @@ -2115,20 +1388,11 @@ msgstr "Contoh Pengubahan Konfigurasi Alat Aksesibilitas" #: C/gdm.xml:1845(para) -msgid "" -"For example, if GNOME is distributed with GOK as the default on-screen " -"keyboard, then this could be replaced with a different program if desired. " -"To replace GOK with the on-screen keyboard application \"onboard\" and " -"additionally activate the assistive tool \"mousetweaks\" for dwelling " -"support, then the following configuration is needed." +msgid "For example, if GNOME is distributed with GOK as the default on-screen keyboard, then this could be replaced with a different program if desired. To replace GOK with the on-screen keyboard application \"onboard\" and additionally activate the assistive tool \"mousetweaks\" for dwelling support, then the following configuration is needed." msgstr "" #: C/gdm.xml:1853(para) -msgid "" -"Create a desktop file for onboard and a second one for mousetweaks; for " -"example, onboard.desktop and mousetweaks.desktop. These files must be placed " -"in the GDM autostart directory and be in the format as explained in the " -"\"Autostart Configuration\" section of this document." +msgid "Create a desktop file for onboard and a second one for mousetweaks; for example, onboard.desktop and mousetweaks.desktop. These files must be placed in the GDM autostart directory and be in the format as explained in the \"Autostart Configuration\" section of this document." msgstr "" #: C/gdm.xml:1861(para) @@ -2165,8 +1429,7 @@ "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" #: C/gdm.xml:1879(para) -msgid "" -"The following is an example mousetweaks.desktop file:" +msgid "The following is an example mousetweaks.desktop file:" msgstr "" #: C/gdm.xml:1884(screen) @@ -2199,25 +1462,15 @@ "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" #: C/gdm.xml:1898(para) -msgid "" -"Note the line with the AutostartCondition that links both desktop files to " -"the GConf key for the on-screen keyboard." +msgid "Note the line with the AutostartCondition that links both desktop files to the GConf key for the on-screen keyboard." msgstr "" #: C/gdm.xml:1903(para) -msgid "" -"To disable GOK from starting, the desktop file for the GOK on-screen " -"keyboard must be removed or deactivated. Otherwise onboard and GOK would " -"simultaneously be started. This can be done by removing the gok.desktop file " -"from the GDM autostart directory, or by adding the \"Hidden=true\" key " -"setting to the gok.desktop file." +msgid "To disable GOK from starting, the desktop file for the GOK on-screen keyboard must be removed or deactivated. Otherwise onboard and GOK would simultaneously be started. This can be done by removing the gok.desktop file from the GDM autostart directory, or by adding the \"Hidden=true\" key setting to the gok.desktop file." msgstr "" #: C/gdm.xml:1911(para) -msgid "" -"After making these changes, GOK will no longer be started when the user " -"activates the on-screen keyboard in the GDM session; but onboard and " -"mousetweaks will instead be launched." +msgid "After making these changes, GOK will no longer be started when the user activates the on-screen keyboard in the GDM session; but onboard and mousetweaks will instead be launched." msgstr "" #: C/gdm.xml:1920(title) @@ -2231,13 +1484,7 @@ #. how lock down management is handled. #. #: C/gdm.xml:1929(para) -msgid "" -"The GDM Greeter uses some of the same framework that your desktop session " -"will use. And so, it is influenced by a number of the same GConf settings. " -"For each of these settings the Greeter will use the default value unless it " -"is specifically overridden by a) GDM's installed mandatory policy b) system " -"mandatory policy. GDM installs its own mandatory policy to lock down some " -"settings for security." +msgid "The GDM Greeter uses some of the same framework that your desktop session will use. And so, it is influenced by a number of the same GConf settings. For each of these settings the Greeter will use the default value unless it is specifically overridden by a) GDM's installed mandatory policy b) system mandatory policy. GDM installs its own mandatory policy to lock down some settings for security." msgstr "" #: C/gdm.xml:1940(title) @@ -2254,22 +1501,15 @@ #. in anything but the chooser in SVN. #. #: C/gdm.xml:1953(para) -msgid "" -"GDM enables the following gnome-settings-daemon plugins: a11y-keyboard, " -"background, sound, xsettings." +msgid "GDM enables the following gnome-settings-daemon plugins: a11y-keyboard, background, sound, xsettings." msgstr "" #: C/gdm.xml:1958(para) -msgid "" -"These are responsible for things like the background image, font and theme " -"settings, sound events, etc." +msgid "These are responsible for things like the background image, font and theme settings, sound events, etc." msgstr "" #: C/gdm.xml:1963(para) -msgid "" -"Plugins can also be disabled using GConf. For example, if you want to " -"disable the sound plugin then unset the following key: /apps/gdm/" -"simple-greeter/settings-manager-plugins/sound/active." +msgid "Plugins can also be disabled using GConf. For example, if you want to disable the sound plugin then unset the following key: /apps/gdm/simple-greeter/settings-manager-plugins/sound/active." msgstr "" #: C/gdm.xml:1971(title) @@ -2277,44 +1517,19 @@ msgstr "Konfigurasi Sesi GDM" #: C/gdm.xml:1973(para) -msgid "" -"GDM sessions are specified using the FreeDesktop.org Desktop Entry " -"Specification, which can be referenced at the following URL: " -"http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec." +msgid "GDM sessions are specified using the FreeDesktop.org Desktop Entry Specification, which can be referenced at the following URL: http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec." msgstr "" #: C/gdm.xml:1980(para) -msgid "" -"By default, GDM will install desktop files in the <share>/" -"xsessions directory. GDM will search the following directories in " -"this order to find desktop files: <etc>/X11/sessions/, <dmconfdir>/Sessions, <" -"share>/xsessions, and <share>/gdm/" -"BuiltInSessions. By default the <dmconfdir> is set to <etc>/dm/ unless GDM is " -"configured to use a different directory via the \"--with-dmconfdir\" option." +msgid "By default, GDM will install desktop files in the <share>/xsessions directory. GDM will search the following directories in this order to find desktop files: <etc>/X11/sessions/, <dmconfdir>/Sessions, <share>/xsessions, and <share>/gdm/BuiltInSessions. By default the <dmconfdir> is set to <etc>/dm/ unless GDM is configured to use a different directory via the \"--with-dmconfdir\" option." msgstr "" #: C/gdm.xml:1993(para) -msgid "" -"A session can be disabled by editing the desktop file and adding a line as " -"follows: Hidden=true." +msgid "A session can be disabled by editing the desktop file and adding a line as follows: Hidden=true." msgstr "" #: C/gdm.xml:1998(para) -msgid "" -"GDM desktop files support a GDM-specific extension, a key named \"X-GDM-" -"BypassXsession\". If the key is not specified in a desktop file, the value " -"defaults to \"false\". If this key is specified to be \"true\" in a desktop " -"file, then GDM will launch the program specified by the desktop file \"Exec" -"\" key directly when starting the user session. It will not run the program " -"via the <etc>/gdm/Xsession script, which is the " -"normal behavior. Since bypassing the <etc>/gdm/Xsession script avoids setting up the user session with the normal system " -"and user settings, sessions started this way can be useful for debugging " -"problems in the system or user scripts that might be preventing a user from " -"being able to start a session." +msgid "GDM desktop files support a GDM-specific extension, a key named \"X-GDM-BypassXsession\". If the key is not specified in a desktop file, the value defaults to \"false\". If this key is specified to be \"true\" in a desktop file, then GDM will launch the program specified by the desktop file \"Exec\" key directly when starting the user session. It will not run the program via the <etc>/gdm/Xsession script, which is the normal behavior. Since bypassing the <etc>/gdm/Xsession script avoids setting up the user session with the normal system and user settings, sessions started this way can be useful for debugging problems in the system or user scripts that might be preventing a user from being able to start a session." msgstr "" #: C/gdm.xml:2017(title) @@ -2322,30 +1537,15 @@ msgstr "Konfigurasi Bahasa dan Sesi Pengguna GDM " #: C/gdm.xml:2018(para) -msgid "" -"The user's default session and language choices are stored in the " -"~/.dmrc file. When a user logs in for the first time, " -"this file is created with the user's initial choices. The user can change " -"these default values by simply changing to a different value when logging " -"in. GDM will remember this change for subsequent logins." +msgid "The user's default session and language choices are stored in the ~/.dmrc file. When a user logs in for the first time, this file is created with the user's initial choices. The user can change these default values by simply changing to a different value when logging in. GDM will remember this change for subsequent logins." msgstr "" #: C/gdm.xml:2026(para) -msgid "" -"The ~/.dmrc file is in the standard INI format. It has one section called [Desktop] " -"which has two keys: Session and Language." +msgid "The ~/.dmrc file is in the standard INI format. It has one section called [Desktop] which has two keys: Session and Language." msgstr "" #: C/gdm.xml:2033(para) -msgid "" -"The Session key specifies the basename of the session " -".desktop file that the user wishes to normally use " -"without the .desktop extension. The Language key specifies the language that the user wishes to use by default. " -"If either of these keys is missing, the system default is used. The file " -"would normally look as follows:" +msgid "The Session key specifies the basename of the session .desktop file that the user wishes to normally use without the .desktop extension. The Language key specifies the language that the user wishes to use by default. If either of these keys is missing, the system default is used. The file would normally look as follows:" msgstr "" #: C/gdm.xml:2042(screen) @@ -2370,29 +1570,16 @@ msgstr "Perintah Pengguna Root GDM" #: C/gdm.xml:2059(para) -msgid "" -"The GDM package provides the following commands in sbindir intended to be run by the root user:" -msgstr "" -"Paket GDM menyediakan perintah berikut di sbindir yang " -"dimaksudkan untuk dijalankan oleh pengguna root:" +msgid "The GDM package provides the following commands in sbindir intended to be run by the root user:" +msgstr "Paket GDM menyediakan perintah berikut di sbindir yang dimaksudkan untuk dijalankan oleh pengguna root:" -#: C/gdm.xml:2065(title) C/gdm.xml:2080(title) -msgid "" -"gdm and gdm-binary Command Line Options" -msgstr "" -"Opsi Perintah Baris gdm dan gdm-binary" +#: C/gdm.xml:2065(title) +#: C/gdm.xml:2080(title) +msgid "gdm and gdm-binary Command Line Options" +msgstr "Opsi Perintah Baris gdm dan gdm-binary" #: C/gdm.xml:2068(para) -msgid "" -"The gdm command is really just a script which runs the " -"gdm-binary, passing along any options. Before launching " -"gdm-binary, the gdm wrapper script will source the " -"<etc>/profile file to set the standard system " -"environment variables. In order to better support internationalization, it " -"will also set the LC_MESSAGES environment variable to LANG if neither " -"LC_MESSAGES or LC_ALL are set. The gdm-binary is the " -"actual GDM daemon." +msgid "The gdm command is really just a script which runs the gdm-binary, passing along any options. Before launching gdm-binary, the gdm wrapper script will source the <etc>/profile file to set the standard system environment variables. In order to better support internationalization, it will also set the LC_MESSAGES environment variable to LANG if neither LC_MESSAGES or LC_ALL are set. The gdm-binary is the actual GDM daemon." msgstr "" #: C/gdm.xml:2084(term) @@ -2432,10 +1619,7 @@ msgstr "Opsi Perintah Baris gdm-restart" #: C/gdm.xml:2124(para) -msgid "" -"gdm-restart stops and restarts GDM by sending the GDM " -"daemon a HUP signal. This command will immediately terminate all sessions " -"and log out users currently logged in with GDM." +msgid "gdm-restart stops and restarts GDM by sending the GDM daemon a HUP signal. This command will immediately terminate all sessions and log out users currently logged in with GDM." msgstr "" #: C/gdm.xml:2132(title) @@ -2443,9 +1627,7 @@ msgstr "Opsi Perintah Baris gdm-safe-restart" #: C/gdm.xml:2134(para) -msgid "" -"gdm-safe-restart stops and restarts GDM by sending the " -"GDM daemon a USR1 signal. GDM will be restarted as soon as all users log out." +msgid "gdm-safe-restart stops and restarts GDM by sending the GDM daemon a USR1 signal. GDM will be restarted as soon as all users log out." msgstr "" #: C/gdm.xml:2142(title) @@ -2453,9 +1635,7 @@ msgstr "Opsi Perintah Baris gdm-stop" #: C/gdm.xml:2144(para) -msgid "" -"gdm-stop stops GDM by sending the GDM daemon a TERM " -"signal." +msgid "gdm-stop stops GDM by sending the GDM daemon a TERM signal." msgstr "" #: C/gdm.xml:2155(title) @@ -2467,59 +1647,27 @@ #. common D-Bus configuration issues? #. #: C/gdm.xml:2163(para) -msgid "" -"This section discusses helpful tips for getting GDM working. In general, if " -"you have a problem using GDM, you can submit a bug or send an email to the " -"gdm-list mailing list. Information about how to do this is in the " -"Introduction section of the document." +msgid "This section discusses helpful tips for getting GDM working. In general, if you have a problem using GDM, you can submit a bug or send an email to the gdm-list mailing list. Information about how to do this is in the Introduction section of the document." msgstr "" #: C/gdm.xml:2170(para) -msgid "" -"If GDM is failing to work properly, it is always a good idea to include " -"debug information. To enable debugging, set the debug/Enable key to \"true\" " -"in the <etc>/gdm/custom.conf file and restart " -"GDM. Then use GDM to the point where it fails, and debug output will be sent " -"to the system log file (<var>/log/messages or " -"<var>/adm/messages depending on your Operating " -"System). If you share this output with the GDM community via a bug report or " -"email, please only include the GDM related debug information and not the " -"entire file since it can be large. If you do not see any GDM syslog output, " -"you may need to configure syslog (refer to the syslog man page)." -msgstr "" +msgid "If GDM is failing to work properly, it is always a good idea to include debug information. To enable debugging, set the debug/Enable key to \"true\" in the <etc>/gdm/custom.conf file and restart GDM. Then use GDM to the point where it fails, and debug output will be sent to the system log file (<var>/log/messages or <var>/adm/messages depending on your Operating System). If you share this output with the GDM community via a bug report or email, please only include the GDM related debug information and not the entire file since it can be large. If you do not see any GDM syslog output, you may need to configure syslog (refer to the syslog man page)." +msgstr "Bila GDM gagal bekerja dengan benar, sangat baik untuk menyertakan informasi awakutu. Untuk mengaktifkan pengawakutuan, tata kunci debug/Enable ke \"true\" di berkas <etc>/gdm/custom.conf dan mulai ulang GDM. Lalu gunakan GDM sampai titik kegagalan, dan keluaran awakutu akan dikirim ke berkas log sistem (<var>/log/messages atau <var>/adm/messages bergantung kepada Sistem Operasi Anda). Bila Anda berbagi keluaran ini dengan komunitas GDM melalui laporan kutu atau surel, mohon hanya sertakan informasi awakutu yang terkait GDM dan bukan seluruh berkas karena itu bisa jadi besar. Bila Anda tidak melihat keluaran syslog GDM apapun, mungkin Anda perlu menata ulang syslog (lihat halaman man syslog)." #: C/gdm.xml:2186(title) msgid "GDM Will Not Start" msgstr "GDM Tidak Akan Dimulai" #: C/gdm.xml:2188(para) -msgid "" -"There are a many problems that can cause GDM to fail to start, but this " -"section will discuss a few common problems and how to approach tracking down " -"a problem with GDM starting. Some problems will cause GDM to respond with an " -"error message or dialog when it tries to start, but it can be difficult to " -"track down problems when GDM fails silently." -msgstr "" +msgid "There are a many problems that can cause GDM to fail to start, but this section will discuss a few common problems and how to approach tracking down a problem with GDM starting. Some problems will cause GDM to respond with an error message or dialog when it tries to start, but it can be difficult to track down problems when GDM fails silently." +msgstr "Banyak masalah yang dapat menyebabkan GDM gagal berjalan, tapi bagian ini akan membahas beberapa masalah umum dan bagaimana melacak suatu masalah memulai GDM. Beberapa masalah akan menyebabkan GDM merespon dengan pesan galat atau dialog ketika ia mencoba memulai, tapi bisa menjadi sulit melacak masalah ketika GDM gagal diam-diam." #: C/gdm.xml:2197(para) -msgid "" -"First make sure that the Xserver is configured properly. The GDM " -"configuration file contains a command in the [server-Standard] section that " -"is used for starting the Xserver. Verify that this command works on your " -"system. Running this command from the console should start the Xserver. If " -"it fails, then the problem is likely with your Xserver configuration. Refer " -"to your Xserver error log for an idea of what the problem may be. The " -"problem may also be that your Xserver requires different command-line " -"options. If so, then modify the Xserver command in the GDM configuration " -"file so that it is correct for your system." -msgstr "" +msgid "First make sure that the Xserver is configured properly. The GDM configuration file contains a command in the [server-Standard] section that is used for starting the Xserver. Verify that this command works on your system. Running this command from the console should start the Xserver. If it fails, then the problem is likely with your Xserver configuration. Refer to your Xserver error log for an idea of what the problem may be. The problem may also be that your Xserver requires different command-line options. If so, then modify the Xserver command in the GDM configuration file so that it is correct for your system." +msgstr "Pertama pastikan bahwa Xserver ditata dengan benar. Berkas konfigurasi GDM memuat suatu perintah di bagian [server-Standard] yang dipakai untuk memulai Xserver. Periksa bahwa perintah ini bekerja baik pada sistem Anda. Menjalankan perintah ini dari konsol mestinya memulai Xserver. Bila gagal, maka masalahnya boleh jadi pada konfigurasi Xserver Anda. Lihat log galat Xserver Anda untuk ide apa kemungkinan masalahnya. Masalah mungkin juga karena bahwa Xserver Anda memerlukan opsi perintah baris yang berbeda. Bila begitu, maka ubahlah perintah Xserver di berkas konfigurasi GDM sehingga tepat bagi sistem Anda." #: C/gdm.xml:2210(para) -msgid "" -"Also make sure that the /tmp directory has reasonable " -"ownership and permissions, and that the machine's file system is not full. " -"These problems will cause GDM to fail to start." +msgid "Also make sure that the /tmp directory has reasonable ownership and permissions, and that the machine's file system is not full. These problems will cause GDM to fail to start." msgstr "" #: C/gdm.xml:2221(title) @@ -2527,52 +1675,19 @@ msgstr "Lisensi" #: C/gdm.xml:2222(para) -msgid "" -"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." -msgstr "" -"Program ini adalah perangkat lunak bebas; Anda dapat menyebarluaskannya dan/" -"atau mengubahnya di bawah syarat GNU General Public License sebagaimana " -"dipublikasikan oleh Free Software Foundation; baik versi 2 dari Lisensi, " -"atau (terserah pilihan Anda) versi setelahnya." +msgid "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." +msgstr "Program ini adalah perangkat lunak bebas; Anda dapat menyebarluaskannya dan/atau mengubahnya di bawah syarat GNU General Public License sebagaimana dipublikasikan oleh Free Software Foundation; baik versi 2 dari Lisensi, atau (terserah pilihan Anda) versi setelahnya." #: C/gdm.xml:2230(para) -msgid "" -"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." -msgstr "" -"Program ini didistribusikan dengan harapan akan berguna, tetapi TANPA ADANYA " -"JAMINAN; termasuk tanpa jaminan KETERDAGANGAN atau KECOCOKAN UNTUK TUJUAN " -"TERTENTU. Lihat GNU General Public License untuk " -"rincian lebih lanjut." +msgid "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." +msgstr "Program ini didistribusikan dengan harapan akan berguna, tetapi TANPA ADANYA JAMINAN; termasuk tanpa jaminan KETERDAGANGAN atau KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut." #: C/gdm.xml:2236(para) -msgid "" -"A copy of the GNU General Public License is included " -"as an appendix to the GNOME Users Guide. You may also " -"obtain a copy of the GNU General Public License from " -"the Free Software Foundation by visiting their Web site or by writing to
Free " -"Software Foundation, Inc. 51 Franklin Street, Fifth FloorBoston, MA02110-1301USA
" -msgstr "" -"Suatu salinan dari GNU General Public License " -"disertakan sebagai lampiran dari Panduan Pengguna GNOME. Anda juga dapat memperoleh salinan dari GNU General " -"Public License dari Free Software Foundation dengan mengunjungi " -"ulink type=\"http\" url=\"http://www.fsf.org\">laman Web mereka atau " -"dengan mengirim surat ke
Free Software Foundation, Inc, 51 " -"Franklin Street, Fifth FloorBoston, MA02110-1301USA
." +msgid "A copy of the GNU General Public License is included as an appendix to the GNOME Users Guide. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their Web site or by writing to
Free Software Foundation, Inc. 51 Franklin Street, Fifth FloorBoston, MA02110-1301USA
" +msgstr "Suatu salinan dari GNU General Public License disertakan sebagai lampiran dari Panduan Pengguna GNOME. Anda juga dapat memperoleh salinan dari GNU General Public License dari Free Software Foundation dengan mengunjungi ulink type=\"http\" url=\"http://www.fsf.org\">laman Web mereka atau dengan mengirim surat ke
Free Software Foundation, Inc, 51 Franklin Street, Fifth FloorBoston, MA02110-1301USA
." #. Put one translator per line, in the form of NAME , YEAR1, YEAR2 #: C/gdm.xml:0(None) msgid "translator-credits" msgstr "Andika Triwidada , 2010." + diff -Nru gdm-2.32.1/docs/Makefile.in gdm-3.0.0/docs/Makefile.in --- gdm-2.32.1/docs/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/docs/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -61,8 +61,11 @@ $(top_srcdir)/gnome-doc-utils.make subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -82,8 +85,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/gui/Makefile.am gdm-3.0.0/gui/Makefile.am --- gdm-2.32.1/gui/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/Makefile.am 2011-04-04 14:37:16.000000000 +0000 @@ -2,7 +2,6 @@ SUBDIRS = \ simple-greeter \ - user-switch-applet \ $(NULL) if XDMCP_SUPPORT @@ -12,5 +11,4 @@ DIST_SUBDIRS = \ simple-chooser \ simple-greeter \ - user-switch-applet \ $(NULL) diff -Nru gdm-2.32.1/gui/Makefile.in gdm-3.0.0/gui/Makefile.in --- gdm-2.32.1/gui/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/gui/Makefile.in 2011-04-04 14:39:28.000000000 +0000 @@ -37,8 +37,11 @@ subdir = gui DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -97,8 +100,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ @@ -340,11 +341,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -SUBDIRS = simple-greeter user-switch-applet $(NULL) $(am__append_1) +SUBDIRS = simple-greeter $(NULL) $(am__append_1) DIST_SUBDIRS = \ simple-chooser \ simple-greeter \ - user-switch-applet \ $(NULL) all: all-recursive diff -Nru gdm-2.32.1/gui/simple-chooser/chooser-main.c gdm-3.0.0/gui/simple-chooser/chooser-main.c --- gdm-2.32.1/gui/simple-chooser/chooser-main.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-chooser/chooser-main.c 2011-04-04 14:37:16.000000000 +0000 @@ -125,7 +125,7 @@ root = gdk_get_default_root_window (); if ( ! AT_SPI_IOR) { - AT_SPI_IOR = XInternAtom (GDK_DISPLAY (), "AT_SPI_IOR", False); + AT_SPI_IOR = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "AT_SPI_IOR", False); } gdk_window_set_events (root, GDK_PROPERTY_CHANGE_MASK); diff -Nru gdm-2.32.1/gui/simple-chooser/gdm-chooser-session.c gdm-3.0.0/gui/simple-chooser/gdm-chooser-session.c --- gdm-2.32.1/gui/simple-chooser/gdm-chooser-session.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-chooser/gdm-chooser-session.c 2011-04-04 14:37:16.000000000 +0000 @@ -131,7 +131,7 @@ ret = FALSE; error = NULL; - g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error); + g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); if (error != NULL) { g_warning ("Error starting settings daemon: %s", error->message); g_error_free (error); diff -Nru gdm-2.32.1/gui/simple-chooser/gdm-host-chooser.c gdm-3.0.0/gui/simple-chooser/gdm-host-chooser.c --- gdm-2.32.1/gui/simple-chooser/gdm-host-chooser.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-chooser/gdm-host-chooser.c 2011-04-04 14:37:16.000000000 +0000 @@ -126,7 +126,7 @@ root = gdk_get_default_root_window (); if ( ! AT_SPI_IOR) { - AT_SPI_IOR = XInternAtom (GDK_DISPLAY (), "AT_SPI_IOR", False); + AT_SPI_IOR = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "AT_SPI_IOR", False); } gdk_window_set_events (root, GDK_PROPERTY_CHANGE_MASK); diff -Nru gdm-2.32.1/gui/simple-chooser/gdm-host-chooser-dialog.c gdm-3.0.0/gui/simple-chooser/gdm-host-chooser-dialog.c --- gdm-2.32.1/gui/simple-chooser/gdm-host-chooser-dialog.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-chooser/gdm-host-chooser-dialog.c 2011-04-04 14:37:16.000000000 +0000 @@ -144,7 +144,6 @@ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_title (GTK_WINDOW (dialog), _("Select System")); gtk_window_set_icon_name (GTK_WINDOW (dialog), "computer"); diff -Nru gdm-2.32.1/gui/simple-chooser/Makefile.in gdm-3.0.0/gui/simple-chooser/Makefile.in --- gdm-2.32.1/gui/simple-chooser/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/gui/simple-chooser/Makefile.in 2011-04-04 14:39:29.000000000 +0000 @@ -39,8 +39,11 @@ subdir = gui/simple-chooser DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -110,8 +113,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-cell-renderer-timer.c gdm-3.0.0/gui/simple-greeter/gdm-cell-renderer-timer.c --- gdm-2.32.1/gui/simple-greeter/gdm-cell-renderer-timer.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-cell-renderer-timer.c 2011-04-04 14:37:16.000000000 +0000 @@ -84,13 +84,13 @@ } static void -gdm_cell_renderer_timer_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) +gdm_cell_renderer_timer_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + const GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height) { GdmCellRendererTimer *renderer; @@ -180,16 +180,15 @@ static void gdm_cell_renderer_timer_render (GtkCellRenderer *cell, - GdkWindow *window, + cairo_t *context, GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState renderer_state) { GdmCellRendererTimer *renderer; - cairo_t *context; GtkStateType widget_state; + gfloat xpad, ypad; renderer = GDM_CELL_RENDERER_TIMER (cell); @@ -197,15 +196,7 @@ return; } - context = gdk_cairo_create (GDK_DRAWABLE (window)); - - if (expose_area != NULL) { - gdk_cairo_rectangle (context, expose_area); - cairo_clip (context); - } - - gfloat xpad, ypad; - gtk_cell_renderer_get_alignment (cell, &xpad, &ypad); + gtk_cell_renderer_get_alignment (cell, &xpad, &ypad); cairo_translate (context, cell_area->x + xpad, @@ -228,8 +219,6 @@ >k_widget_get_style (widget)->text_aa[widget_state], >k_widget_get_style (widget)->base[widget_state], cell_area->width, cell_area->height); - - cairo_destroy (context); } static void diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-chooser-widget.c gdm-3.0.0/gui/simple-greeter/gdm-chooser-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-chooser-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-chooser-widget.c 2011-04-04 14:37:16.000000000 +0000 @@ -699,7 +699,7 @@ if (gdm_chooser_widget_get_number_of_items (widget) > 0) { gtk_widget_show (widget->priv->frame); - set_chooser_list_visible (widget, TRUE); + set_chooser_list_visible (widget, gtk_widget_get_visible (widget)); } else { gtk_widget_hide (widget->priv->frame); set_chooser_list_visible (widget, FALSE); @@ -910,17 +910,13 @@ foc_widget = GDM_CHOOSER_WIDGET (widget)->priv->items_view; g_debug ("GdmChooserWidget: grabbing focus"); - if (! gtk_widget_get_realized (foc_widget)) { - g_debug ("GdmChooserWidget: not grabbing focus - not realized"); - return; - } if (gtk_widget_has_focus (foc_widget)) { g_debug ("GdmChooserWidget: not grabbing focus - already has it"); return; } - gtk_widget_grab_focus (foc_widget); + gtk_widget_child_focus (foc_widget, GTK_DIR_TAB_FORWARD); } static void diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-clock-widget.c gdm-3.0.0/gui/simple-greeter/gdm-clock-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-clock-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-clock-widget.c 2011-04-04 14:37:16.000000000 +0000 @@ -115,6 +115,7 @@ struct tm *tm; char buf[256]; char *utf8; + char *markup; time (&t); tm = localtime (&t); @@ -127,7 +128,9 @@ strcpy (buf, "???"); } utf8 = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL); - gtk_label_set_text (label, utf8); + markup = g_strdup_printf ("%s", utf8); + gtk_label_set_markup (label, markup); + g_free (markup); g_free (utf8); if (tooltip_format != NULL) { @@ -196,17 +199,34 @@ } static void -gdm_clock_widget_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gdm_clock_widget_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + if (GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->get_preferred_width) { + GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->get_preferred_width (widget, minimum_size, natural_size); + } + +} + +static void +gdm_clock_widget_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) { PangoFontMetrics *metrics; PangoContext *context; int ascent; int descent; int padding; + int min_size; + int nat_size; - if (GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->size_request) { - GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->size_request (widget, requisition); + min_size = 0; + nat_size = 0; + + if (GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->get_preferred_height) { + GTK_WIDGET_CLASS (gdm_clock_widget_parent_class)->get_preferred_height (widget, &min_size, &nat_size); } gtk_widget_ensure_style (widget); @@ -218,7 +238,13 @@ ascent = pango_font_metrics_get_ascent (metrics); descent = pango_font_metrics_get_descent (metrics); padding = PANGO_PIXELS (ascent + descent) / 2.0; - requisition->height += padding; + min_size += padding; + nat_size += padding; + + if (minimum_size) + *minimum_size = min_size; + if (natural_size) + *natural_size = nat_size; pango_font_metrics_unref (metrics); } @@ -233,7 +259,8 @@ widget_class = GTK_WIDGET_CLASS (klass); object_class->finalize = gdm_clock_widget_finalize; - widget_class->size_request = gdm_clock_widget_size_request; + widget_class->get_preferred_width = gdm_clock_widget_get_preferred_width; + widget_class->get_preferred_height = gdm_clock_widget_get_preferred_height; g_type_class_add_private (klass, sizeof (GdmClockWidgetPrivate)); } diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.c gdm-3.0.0/gui/simple-greeter/gdm-greeter-client.c --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-client.c 2011-04-04 14:37:16.000000000 +0000 @@ -68,7 +68,6 @@ AUTHENTICATION_FAILED, SELECTED_USER_CHANGED, DEFAULT_LANGUAGE_NAME_CHANGED, - DEFAULT_LAYOUT_NAME_CHANGED, DEFAULT_SESSION_NAME_CHANGED, TIMED_LOGIN_REQUESTED, USER_AUTHORIZED, @@ -177,13 +176,6 @@ } static void -on_default_layout_name_changed (GdmGreeterClient *client, - DBusMessage *message) -{ - emit_string_signal_for_message (client, "DefaultLayoutNameChanged", message, DEFAULT_LAYOUT_NAME_CHANGED); -} - -static void on_default_session_name_changed (GdmGreeterClient *client, DBusMessage *message) { @@ -472,14 +464,6 @@ } void -gdm_greeter_client_call_select_layout (GdmGreeterClient *client, - const char *text) -{ - send_dbus_string_method (client->priv->connection, - "SelectLayout", - text); -} -void gdm_greeter_client_call_select_user (GdmGreeterClient *client, const char *text) { @@ -663,8 +647,6 @@ on_selected_user_changed (client, message); } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultLanguageNameChanged")) { on_default_language_name_changed (client, message); - } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultLayoutNameChanged")) { - on_default_layout_name_changed (client, message); } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultSessionNameChanged")) { on_default_session_name_changed (client, message); } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "TimedLoginRequested")) { @@ -937,16 +919,6 @@ g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - gdm_greeter_client_signals[DEFAULT_LAYOUT_NAME_CHANGED] = - g_signal_new ("default-layout-name-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GdmGreeterClientClass, default_layout_name_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, G_TYPE_STRING); gdm_greeter_client_signals[DEFAULT_SESSION_NAME_CHANGED] = g_signal_new ("default-session-name-changed", G_OBJECT_CLASS_TYPE (object_class), diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.h gdm-3.0.0/gui/simple-greeter/gdm-greeter-client.h --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-client.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-client.h 2011-04-04 14:37:16.000000000 +0000 @@ -65,8 +65,6 @@ const char *session_name); void (* default_language_name_changed) (GdmGreeterClient *client, const char *language_name); - void (* default_layout_name_changed) (GdmGreeterClient *client, - const char *layout_name); void (* timed_login_requested) (GdmGreeterClient *client, const char *username, int delay); @@ -105,8 +103,6 @@ const char *text); void gdm_greeter_client_call_select_language (GdmGreeterClient *client, const char *text); -void gdm_greeter_client_call_select_layout (GdmGreeterClient *client, - const char *text); void gdm_greeter_client_call_select_session (GdmGreeterClient *client, const char *text); void gdm_greeter_client_call_answer_query (GdmGreeterClient *client, diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.c --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.c 2011-04-04 14:37:16.000000000 +0000 @@ -56,6 +56,7 @@ #include "gdm-greeter-login-window.h" #include "gdm-user-chooser-widget.h" +#include "gdm-session-option-widget.h" #ifdef HAVE_PAM #include @@ -85,6 +86,7 @@ #define LSB_RELEASE_COMMAND "lsb_release -d" #define GDM_GREETER_LOGIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_GREETER_LOGIN_WINDOW, GdmGreeterLoginWindowPrivate)) +#define GDM_CUSTOM_SESSION "custom" enum { MODE_UNDEFINED = 0, @@ -102,6 +104,7 @@ struct GdmGreeterLoginWindowPrivate { GtkBuilder *builder; + GtkWidget *session_option_widget; GtkWidget *user_chooser; GtkWidget *auth_banner_label; GtkWidget *current_button; @@ -143,7 +146,7 @@ QUERY_ANSWER, START_SESSION, USER_SELECTED, - DISCONNECTED, + SESSION_SELECTED, CANCELLED, LAST_SIGNAL }; @@ -506,12 +509,18 @@ switch (number) { case MODE_SELECTION: set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN); + set_sensitive (login_window, TRUE); + gtk_widget_hide (login_window->priv->session_option_widget); break; case MODE_TIMED_LOGIN: set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN); + set_sensitive (login_window, TRUE); + gtk_widget_show (login_window->priv->session_option_widget); break; case MODE_AUTHENTICATION: set_log_in_button_mode (login_window, LOGIN_BUTTON_ANSWER_QUERY); + set_sensitive (login_window, FALSE); + gtk_widget_show (login_window->priv->session_option_widget); break; default: g_assert_not_reached (); @@ -624,7 +633,6 @@ { GtkWidget *entry; GtkWidget *label; - guint mode; g_debug ("GdmGreeterLoginWindow: Resetting dialog to mode %u", dialog_mode); set_busy (login_window); @@ -677,7 +685,6 @@ switch_mode (login_window, dialog_mode); } - set_sensitive (login_window, TRUE); set_ready (login_window); set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); update_banner_message (login_window); @@ -705,6 +712,7 @@ set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE); set_ready (GDM_GREETER_LOGIN_WINDOW (login_window)); set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); + gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (login_window))); /* If we are retrying a previously selected user */ if (!login_window->priv->user_list_disabled && @@ -756,6 +764,7 @@ g_debug ("GdmGreeterLoginWindow: info: %s", text); set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text); + maybe_show_cancel_button (login_window); return TRUE; } @@ -767,6 +776,7 @@ g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE); g_debug ("GdmGreeterLoginWindow: problem: %s", text); + maybe_show_cancel_button (login_window); set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text); gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (login_window))); @@ -879,6 +889,7 @@ gtk_label_set_text (GTK_LABEL (label), text); show_widget (login_window, "auth-input-box", TRUE); + set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE); set_ready (GDM_GREETER_LOGIN_WINDOW (login_window)); set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); @@ -909,6 +920,7 @@ gtk_label_set_text (GTK_LABEL (label), text); show_widget (login_window, "auth-input-box", TRUE); + gtk_widget_show (login_window->priv->session_option_widget); set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE); set_ready (GDM_GREETER_LOGIN_WINDOW (login_window)); set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); @@ -1030,7 +1042,6 @@ GdmGreeterLoginWindow *login_window) { char *user_name; - guint mode; user_name = gdm_user_chooser_widget_get_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser)); g_debug ("GdmGreeterLoginWindow: user chosen '%s'", user_name); @@ -1051,6 +1062,46 @@ } static void +on_session_activated (GdmSessionOptionWidget *session_option_widget, + GdmGreeterLoginWindow *login_window) +{ + char *session; + + session = gdm_session_option_widget_get_current_session (GDM_SESSION_OPTION_WIDGET (login_window->priv->session_option_widget)); + if (session == NULL) { + return; + } + + g_signal_emit (login_window, signals[SESSION_SELECTED], 0, session); + + g_free (session); +} + +void +gdm_greeter_login_window_set_default_session_name (GdmGreeterLoginWindow *login_window, + const char *session_name) +{ + g_return_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window)); + + if (session_name != NULL && !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (login_window->priv->session_option_widget), + session_name, NULL, NULL, NULL)) { + if (strcmp (session_name, GDM_CUSTOM_SESSION) == 0) { + gdm_option_widget_add_item (GDM_OPTION_WIDGET (login_window->priv->session_option_widget), + GDM_CUSTOM_SESSION, + C_("customsession", "Custom"), + _("Custom session"), + GDM_OPTION_WIDGET_POSITION_TOP); + } else { + g_warning ("Default session is not available"); + return; + } + } + + gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (login_window->priv->session_option_widget), + session_name); +} + +static void rotate_computer_info (GdmGreeterLoginWindow *login_window) { GtkWidget *notebook; @@ -1223,6 +1274,18 @@ static void +register_custom_types (GdmGreeterLoginWindow *login_window) +{ + GType types[] = { GDM_TYPE_USER_CHOOSER_WIDGET, + GDM_TYPE_SESSION_OPTION_WIDGET }; + int i; + + for (i = 0; i < G_N_ELEMENTS (types); i++) { + g_debug ("Registering type '%s'", g_type_name (types[i])); + } +} + +static void load_theme (GdmGreeterLoginWindow *login_window) { GtkWidget *entry; @@ -1233,6 +1296,8 @@ gdm_profile_start (NULL); + register_custom_types (login_window); + login_window->priv->builder = gtk_builder_new (); if (!gtk_builder_add_from_file (login_window->priv->builder, UIDIR "/" UI_XML_FILE, &error)) { g_warning ("Couldn't load builder file: %s", error->message); @@ -1266,12 +1331,7 @@ box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "window-frame")); gtk_container_add (GTK_CONTAINER (login_window), box); - /* FIXME: user chooser should implement GtkBuildable and this should get dropped - */ - login_window->priv->user_chooser = gdm_user_chooser_widget_new (); - box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "selection-box")); - gtk_box_pack_start (GTK_BOX (box), login_window->priv->user_chooser, TRUE, TRUE, 0); - gtk_box_reorder_child (GTK_BOX (box), login_window->priv->user_chooser, 0); + login_window->priv->user_chooser = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "user-chooser")); gdm_user_chooser_widget_set_show_only_chosen (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser), TRUE); @@ -1293,6 +1353,13 @@ G_CALLBACK (on_user_chooser_visibility_changed), login_window); + login_window->priv->session_option_widget = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "session-option-widget")); + + g_signal_connect (login_window->priv->session_option_widget, + "activated", + G_CALLBACK (on_session_activated), + login_window); + login_window->priv->auth_banner_label = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "auth-banner-label")); /*make_label_small_italic (login_window->priv->auth_banner_label);*/ @@ -1329,7 +1396,7 @@ login_window = GDM_GREETER_LOGIN_WINDOW (widget); - if (event->keyval == GDK_Escape) { + if (event->keyval == GDK_KEY_Escape) { if (login_window->priv->dialog_mode == MODE_AUTHENTICATION || login_window->priv->dialog_mode == MODE_TIMED_LOGIN) { do_cancel (GDM_GREETER_LOGIN_WINDOW (widget)); @@ -1340,45 +1407,82 @@ } static void -gdm_greeter_login_window_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gdm_greeter_login_window_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) { int monitor; GdkScreen *screen; - GtkRequisition child_requisition; GdkRectangle area; + GtkAllocation widget_allocation; + int min_size; + int nat_size; - if (GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->size_request) { - GTK_WIDGET_CLASS (gdm_greeter_login_window_parent_class)->size_request (widget, requisition); - } + min_size = 0; + nat_size = 0; if (!gtk_widget_get_realized (widget)) { - return; + goto out; } + gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)), + &min_size, + &nat_size); + + /* Make width be at least 33% screen width */ screen = gtk_widget_get_screen (widget); monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); gdk_screen_get_monitor_geometry (screen, monitor, &area); + min_size = MAX (min_size, .33 * area.width); + nat_size = MAX (nat_size, .33 * area.width); - gtk_widget_get_child_requisition (gtk_bin_get_child (GTK_BIN (widget)), &child_requisition); - *requisition = child_requisition; + /* Don't ever shrink window width */ + gtk_widget_get_allocation (widget, &widget_allocation); - guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->width += 2 * border_width; - requisition->height += 2 * border_width; + min_size = MAX (min_size, widget_allocation.width); + nat_size = MAX (nat_size, widget_allocation.width); - /* Make width be at least 33% screen width - * and height be at most 80% of screen height - */ - requisition->width = MAX (requisition->width, .33 * area.width); - requisition->height = MIN (requisition->height, .80 * area.height); + out: + if (minimum_size) + *minimum_size = min_size; + if (natural_size) + *natural_size = nat_size; +} - /* Don't ever shrink window width - */ - GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); +static void +gdm_greeter_login_window_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + int monitor; + GdkScreen *screen; + GdkRectangle area; + int min_size; + int nat_size; + + min_size = 0; + nat_size = 0; + + if (!gtk_widget_get_realized (widget)) { + goto out; + } + + gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)), + &min_size, + &nat_size); - requisition->width = MAX (requisition->width, widget_allocation.width); + /* Make height be at most 80% of screen height */ + screen = gtk_widget_get_screen (widget); + monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); + gdk_screen_get_monitor_geometry (screen, monitor, &area); + min_size = MIN (min_size, .8 * area.height); + nat_size = MIN (nat_size, .8 * area.height); + + out: + if (minimum_size) + *minimum_size = min_size; + if (natural_size) + *natural_size = nat_size; } static void @@ -1463,6 +1567,7 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); object_class->get_property = gdm_greeter_login_window_get_property; object_class->set_property = gdm_greeter_login_window_set_property; @@ -1470,7 +1575,10 @@ object_class->finalize = gdm_greeter_login_window_finalize; widget_class->key_press_event = gdm_greeter_login_window_key_press_event; - widget_class->size_request = gdm_greeter_login_window_size_request; + widget_class->get_preferred_width = gdm_greeter_login_window_get_preferred_width; + widget_class->get_preferred_height = gdm_greeter_login_window_get_preferred_height; + + gtk_container_class_handle_border_width (container_class); signals [BEGIN_AUTO_LOGIN] = g_signal_new ("begin-auto-login", @@ -1521,21 +1629,21 @@ g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - signals [CANCELLED] = - g_signal_new ("cancelled", + signals [SESSION_SELECTED] = + g_signal_new ("session-selected", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, cancelled), + G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, session_selected), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, - 0); - signals [DISCONNECTED] = - g_signal_new ("disconnected", + 1, G_TYPE_STRING); + signals [CANCELLED] = + g_signal_new ("cancelled", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, disconnected), + G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, cancelled), NULL, NULL, g_cclosure_marshal_VOID__VOID, diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.h --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.h 2011-04-04 14:37:16.000000000 +0000 @@ -55,8 +55,9 @@ const char *text); void (* user_selected) (GdmGreeterLoginWindow *login_window, const char *text); + void (* session_selected) (GdmGreeterLoginWindow *login_window, + const char *text); void (* cancelled) (GdmGreeterLoginWindow *login_window); - void (* disconnected) (GdmGreeterLoginWindow *login_window); void (* start_session) (GdmGreeterLoginWindow *login_window); } GdmGreeterLoginWindowClass; @@ -76,6 +77,8 @@ const char *text); gboolean gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, const char *text); +void gdm_greeter_login_window_set_default_session_name (GdmGreeterLoginWindow *login_window, + const char *text); void gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, const char *username, diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.ui gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.ui --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-login-window.ui 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-login-window.ui 2011-04-04 14:37:16.000000000 +0000 @@ -20,7 +20,7 @@ True - 64 + 48 computer @@ -160,7 +160,14 @@ True 10 - + + False + + + True + True + 0 + @@ -235,15 +242,30 @@ 6 end + + False + 0.0 + 0.0 + 0.0 + 1.0 + + + True + True + 0 + True + + + - Cancel + Cancel True True False False - 0 + 1 @@ -257,7 +279,7 @@ False False - 1 + 2 @@ -277,8 +299,8 @@ - False - False + True + True end 2 diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.c gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.c --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.c 2011-04-04 14:37:16.000000000 +0000 @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * Copyright (C) 2007 William Jon McCann + * Copyright (C) 2011 Red Hat, 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 @@ -35,6 +36,8 @@ #include #include #include +#include +#include #include #include @@ -44,26 +47,19 @@ #include #endif -#include "gdm-languages.h" -#include "gdm-layouts.h" #include "gdm-greeter-panel.h" #include "gdm-clock-widget.h" -#include "gdm-language-option-widget.h" -#include "gdm-layout-option-widget.h" -#include "gdm-session-option-widget.h" #include "gdm-timer.h" #include "gdm-profile.h" #include "gdm-common.h" -#include "na-tray.h" - #define CK_NAME "org.freedesktop.ConsoleKit" #define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" -#define GPM_DBUS_NAME "org.freedesktop.PowerManagement" -#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement" -#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement" +#define GPM_DBUS_NAME "org.gnome.PowerManager" +#define GPM_DBUS_PATH "/org/gnome/PowerManager" +#define GPM_DBUS_INTERFACE "org.gnome.PowerManager" #define KEY_DISABLE_RESTART_BUTTONS "/apps/gdm/simple-greeter/disable_restart_buttons" #define KEY_NOTIFICATION_AREA_PADDING "/apps/notification_area_applet/prefs/padding" @@ -75,23 +71,24 @@ int monitor; GdkRectangle geometry; GtkWidget *hbox; + GtkWidget *left_hbox; + GtkWidget *right_hbox; GtkWidget *alignment; - GtkWidget *option_hbox; GtkWidget *hostname_label; GtkWidget *clock; - GtkWidget *shutdown_button; + GtkWidget *status_menubar; GtkWidget *shutdown_menu; - GtkWidget *language_option_widget; - GtkWidget *layout_option_widget; - GtkWidget *session_option_widget; GdmTimer *animation_timer; double progress; - char *default_session_name; - char *default_language_name; + GtkWidget *power_image; + GtkWidget *power_menu_item; + GtkWidget *power_menubar_item; + GDBusProxy *power_proxy; + gulong power_proxy_signal_handler; + gulong power_proxy_properties_changed_handler; - GConfClient *client; guint display_is_local : 1; }; @@ -102,9 +99,7 @@ }; enum { - LANGUAGE_SELECTED, - LAYOUT_SELECTED, - SESSION_SELECTED, + DISCONNECTED, NUMBER_OF_SIGNALS }; @@ -192,6 +187,18 @@ static void gdm_greeter_panel_dispose (GObject *object) { + GdmGreeterPanel *panel; + + g_return_if_fail (object != NULL); + g_return_if_fail (GDM_IS_GREETER_PANEL (object)); + + panel = GDM_GREETER_PANEL (object); + + if (panel->priv->power_proxy != NULL) { + g_object_unref (panel->priv->power_proxy); + panel->priv->power_proxy = NULL; + } + G_OBJECT_CLASS (gdm_greeter_panel_parent_class)->dispose (object); } @@ -232,13 +239,118 @@ } static void +update_power_icon (GdmGreeterPanel *panel) +{ + GVariant *variant; + + g_assert (panel->priv->power_proxy != NULL); + + variant = g_dbus_proxy_get_cached_property (panel->priv->power_proxy, "Icon"); + if (variant == NULL) { + /* FIXME: use an indeterminant icon */ + return; + } + + if (g_variant_is_of_type (variant, G_VARIANT_TYPE ("s"))) { + const char *name; + + name = g_variant_get_string (variant, NULL); + + if (name != NULL && *name != '\0') { + GError *error; + GIcon *icon; + error = NULL; + icon = g_icon_new_for_string (name, &error); + if (icon != NULL) { + g_debug ("setting power icon %s", name); + gtk_image_set_from_gicon (GTK_IMAGE (panel->priv->power_image), + icon, + GTK_ICON_SIZE_MENU); + gtk_widget_show_all (panel->priv->power_menubar_item); + } else { + gtk_widget_hide (panel->priv->power_menubar_item); + } + } else { + gtk_widget_hide (panel->priv->power_menubar_item); + } + } + + g_variant_unref (variant); +} + +static void +update_power_menu (GdmGreeterPanel *panel) +{ + GVariant *variant; + + g_assert (panel->priv->power_proxy != NULL); + + variant = g_dbus_proxy_get_cached_property (panel->priv->power_proxy, "Tooltip"); + if (variant == NULL) { + /* FIXME: use an indeterminant message */ + return; + } + + if (g_variant_is_of_type (variant, G_VARIANT_TYPE ("s"))) { + const char *txt; + + txt = g_variant_get_string (variant, NULL); + if (txt != NULL) { + gtk_menu_item_set_label (GTK_MENU_ITEM (panel->priv->power_menu_item), txt); + } + } + + g_variant_unref (variant); +} + +static void +on_power_proxy_g_signal (GDBusProxy *proxy, + const char *sender_name, + const char *signal_name, + GVariant *parameters, + GdmGreeterPanel *panel) +{ + if (g_strcmp0 (signal_name, "Changed") == 0) { + //update_power_icon (panel); + } +} + +static void +on_power_proxy_g_properties_changed (GDBusProxy *proxy, + GVariant *changed_properties, + GStrv *invalidated_properties, + GdmGreeterPanel *panel) +{ + g_debug ("Got power properties changed"); + if (g_variant_n_children (changed_properties) > 0) { + GVariantIter iter; + GVariant *value; + char *key; + + g_variant_iter_init (&iter, changed_properties); + + while (g_variant_iter_loop (&iter, "{&sv}", &key, &value)) { + if (g_strcmp0 (key, "Icon") == 0) { + g_debug ("Got power Icon changed"); + update_power_icon (panel); + } else if (g_strcmp0 (key, "Tooltip") == 0) { + g_debug ("Got power tooltip changed"); + update_power_menu (panel); + } + } + } +} + +static void gdm_greeter_panel_real_realize (GtkWidget *widget) { + GdmGreeterPanel *panel = GDM_GREETER_PANEL (widget); + if (GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->realize) { GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->realize (widget); } - gdk_window_set_geometry_hints (widget->window, NULL, GDK_HINT_POS); + gdk_window_set_geometry_hints (gtk_widget_get_window (widget), NULL, GDK_HINT_POS); gdm_greeter_panel_move_resize_window (GDM_GREETER_PANEL (widget), TRUE, TRUE); @@ -246,15 +358,37 @@ "size_changed", G_CALLBACK (on_screen_size_changed), widget); + + if (panel->priv->power_proxy != NULL) { + update_power_icon (panel); + update_power_menu (panel); + panel->priv->power_proxy_signal_handler = g_signal_connect (panel->priv->power_proxy, + "g-signal", + G_CALLBACK (on_power_proxy_g_signal), + panel); + panel->priv->power_proxy_properties_changed_handler = g_signal_connect (panel->priv->power_proxy, + "g-properties-changed", + G_CALLBACK (on_power_proxy_g_properties_changed), + panel); + } + } static void gdm_greeter_panel_real_unrealize (GtkWidget *widget) { + GdmGreeterPanel *panel = GDM_GREETER_PANEL (widget); + g_signal_handlers_disconnect_by_func (gtk_window_get_screen (GTK_WINDOW (widget)), on_screen_size_changed, widget); + if (panel->priv->power_proxy != NULL + && panel->priv->power_proxy_signal_handler != 0) { + g_signal_handler_disconnect (panel->priv->power_proxy, panel->priv->power_proxy_signal_handler); + g_signal_handler_disconnect (panel->priv->power_proxy, panel->priv->power_proxy_properties_changed_handler); + } + if (GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->unrealize) { GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->unrealize (widget); } @@ -268,7 +402,6 @@ int height) { gulong data[12] = { 0, }; - int screen_height; /* _NET_WM_STRUT_PARTIAL: CARDINAL[12]/32 * @@ -280,50 +413,42 @@ * not just the current monitor. */ - /* for bottom panel */ - screen_height = gdk_screen_get_height (gtk_window_get_screen (GTK_WINDOW (panel))); - - /* bottom */ - data[3] = screen_height - panel->priv->geometry.y - panel->priv->geometry.height + height; - /* bottom_start_x */ - data[10] = x; - /* bottom_end_x */ - data[11] = x + width; + /* top */ + data[2] = panel->priv->geometry.y + height; + /* top_start_x */ + data[8] = x; + /* top_end_x */ + data[9] = x + width; #if 0 - g_debug ("Setting strut: bottom=%lu bottom_start_x=%lu bottom_end_x=%lu", data[3], data[10], data[11]); + g_debug ("Setting strut: top=%lu top_start_x=%lu top_end_x=%lu", data[2], data[8], data[9]); #endif gdk_error_trap_push (); + if (gtk_widget_get_window (GTK_WIDGET (panel)) != NULL) { + gdk_property_change (gtk_widget_get_window (GTK_WIDGET (panel)), + gdk_atom_intern ("_NET_WM_STRUT_PARTIAL", FALSE), + gdk_atom_intern ("CARDINAL", FALSE), + 32, + GDK_PROP_MODE_REPLACE, + (guchar *) &data, + 12); + + gdk_property_change (gtk_widget_get_window (GTK_WIDGET (panel)), + gdk_atom_intern ("_NET_WM_STRUT", FALSE), + gdk_atom_intern ("CARDINAL", FALSE), + 32, + GDK_PROP_MODE_REPLACE, + (guchar *) &data, + 4); + } - gdk_property_change (gtk_widget_get_window (GTK_WIDGET (panel)), - gdk_atom_intern ("_NET_WM_STRUT_PARTIAL", FALSE), - gdk_atom_intern ("CARDINAL", FALSE), - 32, - GDK_PROP_MODE_REPLACE, - (guchar *) &data, - 12); - - gdk_property_change (gtk_widget_get_window (GTK_WIDGET (panel)), - gdk_atom_intern ("_NET_WM_STRUT", FALSE), - gdk_atom_intern ("CARDINAL", FALSE), - 32, - GDK_PROP_MODE_REPLACE, - (guchar *) &data, - 4); - - gdk_error_trap_pop (); + gdk_error_trap_pop_ignored (); } static void update_struts (GdmGreeterPanel *panel) { - GdkRectangle geometry; - - gdk_screen_get_monitor_geometry (gtk_window_get_screen (GTK_WINDOW (panel)), - panel->priv->monitor, - &geometry); - /* FIXME: assumes only one panel */ set_struts (panel, panel->priv->geometry.x, @@ -346,9 +471,12 @@ panel->priv->geometry.height = requisition->height + 2 * gtk_container_get_border_width (GTK_CONTAINER (panel)); panel->priv->geometry.x = geometry.x; - panel->priv->geometry.y = geometry.y + geometry.height - panel->priv->geometry.height + (1.0 - panel->priv->progress) * panel->priv->geometry.height; + panel->priv->geometry.y = geometry.y - panel->priv->geometry.height + panel->priv->progress * panel->priv->geometry.height; #if 0 + panel->priv->geometry.y += 50; +#endif +#if 0 g_debug ("Setting geometry x:%d y:%d w:%d h:%d", panel->priv->geometry.x, panel->priv->geometry.y, @@ -360,32 +488,50 @@ } static void -gdm_greeter_panel_real_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gdm_greeter_panel_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size) { GdmGreeterPanel *panel; GtkBin *bin; + GtkWidget *child; GdkRectangle old_geometry; int position_changed = FALSE; int size_changed = FALSE; + GtkRequisition minimum_req, natural_req; panel = GDM_GREETER_PANEL (widget); bin = GTK_BIN (widget); + child = gtk_bin_get_child (bin); - old_geometry = panel->priv->geometry; - - update_geometry (panel, requisition); - - requisition->width = panel->priv->geometry.width; - requisition->height = panel->priv->geometry.height; - - if (gtk_bin_get_child (bin) && gtk_widget_get_visible (gtk_bin_get_child (bin))) { - gtk_widget_size_request (gtk_bin_get_child (bin), requisition); + minimum_req.width = 0; + minimum_req.height = 0; + natural_req.width = minimum_req.width; + natural_req.height = minimum_req.height; + + if (child != NULL && gtk_widget_get_visible (child)) { + int min_child_width, nat_child_width; + int min_child_height, nat_child_height; + + gtk_widget_get_preferred_width (gtk_bin_get_child (bin), + &min_child_width, + &nat_child_width); + gtk_widget_get_preferred_height (gtk_bin_get_child (bin), + &min_child_height, + &nat_child_height); + + minimum_req.width += min_child_width; + natural_req.width += nat_child_width; + minimum_req.height += min_child_height; + natural_req.height += nat_child_height; } - if (! gtk_widget_get_realized (widget)) { - return; - } + old_geometry = panel->priv->geometry; + update_geometry (panel, &natural_req); + + if (!gtk_widget_get_realized (widget)) + goto out; if (old_geometry.width != panel->priv->geometry.width || old_geometry.height != panel->priv->geometry.height) { @@ -398,6 +544,36 @@ } gdm_greeter_panel_move_resize_window (panel, position_changed, size_changed); + + out: + + if (orientation == GTK_ORIENTATION_HORIZONTAL) { + if (minimum_size) + *minimum_size = panel->priv->geometry.width; + if (natural_size) + *natural_size = panel->priv->geometry.width; + } else { + if (minimum_size) + *minimum_size = panel->priv->geometry.height; + if (natural_size) + *natural_size = panel->priv->geometry.height; + } +} + +static void +gdm_greeter_panel_real_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gdm_greeter_panel_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); +} + +static void +gdm_greeter_panel_real_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gdm_greeter_panel_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); } static void @@ -435,62 +611,6 @@ } static void -on_language_activated (GdmLanguageOptionWidget *widget, - GdmGreeterPanel *panel) -{ - - char *language; - - language = gdm_language_option_widget_get_current_language_name (GDM_LANGUAGE_OPTION_WIDGET (panel->priv->language_option_widget)); - - if (language == NULL) { - return; - } - - g_signal_emit (panel, signals[LANGUAGE_SELECTED], 0, language); - - g_free (language); -} - -static void -on_layout_activated (GdmLayoutOptionWidget *widget, - GdmGreeterPanel *panel) -{ - - char *layout; - - layout = gdm_layout_option_widget_get_current_layout_name (GDM_LAYOUT_OPTION_WIDGET (panel->priv->layout_option_widget)); - - if (layout == NULL) { - return; - } - - g_debug ("GdmGreeterPanel: activating selected layout %s", layout); - gdm_layout_activate (layout); - - g_signal_emit (panel, signals[LAYOUT_SELECTED], 0, layout); - - g_free (layout); -} -static void -on_session_activated (GdmSessionOptionWidget *widget, - GdmGreeterPanel *panel) -{ - - char *session; - - session = gdm_session_option_widget_get_current_session (GDM_SESSION_OPTION_WIDGET (panel->priv->session_option_widget)); - - if (session == NULL) { - return; - } - - g_signal_emit (panel, signals[SESSION_SELECTED], 0, session); - - g_free (session); -} - -static void on_animation_tick (GdmGreeterPanel *panel, double progress) { @@ -633,9 +753,10 @@ } static void -do_disconnect (void) +do_disconnect (GtkWidget *widget, + GdmGreeterPanel *panel) { - gtk_main_quit (); + g_signal_emit (panel, signals[DISCONNECTED], 0); } static gboolean @@ -643,9 +764,12 @@ { gboolean show; GError *error; + GConfClient *client; + + client = gconf_client_get_default (); error = NULL; - show = ! gconf_client_get_bool (panel->priv->client, KEY_DISABLE_RESTART_BUTTONS, &error); + show = ! gconf_client_get_bool (client, KEY_DISABLE_RESTART_BUTTONS, &error); if (error != NULL) { g_debug ("GdmGreeterPanel: unable to get disable-restart-buttons configuration: %s", error->message); g_error_free (error); @@ -666,70 +790,195 @@ } } #endif + g_object_unref (client); + return show; } -static void -position_shutdown_menu (GtkMenu *menu, - int *x, - int *y, - gboolean *push_in, - GdmGreeterPanel *panel) +static inline void +override_style (GtkWidget *widget) { - GtkRequisition menu_requisition; - GdkScreen *screen; - int monitor; - GtkAllocation shutdown_button_allocation; - gtk_widget_get_allocation (panel->priv->shutdown_button, &shutdown_button_allocation); - *push_in = TRUE; - - screen = gtk_widget_get_screen (GTK_WIDGET (panel)); - monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET (panel))); - gtk_menu_set_monitor (menu, monitor); + GtkCssProvider *provider; + GtkStyleContext *context; + GError *error; - gtk_widget_translate_coordinates (GTK_WIDGET (panel->priv->shutdown_button), - GTK_WIDGET (panel), - shutdown_button_allocation.x, - shutdown_button_allocation.y, - x, y); + g_debug ("updating style"); - gtk_window_get_position (GTK_WINDOW (panel), NULL, y); + context = gtk_widget_get_style_context (widget); - gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition); + provider = gtk_css_provider_new (); + gtk_style_context_add_provider (context, + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - *y -= menu_requisition.height; + error = NULL; + gtk_css_provider_load_from_data (provider, + "* {\n" + " background-color: black;\n" + " color: #ccc;\n" + " border-width: 0;\n" + "}\n" + "*:selected {\n" + " background-color: #666666;\n" + " color: white;\n" + "}\n" + ".menu,\n" + ".menubar,\n" + ".menu.check,\n" + ".menu.radio {\n" + " background-color: black;\n" + " color: #ccc;\n" + " border-style: none;\n" + "}\n" + ".menu:hover,\n" + ".menubar:hover,\n" + ".menu.check:hover,\n" + ".menu.radio:hover {\n" + " background-color: #666666;\n" + " color: #ccc;\n" + " border-style: none;\n" + "}\n" + "GtkLabel:selected {\n" + " background-color: black;\n" + " color: #ccc;\n" + "}\n" + "\n" + "GtkLabel:selected:focused {\n" + " background-color: black;\n" + " color: #ccc;\n" + "}\n" + "GtkMenuBar {\n" + " background-color: black;\n" + " background-image: none;\n" + " color: #ccc;\n" + " -GtkMenuBar-internal-padding: 0;\n" + " -GtkMenuBar-shadow-type: none;\n" + " border-width: 0;\n" + " border-style: none;\n" + "}\n" + "GtkMenuItem {\n" + " background-color: black;\n" + " color: #ccc;\n" + "}\n" + "GtkImage {\n" + " background-color: black;\n" + " color: #ccc;\n" + "}\n", + -1, + &error); + if (error != NULL) { + g_warning ("Error loading style data: %s", error->message); + g_error_free (error); + } } static void -on_shutdown_button_toggled (GdmGreeterPanel *panel) +add_shutdown_menu (GdmGreeterPanel *panel) { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button))) { - gtk_menu_popup (GTK_MENU (panel->priv->shutdown_menu), NULL, NULL, - (GtkMenuPositionFunc) position_shutdown_menu, - panel, 0, 0); - } else { - gtk_menu_popdown (GTK_MENU (panel->priv->shutdown_menu)); + GtkWidget *item; + GtkWidget *menu_item; + GtkWidget *box; + GtkWidget *image; + GIcon *gicon; + + item = gtk_menu_item_new (); + override_style (item); + box = gtk_hbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (item), box); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->status_menubar), item); + image = gtk_image_new (); + override_style (image); + + gicon = g_themed_icon_new_with_default_fallbacks ("system-shutdown-symbolic"); + gtk_image_set_from_gicon (GTK_IMAGE (image), gicon, GTK_ICON_SIZE_MENU); + g_object_unref (gicon); + + gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); + + panel->priv->shutdown_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), panel->priv->shutdown_menu); + + if (! panel->priv->display_is_local) { + menu_item = gtk_menu_item_new_with_label ("Disconnect"); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), panel); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); + } else if (get_show_restart_buttons (panel)) { + if (can_suspend ()) { + menu_item = gtk_menu_item_new_with_label (_("Suspend")); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); + } + + menu_item = gtk_menu_item_new_with_label (_("Restart")); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); + + menu_item = gtk_menu_item_new_with_label (_("Shut Down")); + g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); } + gtk_widget_show_all (item); } static void -on_shutdown_menu_deactivate (GdmGreeterPanel *panel) +add_battery_menu (GdmGreeterPanel *panel) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panel->priv->shutdown_button), - FALSE); + GtkWidget *item; + GtkWidget *box; + GtkWidget *menu; + GError *error; + GIcon *gicon; + + error = NULL; + panel->priv->power_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + GPM_DBUS_NAME, + GPM_DBUS_PATH, + GPM_DBUS_INTERFACE, + NULL, + &error); + if (panel->priv->power_proxy == NULL) { + g_warning ("Unable to connect to power manager: %s", error->message); + g_error_free (error); + return; + } + + item = gtk_menu_item_new (); + + override_style (item); + box = gtk_hbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (item), box); + gtk_menu_shell_prepend (GTK_MENU_SHELL (panel->priv->status_menubar), item); + panel->priv->power_image = gtk_image_new (); + override_style (panel->priv->power_image); + + gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-symbolic"); + gtk_image_set_from_gicon (GTK_IMAGE (panel->priv->power_image), gicon, GTK_ICON_SIZE_MENU); + g_object_unref (gicon); + + gtk_box_pack_start (GTK_BOX (box), panel->priv->power_image, FALSE, FALSE, 0); + + menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); + + panel->priv->power_menu_item = gtk_menu_item_new_with_label (_("Unknown time remaining")); + gtk_widget_set_sensitive (panel->priv->power_menu_item, FALSE); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), panel->priv->power_menu_item); + panel->priv->power_menubar_item = item; } static void setup_panel (GdmGreeterPanel *panel) { - NaTray *tray; - GtkWidget *spacer; - int padding; + GtkSizeGroup *sg; gdm_profile_start (NULL); gtk_widget_set_can_focus (GTK_WIDGET (panel), TRUE); + override_style (GTK_WIDGET (panel)); + panel->priv->geometry.x = -1; panel->priv->geometry.y = -1; panel->priv->geometry.width = -1; @@ -737,53 +986,48 @@ gtk_window_set_title (GTK_WINDOW (panel), _("Panel")); gtk_window_set_decorated (GTK_WINDOW (panel), FALSE); + gtk_window_set_has_resize_grip (GTK_WINDOW (panel), FALSE); gtk_window_set_keep_above (GTK_WINDOW (panel), TRUE); gtk_window_set_type_hint (GTK_WINDOW (panel), GDK_WINDOW_TYPE_HINT_DOCK); - gtk_window_set_opacity (GTK_WINDOW (panel), 0.85); panel->priv->hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (panel->priv->hbox), 0); gtk_widget_show (panel->priv->hbox); gtk_container_add (GTK_CONTAINER (panel), panel->priv->hbox); + panel->priv->left_hbox = gtk_hbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (panel->priv->left_hbox), 0); + gtk_widget_show (panel->priv->left_hbox); + gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->left_hbox, TRUE, TRUE, 0); + panel->priv->alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->alignment, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->alignment, FALSE, FALSE, 0); gtk_widget_show (panel->priv->alignment); - panel->priv->option_hbox = gtk_hbox_new (FALSE, 12); - gtk_widget_show (panel->priv->option_hbox); - gtk_container_add (GTK_CONTAINER (panel->priv->alignment), panel->priv->option_hbox); - - spacer = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), spacer, TRUE, TRUE, 6); - gtk_widget_show (spacer); - - panel->priv->client = gconf_client_get_default (); - - gdm_profile_start ("creating option widget"); - panel->priv->language_option_widget = gdm_language_option_widget_new (); - g_signal_connect (G_OBJECT (panel->priv->language_option_widget), - "language-activated", - G_CALLBACK (on_language_activated), panel); - gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), panel->priv->language_option_widget, FALSE, FALSE, 6); - gdm_profile_end ("creating option widget"); - - panel->priv->layout_option_widget = gdm_layout_option_widget_new (); - g_signal_connect (G_OBJECT (panel->priv->layout_option_widget), - "layout-activated", - G_CALLBACK (on_layout_activated), panel); - gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), panel->priv->layout_option_widget, FALSE, FALSE, 6); - - panel->priv->session_option_widget = gdm_session_option_widget_new (); - g_signal_connect (G_OBJECT (panel->priv->session_option_widget), - "session-activated", - G_CALLBACK (on_session_activated), panel); - gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), panel->priv->session_option_widget, FALSE, FALSE, 6); - - spacer = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (panel->priv->option_hbox), spacer, TRUE, TRUE, 6); - gtk_widget_show (spacer); + panel->priv->right_hbox = gtk_hbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (panel->priv->right_hbox), 0); + gtk_widget_show (panel->priv->right_hbox); + gtk_box_pack_start (GTK_BOX (panel->priv->hbox), panel->priv->right_hbox, TRUE, TRUE, 0); + + panel->priv->clock = gdm_clock_widget_new (); + gtk_widget_show (panel->priv->clock); + gtk_container_add (GTK_CONTAINER (panel->priv->alignment), panel->priv->clock); + + sg = gtk_size_group_new (GTK_SIZE_GROUP_BOTH); + gtk_size_group_add_widget (sg, panel->priv->left_hbox); + gtk_size_group_add_widget (sg, panel->priv->right_hbox); + + panel->priv->status_menubar = gtk_menu_bar_new (); + override_style (panel->priv->status_menubar); + gtk_widget_show (panel->priv->status_menubar); + gtk_box_pack_end (GTK_BOX (panel->priv->right_hbox), GTK_WIDGET (panel->priv->status_menubar), FALSE, FALSE, 0); + + if (!panel->priv->display_is_local || get_show_restart_buttons (panel)) { + add_shutdown_menu (panel); + } + + add_battery_menu (panel); /* FIXME: we should only show hostname on panel when connected to a remote host */ @@ -793,68 +1037,6 @@ gtk_widget_show (panel->priv->hostname_label); } - if (!panel->priv->display_is_local || get_show_restart_buttons (panel)) { - GtkWidget *menu_item; - GtkWidget *image; - - panel->priv->shutdown_button = gtk_toggle_button_new (); - - gtk_widget_set_tooltip_text (panel->priv->shutdown_button, - _("Shutdown Options…")); - gtk_button_set_relief (GTK_BUTTON (panel->priv->shutdown_button), - GTK_RELIEF_NONE); - - panel->priv->shutdown_menu = gtk_menu_new (); - gtk_menu_attach_to_widget (GTK_MENU (panel->priv->shutdown_menu), - panel->priv->shutdown_button, NULL); - g_signal_connect_swapped (panel->priv->shutdown_button, "toggled", - G_CALLBACK (on_shutdown_button_toggled), panel); - g_signal_connect_swapped (panel->priv->shutdown_menu, "deactivate", - G_CALLBACK (on_shutdown_menu_deactivate), panel); - - image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_container_add (GTK_CONTAINER (panel->priv->shutdown_button), image); - - if (! panel->priv->display_is_local) { - menu_item = gtk_menu_item_new_with_label ("Disconnect"); - g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_disconnect), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - } else if (get_show_restart_buttons (panel)) { - if (can_suspend ()) { - menu_item = gtk_menu_item_new_with_label (_("Suspend")); - g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_suspend), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - } - - menu_item = gtk_menu_item_new_with_label (_("Restart")); - g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_restart), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - - menu_item = gtk_menu_item_new_with_label (_("Shut Down")); - g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (do_system_stop), NULL); - gtk_menu_shell_append (GTK_MENU_SHELL (panel->priv->shutdown_menu), menu_item); - } - - gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (panel->priv->shutdown_button), FALSE, FALSE, 0); - gtk_widget_show_all (panel->priv->shutdown_menu); - gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button)); - } - - panel->priv->clock = gdm_clock_widget_new (); - gtk_box_pack_end (GTK_BOX (panel->priv->hbox), - GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6); - gtk_widget_show (panel->priv->clock); - - tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)), - GTK_ORIENTATION_HORIZONTAL); - - padding = gconf_client_get_int (panel->priv->client, KEY_NOTIFICATION_AREA_PADDING, NULL); - na_tray_set_padding (tray, padding); - gtk_box_pack_end (GTK_BOX (panel->priv->hbox), GTK_WIDGET (tray), FALSE, FALSE, 6); - gtk_widget_show (GTK_WIDGET (tray)); - gdm_greeter_panel_hide_user_options (panel); - panel->priv->progress = 0.0; panel->priv->animation_timer = gdm_timer_new (); g_signal_connect_swapped (panel->priv->animation_timer, @@ -907,10 +1089,6 @@ g_signal_handlers_disconnect_by_func (object, on_animation_tick, greeter_panel); g_object_unref (greeter_panel->priv->animation_timer); - if (greeter_panel->priv->client != NULL) { - g_object_unref (greeter_panel->priv->client); - } - G_OBJECT_CLASS (gdm_greeter_panel_parent_class)->finalize (object); } @@ -928,43 +1106,11 @@ widget_class->realize = gdm_greeter_panel_real_realize; widget_class->unrealize = gdm_greeter_panel_real_unrealize; - widget_class->size_request = gdm_greeter_panel_real_size_request; + widget_class->get_preferred_width = gdm_greeter_panel_real_get_preferred_width; + widget_class->get_preferred_height = gdm_greeter_panel_real_get_preferred_height; widget_class->show = gdm_greeter_panel_real_show; widget_class->hide = gdm_greeter_panel_real_hide; - signals[LANGUAGE_SELECTED] = - g_signal_new ("language-selected", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmGreeterPanelClass, language_selected), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, G_TYPE_STRING); - - signals[LAYOUT_SELECTED] = - g_signal_new ("layout-selected", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmGreeterPanelClass, layout_selected), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, G_TYPE_STRING); - - signals[SESSION_SELECTED] = - g_signal_new ("session-selected", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmGreeterPanelClass, session_selected), - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, G_TYPE_STRING); - g_object_class_install_property (object_class, PROP_MONITOR, g_param_spec_int ("monitor", @@ -982,6 +1128,17 @@ FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + signals [DISCONNECTED] = + g_signal_new ("disconnected", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdmGreeterPanelClass, disconnected), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + g_type_class_add_private (klass, sizeof (GdmGreeterPanelPrivate)); } @@ -1000,121 +1157,3 @@ return GTK_WIDGET (object); } - -void -gdm_greeter_panel_show_user_options (GdmGreeterPanel *panel) -{ - gtk_widget_show (panel->priv->session_option_widget); - gtk_widget_show (panel->priv->language_option_widget); - gtk_widget_show (panel->priv->layout_option_widget); -} - -void -gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel) -{ - gtk_widget_hide (panel->priv->session_option_widget); - gtk_widget_hide (panel->priv->language_option_widget); - gtk_widget_hide (panel->priv->layout_option_widget); - - g_debug ("GdmGreeterPanel: activating default layout"); - gdm_layout_activate (NULL); -} - -void -gdm_greeter_panel_reset (GdmGreeterPanel *panel) -{ - gdm_greeter_panel_set_keyboard_layout (panel, NULL); - gdm_greeter_panel_set_default_language_name (panel, NULL); - gdm_greeter_panel_set_default_session_name (panel, NULL); - gdm_greeter_panel_hide_user_options (panel); -} - -void -gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel, - const char *language_name) -{ - char *normalized_language_name; - - g_return_if_fail (GDM_IS_GREETER_PANEL (panel)); - - if (language_name != NULL) { - normalized_language_name = gdm_normalize_language_name (language_name); - } else { - normalized_language_name = NULL; - } - - if (normalized_language_name != NULL && - !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (panel->priv->language_option_widget), - normalized_language_name, NULL, NULL, NULL)) { - gdm_recent_option_widget_add_item (GDM_RECENT_OPTION_WIDGET (panel->priv->language_option_widget), - normalized_language_name); - } - - gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (panel->priv->language_option_widget), - normalized_language_name); - - g_free (normalized_language_name); -} - -void -gdm_greeter_panel_set_keyboard_layout (GdmGreeterPanel *panel, - const char *layout_name) -{ -#ifdef HAVE_LIBXKLAVIER - g_return_if_fail (GDM_IS_GREETER_PANEL (panel)); - - if (layout_name != NULL && - !gdm_layout_is_valid (layout_name)) { - const char *default_layout; - - default_layout = gdm_layout_get_default_layout (); - - g_debug ("GdmGreeterPanel: default layout %s is invalid, resetting to: %s", - layout_name, default_layout ? default_layout : "null"); - - g_signal_emit (panel, signals[LAYOUT_SELECTED], 0, default_layout); - - layout_name = default_layout; - } - - if (layout_name != NULL && - !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (panel->priv->layout_option_widget), - layout_name, NULL, NULL, NULL)) { - gdm_recent_option_widget_add_item (GDM_RECENT_OPTION_WIDGET (panel->priv->layout_option_widget), - layout_name); - } - - gdm_option_widget_set_active_item (GDM_OPTION_WIDGET (panel->priv->layout_option_widget), - layout_name); - gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (panel->priv->layout_option_widget), - layout_name); - - g_debug ("GdmGreeterPanel: activating layout: %s", layout_name); - gdm_layout_activate (layout_name); -#endif -} - -void -gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel, - const char *session_name) -{ - g_return_if_fail (GDM_IS_GREETER_PANEL (panel)); - - if (session_name != NULL && - !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (panel->priv->session_option_widget), - session_name, NULL, NULL, NULL)) { - if (strcmp (session_name, GDM_CUSTOM_SESSION) == 0) { - gdm_option_widget_add_item (GDM_OPTION_WIDGET (panel->priv->session_option_widget), - GDM_CUSTOM_SESSION, - C_("customsession", "Custom"), - _("Custom session"), - GDM_OPTION_WIDGET_POSITION_TOP); - } else { - g_warning ("Default session is not available"); - return; - } - } - - gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (panel->priv->session_option_widget), - session_name); -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.h gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.h --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-panel.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-panel.h 2011-04-04 14:37:16.000000000 +0000 @@ -48,11 +48,9 @@ void (* language_selected) (GdmGreeterPanel *panel, const char *text); - void (* layout_selected) (GdmGreeterPanel *panel, - const char *text); - void (* session_selected) (GdmGreeterPanel *panel, const char *text); + void (* disconnected) (GdmGreeterPanel *panel); } GdmGreeterPanelClass; GType gdm_greeter_panel_get_type (void); @@ -64,8 +62,6 @@ void gdm_greeter_panel_show_user_options (GdmGreeterPanel *panel); void gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel); void gdm_greeter_panel_reset (GdmGreeterPanel *panel); -void gdm_greeter_panel_set_keyboard_layout (GdmGreeterPanel *panel, - const char *layout_name); void gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel, const char *language_name); diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c gdm-3.0.0/gui/simple-greeter/gdm-greeter-session.c --- gdm-2.32.1/gui/simple-greeter/gdm-greeter-session.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-greeter-session.c 2011-04-04 14:37:16.000000000 +0000 @@ -104,7 +104,6 @@ session->priv->num_tries = 0; - gdm_greeter_panel_reset (GDM_GREETER_PANEL (session->priv->panel)); gdm_greeter_login_window_reset (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window)); } @@ -126,7 +125,6 @@ session->priv->num_tries - 1); session->priv->num_tries = 0; - gdm_greeter_panel_reset (GDM_GREETER_PANEL (session->priv->panel)); gdm_greeter_login_window_reset (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window)); } } @@ -136,9 +134,9 @@ const char *username) { if (username != NULL && strcmp (username, GDM_USER_CHOOSER_USER_OTHER) != 0) { - gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (session->priv->panel)); + //gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (session->priv->panel)); } else { - gdm_greeter_panel_hide_user_options (GDM_GREETER_PANEL (session->priv->panel)); + //gdm_greeter_panel_hide_user_options (GDM_GREETER_PANEL (session->priv->panel)); } } @@ -157,18 +155,6 @@ GdmGreeterSession *session) { g_debug ("GdmGreeterSession: default language name changed: %s", text); - gdm_greeter_panel_set_default_language_name (GDM_GREETER_PANEL (session->priv->panel), - text); -} - -static void -on_default_layout_name_changed (GdmGreeterClient *client, - const char *text, - GdmGreeterSession *session) -{ - g_debug ("GdmGreeterSession: default layout name changed: %s", text); - gdm_greeter_panel_set_keyboard_layout (GDM_GREETER_PANEL (session->priv->panel), - text); } static void @@ -177,8 +163,7 @@ GdmGreeterSession *session) { g_debug ("GdmGreeterSession: default session name changed: %s", text); - gdm_greeter_panel_set_default_session_name (GDM_GREETER_PANEL (session->priv->panel), - text); + gdm_greeter_login_window_set_default_session_name (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); } static void @@ -254,8 +239,9 @@ } static void -on_select_session (GdmGreeterSession *session, - const char *text) +on_select_session (GdmGreeterLoginWindow *login_window, + const char *text, + GdmGreeterSession *session) { gdm_greeter_client_call_select_session (session->priv->client, text); @@ -270,14 +256,6 @@ } static void -on_select_layout (GdmGreeterSession *session, - const char *text) -{ - gdm_greeter_client_call_select_layout (session->priv->client, - text); -} - -static void on_select_user (GdmGreeterLoginWindow *login_window, const char *text, GdmGreeterSession *session) @@ -291,13 +269,11 @@ on_cancelled (GdmGreeterLoginWindow *login_window, GdmGreeterSession *session) { - gdm_greeter_panel_hide_user_options (GDM_GREETER_PANEL (session->priv->panel)); gdm_greeter_client_call_cancel (session->priv->client); } static void -on_disconnected (GdmGreeterLoginWindow *login_window, - GdmGreeterSession *session) +on_disconnected (GdmGreeterSession *session) { gdm_greeter_client_call_disconnect (session->priv->client); } @@ -314,8 +290,8 @@ int x, int y) { - GdkRectangle area; - GdkRegion *region; + cairo_rectangle_int_t area; + cairo_region_t *region; int i; int monitor; int n_monitors; @@ -326,15 +302,15 @@ monitor = -1; for (i = 0; i < n_monitors; i++) { gdk_screen_get_monitor_geometry (screen, i, &area); - region = gdk_region_rectangle (&area); + region = cairo_region_create_rectangle (&area); - if (gdk_region_point_in (region, x, y)) { + if (cairo_region_contains_point (region, x, y)) { if (area.height > tallest_height) { monitor = i; tallest_height = area.height; } } - gdk_region_destroy (region); + cairo_region_destroy (region); } if (monitor == -1) { @@ -366,18 +342,8 @@ session->priv->panel = gdm_greeter_panel_new (screen, monitor, is_local); g_signal_connect_swapped (session->priv->panel, - "language-selected", - G_CALLBACK (on_select_language), - session); - - g_signal_connect_swapped (session->priv->panel, - "layout-selected", - G_CALLBACK (on_select_layout), - session); - - g_signal_connect_swapped (session->priv->panel, - "session-selected", - G_CALLBACK (on_select_session), + "disconnected", + G_CALLBACK (on_disconnected), session); gtk_widget_show (session->priv->panel); @@ -423,12 +389,12 @@ G_CALLBACK (on_select_user), session); g_signal_connect (session->priv->login_window, - "cancelled", - G_CALLBACK (on_cancelled), + "session-selected", + G_CALLBACK (on_select_session), session); g_signal_connect (session->priv->login_window, - "disconnected", - G_CALLBACK (on_disconnected), + "cancelled", + G_CALLBACK (on_cancelled), session); g_signal_connect (session->priv->login_window, "start-session", @@ -610,10 +576,6 @@ G_CALLBACK (on_default_language_name_changed), session); g_signal_connect (session->priv->client, - "default-layout-name-changed", - G_CALLBACK (on_default_layout_name_changed), - session); - g_signal_connect (session->priv->client, "default-session-name-changed", G_CALLBACK (on_default_session_name_changed), session); diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-language-chooser-dialog.c gdm-3.0.0/gui/simple-greeter/gdm-language-chooser-dialog.c --- gdm-2.32.1/gui/simple-greeter/gdm-language-chooser-dialog.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-language-chooser-dialog.c 2011-04-04 14:37:16.000000000 +0000 @@ -72,28 +72,79 @@ } static void -gdm_language_chooser_dialog_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - int screen_w; - int screen_h; - GtkRequisition child_requisition; +gdm_language_chooser_dialog_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + GtkWidget *child; + int min_size, nat_size; + int screen_w; + + /* FIXME: this should use monitor size */ + screen_w = gdk_screen_get_width (gtk_widget_get_screen (widget)); + + child = gtk_bin_get_child (GTK_BIN (widget)); + + min_size = 0; + nat_size = 0; - if (GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->size_request) { - GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->size_request (widget, requisition); + if (GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->get_preferred_width) { + GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->get_preferred_width (widget, &min_size, &nat_size); } - screen_w = gdk_screen_get_width (gtk_widget_get_screen (widget)); - screen_h = gdk_screen_get_height (gtk_widget_get_screen (widget)); + if (child && gtk_widget_get_visible (child)) { + gtk_widget_get_preferred_width (child, + &min_size, + &nat_size); + } + + min_size += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + min_size = MIN (min_size, .50 * screen_w); + nat_size += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + nat_size = MIN (nat_size, .50 * screen_w); + + if (minimum_size) + *minimum_size = min_size; + if (natural_size) + *natural_size = nat_size; +} + +static void +gdm_language_chooser_dialog_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + GtkWidget *child; + int min_size, nat_size; + int screen_w; + + /* FIXME: this should use monitor size */ + screen_w = gdk_screen_get_height (gtk_widget_get_screen (widget)); - gtk_widget_get_child_requisition (gtk_bin_get_child (GTK_BIN (widget)), &child_requisition); - *requisition = child_requisition; + child = gtk_bin_get_child (GTK_BIN (widget)); - requisition->width += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->height += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + min_size = 0; + nat_size = 0; + + if (GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->get_preferred_height) { + GTK_WIDGET_CLASS (gdm_language_chooser_dialog_parent_class)->get_preferred_height (widget, &min_size, &nat_size); + } + + if (child && gtk_widget_get_visible (child)) { + gtk_widget_get_preferred_height (child, + &min_size, + &nat_size); + } - requisition->width = MIN (requisition->width, .50 * screen_w); - requisition->height = MIN (requisition->height, .80 * screen_h); + min_size += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + min_size = MIN (min_size, .50 * screen_w); + nat_size += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + nat_size = MIN (nat_size, .50 * screen_w); + + if (minimum_size) + *minimum_size = min_size; + if (natural_size) + *natural_size = nat_size; } static void @@ -126,7 +177,8 @@ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); object_class->finalize = gdm_language_chooser_dialog_finalize; - widget_class->size_request = gdm_language_chooser_dialog_size_request; + widget_class->get_preferred_width = gdm_language_chooser_dialog_get_preferred_width; + widget_class->get_preferred_height = gdm_language_chooser_dialog_get_preferred_height; widget_class->realize = gdm_language_chooser_dialog_realize; g_type_class_add_private (klass, sizeof (GdmLanguageChooserDialogPrivate)); @@ -168,7 +220,6 @@ GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); gtk_container_set_border_width (GTK_CONTAINER (dialog->priv->chooser_widget), 5); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-languages.c gdm-3.0.0/gui/simple-greeter/gdm-languages.c --- gdm-2.32.1/gui/simple-greeter/gdm-languages.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-languages.c 2011-04-04 14:37:16.000000000 +0000 @@ -47,6 +47,7 @@ #define ALIASES_FILE DATADIR "/gdm/locale.alias" #define ARCHIVE_FILE LIBLOCALEDIR "/locale-archive" +#define SYSTEM_ARCHIVE_FILE "/usr/lib/locale/locale-archive" #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes" #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale" @@ -115,7 +116,7 @@ * locale names are of the form: * [language[_territory][.codeset][@modifier]] */ -void +gboolean gdm_parse_language_name (const char *name, char **language_codep, char **territory_codep, @@ -128,8 +129,10 @@ GError *error; gchar *normalized_codeset = NULL; gchar *normalized_name = NULL; + gboolean retval; match_info = NULL; + retval = FALSE; error = NULL; re = g_regex_new ("^(?P[^_.@[:space:]]+)" @@ -154,6 +157,8 @@ goto out; } + retval = TRUE; + if (language_codep != NULL) { *language_codep = g_match_info_fetch_named (match_info, "language"); } @@ -207,6 +212,8 @@ out: g_match_info_free (match_info); g_regex_unref (re); + + return retval; } static char * @@ -458,9 +465,13 @@ error = NULL; mapped = g_mapped_file_new (ARCHIVE_FILE, FALSE, &error); if (mapped == NULL) { - g_warning ("Mapping failed for %s: %s", ARCHIVE_FILE, error->message); + mapped = g_mapped_file_new (SYSTEM_ARCHIVE_FILE, FALSE, NULL); + if (mapped == NULL) { + g_warning ("Mapping failed for %s: %s", ARCHIVE_FILE, error->message); + g_error_free (error); + return FALSE; + } g_error_free (error); - return FALSE; } locales_collected = FALSE; @@ -770,15 +781,18 @@ const char *ccode_longB; const char *ccode_longT; const char *ccode; + const char *ccode_id; const char *lang_name; - if (! g_str_equal (element_name, "iso_639_entry") || attr_names == NULL || attr_values == NULL) { + if (! (g_str_equal (element_name, "iso_639_entry") || g_str_equal (element_name, "iso_639_3_entry")) + || attr_names == NULL || attr_values == NULL) { return; } ccode = NULL; ccode_longB = NULL; ccode_longT = NULL; + ccode_id = NULL; lang_name = NULL; while (*attr_names && *attr_values) { @@ -806,6 +820,15 @@ } ccode_longT = *attr_values; } + } else if (g_str_equal (*attr_names, "id")) { + /* skip if empty */ + if (**attr_values) { + if (strlen (*attr_values) != 2 && + strlen (*attr_values) != 3) { + return; + } + ccode_id = *attr_values; + } } else if (g_str_equal (*attr_names, "name")) { lang_name = *attr_values; } @@ -833,6 +856,11 @@ g_strdup (ccode_longT), g_strdup (lang_name)); } + if (ccode_id != NULL) { + g_hash_table_insert (gdm_languages_map, + g_strdup (ccode_id), + g_strdup (lang_name)); + } } static void @@ -923,20 +951,20 @@ } static void -languages_init (void) +languages_variant_init (const char *variant) { GError *error; gboolean res; char *buf; gsize buf_len; + char *filename; - bindtextdomain ("iso_639", ISO_CODES_LOCALESDIR); - bind_textdomain_codeset ("iso_639", "UTF-8"); - - gdm_languages_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + bindtextdomain (variant, ISO_CODES_LOCALESDIR); + bind_textdomain_codeset (variant, "UTF-8"); error = NULL; - res = g_file_get_contents (ISO_CODES_DATADIR "/iso_639.xml", + filename = g_strdup_printf (ISO_CODES_DATADIR "/%s.xml", variant); + res = g_file_get_contents (filename, &buf, &buf_len, &error); @@ -951,22 +979,32 @@ if (! res) { g_warning ("Failed to parse '%s': %s\n", - ISO_CODES_DATADIR "/iso_639.xml", + filename, error->message); g_error_free (error); + g_free (filename); } g_markup_parse_context_free (ctx); g_free (buf); } else { g_warning ("Failed to load '%s': %s\n", - ISO_CODES_DATADIR "/iso_639.xml", + filename, error->message); g_error_free (error); } } static void +languages_init (void) +{ + gdm_languages_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + languages_variant_init ("iso_639"); + languages_variant_init ("iso_639_3"); +} + +static void territories_init (void) { GError *error; diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-languages.h gdm-3.0.0/gui/simple-greeter/gdm-languages.h --- gdm-2.32.1/gui/simple-greeter/gdm-languages.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-languages.h 2011-04-04 14:37:16.000000000 +0000 @@ -29,7 +29,7 @@ char * gdm_get_language_from_name (const char *name, const char *locale); char ** gdm_get_all_language_names (void); -void gdm_parse_language_name (const char *name, +gboolean gdm_parse_language_name (const char *name, char **language_codep, char **territory_codep, char **codesetp, diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-dialog.c gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-dialog.c --- gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-dialog.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Matthias Clasen - * - * 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. - * - */ - -#include "config.h" - -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "gdm-layout-chooser-widget.h" -#include "gdm-layout-chooser-dialog.h" - -#define GDM_LAYOUT_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAYOUT_CHOOSER_DIALOG, GdmLayoutChooserDialogPrivate)) - -struct GdmLayoutChooserDialogPrivate -{ - GtkWidget *chooser_widget; -}; - - -static void gdm_layout_chooser_dialog_class_init (GdmLayoutChooserDialogClass *klass); -static void gdm_layout_chooser_dialog_init (GdmLayoutChooserDialog *layout_chooser_dialog); -static void gdm_layout_chooser_dialog_finalize (GObject *object); - -G_DEFINE_TYPE (GdmLayoutChooserDialog, gdm_layout_chooser_dialog, GTK_TYPE_DIALOG) - -char * -gdm_layout_chooser_dialog_get_current_layout_name (GdmLayoutChooserDialog *dialog) -{ - char *layout_name; - - g_return_val_if_fail (GDM_IS_LAYOUT_CHOOSER_DIALOG (dialog), NULL); - - layout_name = gdm_layout_chooser_widget_get_current_layout_name (GDM_LAYOUT_CHOOSER_WIDGET (dialog->priv->chooser_widget)); - - return layout_name; -} - -void -gdm_layout_chooser_dialog_set_current_layout_name (GdmLayoutChooserDialog *dialog, - const char *layout_name) -{ - - g_return_if_fail (GDM_IS_LAYOUT_CHOOSER_DIALOG (dialog)); - - gdm_layout_chooser_widget_set_current_layout_name (GDM_LAYOUT_CHOOSER_WIDGET (dialog->priv->chooser_widget), layout_name); -} - -static void -gdm_layout_chooser_dialog_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - int screen_w; - int screen_h; - GtkRequisition child_requisition; - - if (GTK_WIDGET_CLASS (gdm_layout_chooser_dialog_parent_class)->size_request) { - GTK_WIDGET_CLASS (gdm_layout_chooser_dialog_parent_class)->size_request (widget, requisition); - } - - screen_w = gdk_screen_get_width (gtk_widget_get_screen (widget)); - screen_h = gdk_screen_get_height (gtk_widget_get_screen (widget)); - - gtk_widget_get_child_requisition (gtk_bin_get_child (GTK_BIN (widget)), &child_requisition); - *requisition = child_requisition; - - requisition->width += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->height += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - - requisition->width = MIN (requisition->width, .50 * screen_w); - requisition->height = MIN (requisition->height, .80 * screen_h); -} - -static void -gdm_layout_chooser_dialog_realize (GtkWidget *widget) -{ - GdmLayoutChooserDialog *chooser_dialog; - - chooser_dialog = GDM_LAYOUT_CHOOSER_DIALOG (widget); - - gtk_widget_show (chooser_dialog->priv->chooser_widget); - - GTK_WIDGET_CLASS (gdm_layout_chooser_dialog_parent_class)->realize (widget); -} - -static void -gdm_layout_chooser_dialog_class_init (GdmLayoutChooserDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->finalize = gdm_layout_chooser_dialog_finalize; - widget_class->size_request = gdm_layout_chooser_dialog_size_request; - widget_class->realize = gdm_layout_chooser_dialog_realize; - - g_type_class_add_private (klass, sizeof (GdmLayoutChooserDialogPrivate)); -} - -static gboolean -respond (GdmLayoutChooserDialog *dialog) -{ - gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - - return FALSE; -} - -static void -queue_response (GdmLayoutChooserDialog *dialog) -{ - g_idle_add ((GSourceFunc) respond, dialog); -} - -static void -gdm_layout_chooser_dialog_init (GdmLayoutChooserDialog *dialog) -{ - - dialog->priv = GDM_LAYOUT_CHOOSER_DIALOG_GET_PRIVATE (dialog); - - dialog->priv->chooser_widget = gdm_layout_chooser_widget_new (); - gdm_chooser_widget_set_hide_inactive_items (GDM_CHOOSER_WIDGET (dialog->priv->chooser_widget), - FALSE); - - gdm_layout_chooser_widget_set_current_layout_name (GDM_LAYOUT_CHOOSER_WIDGET (dialog->priv->chooser_widget), - setlocale (LC_MESSAGES, NULL)); - gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), dialog->priv->chooser_widget); - - g_signal_connect_swapped (G_OBJECT (dialog->priv->chooser_widget), - "activated", G_CALLBACK (queue_response), - dialog); - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, - NULL); - - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); - gtk_container_set_border_width (GTK_CONTAINER (dialog->priv->chooser_widget), 5); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); - gtk_window_set_default_size (GTK_WINDOW (dialog), 512, 440); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); -} - -static void -gdm_layout_chooser_dialog_finalize (GObject *object) -{ - GdmLayoutChooserDialog *layout_chooser_dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GDM_IS_LAYOUT_CHOOSER_DIALOG (object)); - - layout_chooser_dialog = GDM_LAYOUT_CHOOSER_DIALOG (object); - - g_return_if_fail (layout_chooser_dialog->priv != NULL); - - G_OBJECT_CLASS (gdm_layout_chooser_dialog_parent_class)->finalize (object); -} - -GtkWidget * -gdm_layout_chooser_dialog_new (void) -{ - GObject *object; - - object = g_object_new (GDM_TYPE_LAYOUT_CHOOSER_DIALOG, - "icon-name", "preferences-desktop-keyboard", - "title", _("Keyboard layouts"), - "border-width", 8, - "modal", TRUE, - NULL); - - return GTK_WIDGET (object); -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-dialog.h gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-dialog.h --- gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-dialog.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Matthias Clasen - * - * 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. - * - */ - -#ifndef __GDM_LAYOUT_CHOOSER_DIALOG_H -#define __GDM_LAYOUT_CHOOSER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define GDM_TYPE_LAYOUT_CHOOSER_DIALOG (gdm_layout_chooser_dialog_get_type ()) -#define GDM_LAYOUT_CHOOSER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_LAYOUT_CHOOSER_DIALOG, GdmLayoutChooserDialog)) -#define GDM_LAYOUT_CHOOSER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_LAYOUT_CHOOSER_DIALOG, GdmLayoutChooserDialogClass)) -#define GDM_IS_LAYOUT_CHOOSER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_LAYOUT_CHOOSER_DIALOG)) -#define GDM_IS_LAYOUT_CHOOSER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_LAYOUT_CHOOSER_DIALOG)) -#define GDM_LAYOUT_CHOOSER_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_LAYOUT_CHOOSER_DIALOG, GdmLayoutChooserDialogClass)) - -typedef struct GdmLayoutChooserDialogPrivate GdmLayoutChooserDialogPrivate; - -typedef struct -{ - GtkDialog parent; - GdmLayoutChooserDialogPrivate *priv; -} GdmLayoutChooserDialog; - -typedef struct -{ - GtkDialogClass parent_class; -} GdmLayoutChooserDialogClass; - -GType gdm_layout_chooser_dialog_get_type (void); - -GtkWidget * gdm_layout_chooser_dialog_new (void); - -char * gdm_layout_chooser_dialog_get_current_layout_name (GdmLayoutChooserDialog *dialog); -void gdm_layout_chooser_dialog_set_current_layout_name (GdmLayoutChooserDialog *dialog, - const char *layout_name); - -G_END_DECLS - -#endif /* __GDM_LAYOUT_CHOOSER_DIALOG_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-widget.c gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-widget.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Matthias Clasen - * - * 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. - * - */ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "gdm-layout-chooser-widget.h" -#include "gdm-chooser-widget.h" -#include "gdm-layouts.h" - -#define GDM_LAYOUT_CHOOSER_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAYOUT_CHOOSER_WIDGET, GdmLayoutChooserWidgetPrivate)) - -struct GdmLayoutChooserWidgetPrivate -{ - guint layouts_added : 1; -}; - -static void gdm_layout_chooser_widget_class_init (GdmLayoutChooserWidgetClass *klass); -static void gdm_layout_chooser_widget_init (GdmLayoutChooserWidget *layout_chooser_widget); -static void gdm_layout_chooser_widget_finalize (GObject *object); - -G_DEFINE_TYPE (GdmLayoutChooserWidget, gdm_layout_chooser_widget, GDM_TYPE_CHOOSER_WIDGET) - -enum { - CHOOSER_LIST_TITLE_COLUMN = 0, - CHOOSER_LIST_TRANSLATED_COLUMN, - CHOOSER_LIST_LOCALE_COLUMN -}; - -char * -gdm_layout_chooser_widget_get_current_layout_name (GdmLayoutChooserWidget *widget) -{ - char *id; - - g_return_val_if_fail (GDM_IS_LAYOUT_CHOOSER_WIDGET (widget), NULL); - - id = gdm_chooser_widget_get_selected_item (GDM_CHOOSER_WIDGET (widget)); - - if (id == NULL) { - id = g_strdup ("us"); - } - - return id; -} - -void -gdm_layout_chooser_widget_set_current_layout_name (GdmLayoutChooserWidget *widget, - const char *id) -{ - g_return_if_fail (GDM_IS_LAYOUT_CHOOSER_WIDGET (widget)); - - if (id == NULL) { - gdm_chooser_widget_set_selected_item (GDM_CHOOSER_WIDGET (widget), - NULL); - return; - } - - gdm_chooser_widget_set_selected_item (GDM_CHOOSER_WIDGET (widget), id); -} - -static void -gdm_layout_chooser_widget_add_layout (GdmLayoutChooserWidget *widget, - const char *name) -{ - char *layout; - char *escaped; - - layout = gdm_get_layout_from_name (name); - - if (layout != NULL) { - escaped = g_markup_escape_text (layout, -1); - gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget), - name, - NULL, - escaped, - NULL, - 0, - FALSE, - FALSE, - NULL, - NULL); - g_free (escaped); - g_free (layout); - } -} - -static void -add_available_layouts (GdmLayoutChooserWidget *widget) -{ - char **layout_names; - int i; - - layout_names = gdm_get_all_layout_names (); - - if (layout_names == NULL) - return; - - for (i = 0; layout_names[i] != NULL; i++) { - gdm_layout_chooser_widget_add_layout (widget, - layout_names[i]); - } - - g_strfreev (layout_names); -} - -static void -gdm_layout_chooser_widget_dispose (GObject *object) -{ - G_OBJECT_CLASS (gdm_layout_chooser_widget_parent_class)->dispose (object); -} - -static void -gdm_layout_chooser_widget_realize (GtkWidget *widget) -{ - GdmLayoutChooserWidget *chooser; - - chooser = GDM_LAYOUT_CHOOSER_WIDGET (widget); - - GTK_WIDGET_CLASS (gdm_layout_chooser_widget_parent_class)->realize (widget); - - if (!chooser->priv->layouts_added) { - add_available_layouts (chooser); - chooser->priv->layouts_added = TRUE; - } -} - -static void -gdm_layout_chooser_widget_class_init (GdmLayoutChooserWidgetClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->dispose = gdm_layout_chooser_widget_dispose; - object_class->finalize = gdm_layout_chooser_widget_finalize; - widget_class->realize = gdm_layout_chooser_widget_realize; - - g_type_class_add_private (klass, sizeof (GdmLayoutChooserWidgetPrivate)); -} - -static void -gdm_layout_chooser_widget_init (GdmLayoutChooserWidget *widget) -{ - widget->priv = GDM_LAYOUT_CHOOSER_WIDGET_GET_PRIVATE (widget); - - gdm_chooser_widget_set_separator_position (GDM_CHOOSER_WIDGET (widget), - GDM_CHOOSER_WIDGET_POSITION_TOP); -} - -static void -gdm_layout_chooser_widget_finalize (GObject *object) -{ - GdmLayoutChooserWidget *layout_chooser_widget; - - g_return_if_fail (object != NULL); - g_return_if_fail (GDM_IS_LAYOUT_CHOOSER_WIDGET (object)); - - layout_chooser_widget = GDM_LAYOUT_CHOOSER_WIDGET (object); - - g_return_if_fail (layout_chooser_widget->priv != NULL); - - G_OBJECT_CLASS (gdm_layout_chooser_widget_parent_class)->finalize (object); -} - -GtkWidget * -gdm_layout_chooser_widget_new (void) -{ - GObject *object; - - object = g_object_new (GDM_TYPE_LAYOUT_CHOOSER_WIDGET, - "inactive-text", _("_Keyboard:"), - "active-text", _("_Keyboard:"), - NULL); - - return GTK_WIDGET (object); -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-widget.h gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-widget.h --- gdm-2.32.1/gui/simple-greeter/gdm-layout-chooser-widget.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-chooser-widget.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Matthias Clasen - * - * 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. - * - */ - -#ifndef __GDM_LAYOUT_CHOOSER_WIDGET_H -#define __GDM_LAYOUT_CHOOSER_WIDGET_H - -#include -#include "gdm-chooser-widget.h" - -G_BEGIN_DECLS - -#define GDM_TYPE_LAYOUT_CHOOSER_WIDGET (gdm_layout_chooser_widget_get_type ()) -#define GDM_LAYOUT_CHOOSER_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_LAYOUT_CHOOSER_WIDGET, GdmLayoutChooserWidget)) -#define GDM_LAYOUT_CHOOSER_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_LAYOUT_CHOOSER_WIDGET, GdmLayoutChooserWidgetClass)) -#define GDM_IS_LAYOUT_CHOOSER_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_LAYOUT_CHOOSER_WIDGET)) -#define GDM_IS_LAYOUT_CHOOSER_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_LAYOUT_CHOOSER_WIDGET)) -#define GDM_LAYOUT_CHOOSER_WIDGET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_LAYOUT_CHOOSER_WIDGET, GdmLayoutChooserWidgetClass)) - -typedef struct GdmLayoutChooserWidgetPrivate GdmLayoutChooserWidgetPrivate; - -typedef struct -{ - GdmChooserWidget parent; - GdmLayoutChooserWidgetPrivate *priv; -} GdmLayoutChooserWidget; - -typedef struct -{ - GdmChooserWidgetClass parent_class; -} GdmLayoutChooserWidgetClass; - -GType gdm_layout_chooser_widget_get_type (void); -GtkWidget * gdm_layout_chooser_widget_new (void); - -char * gdm_layout_chooser_widget_get_current_layout_name (GdmLayoutChooserWidget *widget); -void gdm_layout_chooser_widget_set_current_layout_name (GdmLayoutChooserWidget *widget, - const char *name); - -G_END_DECLS - -#endif /* __GDM_LAYOUT_CHOOSER_WIDGET_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-option-widget.c gdm-3.0.0/gui/simple-greeter/gdm-layout-option-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-layout-option-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-option-widget.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,294 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Red Hat, 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 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. - * - * Written by: Matthias Clasen - * - */ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "gdm-profile.h" -#include "gdm-layouts.h" -#include "gdm-layout-option-widget.h" -#include "gdm-recent-option-widget.h" -#include "gdm-layout-chooser-dialog.h" - -#define GDM_LAYOUT_OPTION_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAYOUT_OPTION_WIDGET, GdmLayoutOptionWidgetPrivate)) - -struct GdmLayoutOptionWidgetPrivate -{ - GtkWidget *dialog; -}; - -enum { - LAYOUT_ACTIVATED, - NUMBER_OF_SIGNALS -}; - -static guint signals [NUMBER_OF_SIGNALS] = { 0, }; - -static void gdm_layout_option_widget_class_init (GdmLayoutOptionWidgetClass *klass); -static void gdm_layout_option_widget_init (GdmLayoutOptionWidget *layout_option_widget); -static void gdm_layout_option_widget_finalize (GObject *object); -static void gdm_layout_option_widget_hide_dialog (GdmLayoutOptionWidget *widget); - -G_DEFINE_TYPE (GdmLayoutOptionWidget, gdm_layout_option_widget, GDM_TYPE_RECENT_OPTION_WIDGET) - -static void -gdm_layout_option_widget_set_layout_from_dialog (GdmLayoutOptionWidget *widget) -{ - char *layout_name; - - layout_name = gdm_layout_chooser_dialog_get_current_layout_name (GDM_LAYOUT_CHOOSER_DIALOG (widget->priv->dialog)); - g_debug ("GdmLayoutOptionWidget: Setting layout from dialog: '%s'", layout_name); - - gdm_layout_option_widget_set_current_layout_name (widget, layout_name); - g_free (layout_name); -} - -static void -on_dialog_response (GtkDialog *dialog, - int response_id, - GdmLayoutOptionWidget *widget) -{ - g_debug ("GdmLayoutOptionWidget: Got response from dialog: '%d'", response_id); - - switch (response_id) { - case GTK_RESPONSE_OK: - gdm_layout_option_widget_set_layout_from_dialog (widget); - break; - default: - break; - } - - gdm_layout_option_widget_hide_dialog (widget); -} - -static void -gdm_layout_option_widget_hide_dialog (GdmLayoutOptionWidget *widget) -{ - gtk_widget_destroy (widget->priv->dialog); - widget->priv->dialog = NULL; -} - -static void -create_dialog (GdmLayoutOptionWidget *widget) -{ - gdm_profile_start (NULL); - - g_assert (widget->priv->dialog == NULL); - - widget->priv->dialog = gdm_layout_chooser_dialog_new (); - - gdm_profile_end (NULL); -} - -static void -gdm_layout_option_widget_show_dialog (GdmLayoutOptionWidget *widget, - const char *active_item_id) -{ - if (widget->priv->dialog == NULL) { - create_dialog (widget); - } - - g_signal_connect (GTK_DIALOG (widget->priv->dialog), - "response", - G_CALLBACK (on_dialog_response), - widget); - - gtk_widget_show_all (GTK_WIDGET (widget->priv->dialog)); - - gdm_layout_chooser_dialog_set_current_layout_name (GDM_LAYOUT_CHOOSER_DIALOG (GDM_LAYOUT_OPTION_WIDGET (widget)->priv->dialog), - active_item_id); -} - -static void -gdm_layout_option_widget_activated (GdmOptionWidget *widget) -{ - char *active_item_id; - - active_item_id = gdm_option_widget_get_active_item (GDM_OPTION_WIDGET (widget)); - if (active_item_id == NULL) { - return; - } - - if (strcmp (active_item_id, "__other") == 0) { - g_free (active_item_id); - - active_item_id = gdm_option_widget_get_default_item (widget); - gdm_layout_option_widget_set_current_layout_name (GDM_LAYOUT_OPTION_WIDGET (widget), active_item_id); - gdm_layout_option_widget_show_dialog (GDM_LAYOUT_OPTION_WIDGET (widget), active_item_id); - } - - g_signal_emit (G_OBJECT (widget), signals[LAYOUT_ACTIVATED], 0); - - g_free (active_item_id); -} - -static void -gdm_layout_option_widget_class_init (GdmLayoutOptionWidgetClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GdmOptionWidgetClass *option_widget_class = GDM_OPTION_WIDGET_CLASS (klass); - - object_class->finalize = gdm_layout_option_widget_finalize; - - option_widget_class->activated = gdm_layout_option_widget_activated; - - signals[LAYOUT_ACTIVATED] = g_signal_new ("layout-activated", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GdmLayoutOptionWidgetClass, layout_activated), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - g_type_class_add_private (klass, sizeof (GdmLayoutOptionWidgetPrivate)); -} - -static char * -gdm_layout_option_widget_lookup_item (GdmRecentOptionWidget *widget, - const char *key, - char **name, - char **comment) -{ - char *layout; - - layout = gdm_get_layout_from_name (key); - - if (layout == NULL) { - return NULL; - } - - *name = layout; - *comment = NULL; - - return g_strdup (key); -} - -static void -gdm_layout_option_widget_init (GdmLayoutOptionWidget *widget) -{ - GError *error; - - widget->priv = GDM_LAYOUT_OPTION_WIDGET_GET_PRIVATE (widget); - - error = NULL; - gdm_recent_option_widget_set_gconf_key (GDM_RECENT_OPTION_WIDGET (widget), - "/apps/gdm/simple-greeter/recent-layouts", - gdm_layout_option_widget_lookup_item, - &error); - - if (error != NULL) { - g_warning ("Could not read recent layouts from gconf: %s", - error->message); - g_error_free (error); - } - - gdm_option_widget_add_item (GDM_OPTION_WIDGET (widget), - "__other", - /* translators: This brings up a dialog of - * available keyboard layouts - */ - C_("keyboard", "Other…"), - _("Choose a keyboard layout from the " - "full list of available layouts."), - GDM_OPTION_WIDGET_POSITION_BOTTOM); -} - -static void -gdm_layout_option_widget_finalize (GObject *object) -{ - GdmLayoutOptionWidget *layout_option_widget; - - g_return_if_fail (object != NULL); - g_return_if_fail (GDM_IS_LAYOUT_OPTION_WIDGET (object)); - - layout_option_widget = GDM_LAYOUT_OPTION_WIDGET (object); - - g_return_if_fail (layout_option_widget->priv != NULL); - - if (layout_option_widget->priv->dialog != NULL) { - gtk_widget_destroy (layout_option_widget->priv->dialog); - } - - G_OBJECT_CLASS (gdm_layout_option_widget_parent_class)->finalize (object); -} - -GtkWidget * -gdm_layout_option_widget_new (void) -{ - GObject *object; - - object = g_object_new (GDM_TYPE_LAYOUT_OPTION_WIDGET, - "label-text", _("Keyboard"), - "icon-name", "preferences-desktop-keyboard", - "max-item-count", 8, - NULL); - - return GTK_WIDGET (object); -} - -char * -gdm_layout_option_widget_get_current_layout_name (GdmLayoutOptionWidget *widget) -{ - char *active_item_id; - - active_item_id = gdm_option_widget_get_active_item (GDM_OPTION_WIDGET (widget)); - if (active_item_id == NULL) { - return NULL; - } - - if (strcmp (active_item_id, "__other") == 0) { - g_free (active_item_id); - return NULL; - } - - return active_item_id; -} - -void -gdm_layout_option_widget_set_current_layout_name (GdmLayoutOptionWidget *widget, - const char *id) -{ - g_return_if_fail (GDM_IS_LAYOUT_OPTION_WIDGET (widget)); - - if (id != NULL && - !gdm_option_widget_lookup_item (GDM_OPTION_WIDGET (widget), - id, NULL, NULL, NULL)) { - gdm_recent_option_widget_add_item (GDM_RECENT_OPTION_WIDGET (widget), - id); - } - g_debug ("GdmLayoutOptionWidget: Setting active item: '%s'", id); - gdm_option_widget_set_active_item (GDM_OPTION_WIDGET (widget), id); -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layout-option-widget.h gdm-3.0.0/gui/simple-greeter/gdm-layout-option-widget.h --- gdm-2.32.1/gui/simple-greeter/gdm-layout-option-widget.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layout-option-widget.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Red Hat, 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 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. - * - * Written by: Ray Strode - */ - -#ifndef __GDM_LAYOUT_OPTION_WIDGET_H -#define __GDM_LAYOUT_OPTION_WIDGET_H - -#include - -#include "gdm-recent-option-widget.h" - -G_BEGIN_DECLS - -#define GDM_TYPE_LAYOUT_OPTION_WIDGET (gdm_layout_option_widget_get_type ()) -#define GDM_LAYOUT_OPTION_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_LAYOUT_OPTION_WIDGET, GdmLayoutOptionWidget)) -#define GDM_LAYOUT_OPTION_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_LAYOUT_OPTION_WIDGET, GdmLayoutOptionWidgetClass)) -#define GDM_IS_LAYOUT_OPTION_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_LAYOUT_OPTION_WIDGET)) -#define GDM_IS_LAYOUT_OPTION_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_LAYOUT_OPTION_WIDGET)) -#define GDM_LAYOUT_OPTION_WIDGET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_LAYOUT_OPTION_WIDGET, GdmLayoutOptionWidgetClass)) - -typedef struct GdmLayoutOptionWidgetPrivate GdmLayoutOptionWidgetPrivate; - -typedef struct -{ - GdmRecentOptionWidget parent; - GdmLayoutOptionWidgetPrivate *priv; -} GdmLayoutOptionWidget; - -typedef struct -{ - GdmRecentOptionWidgetClass parent_class; - - void (* layout_activated) (GdmLayoutOptionWidget *widget); -} GdmLayoutOptionWidgetClass; - -GType gdm_layout_option_widget_get_type (void); -GtkWidget * gdm_layout_option_widget_new (void); - -char * gdm_layout_option_widget_get_current_layout_name (GdmLayoutOptionWidget *widget); -void gdm_layout_option_widget_set_current_layout_name (GdmLayoutOptionWidget *widget, - const char *name); - - - -#endif /* __GDM_LAYOUT_OPTION_WIDGET_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layouts.c gdm-3.0.0/gui/simple-greeter/gdm-layouts.c --- gdm-2.32.1/gui/simple-greeter/gdm-layouts.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layouts.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,266 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2008 Red Hat, 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 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. - * - * Written by : Matthias Clasen - */ - -#include "config.h" - -#include - -#include - -#include - -#ifdef HAVE_LIBXKLAVIER -#include -#endif - -#include - -#include "gdm-layouts.h" - -typedef struct { - GSList *list; - const char *layout; -} LayoutData; - -#ifdef HAVE_LIBXKLAVIER -static XklEngine *engine = NULL; -static XklConfigRegistry *config_registry = NULL; -static XklConfigRec *initial_config = NULL; - -static void -init_xkl (void) -{ - if (config_registry == NULL) { - engine = xkl_engine_get_instance (GDK_DISPLAY ()); - config_registry = xkl_config_registry_get_instance (engine); - xkl_config_registry_load (config_registry, FALSE); - - initial_config = xkl_config_rec_new (); - if (!xkl_config_rec_get_from_server (initial_config, engine)) { - g_warning ("failed to load XKB configuration"); - initial_config->model = g_strdup ("pc105"); - } - } -} - -static void -add_variant (XklConfigRegistry *config, - const XklConfigItem *item, - gpointer data) -{ - LayoutData *ldata = data; - - ldata->list = g_slist_prepend (ldata->list, g_strdup_printf ("%s\t%s", ldata->layout, item->name)); -} - -static void -add_layout (XklConfigRegistry *config, - const XklConfigItem *item, - gpointer data) -{ - LayoutData *ldata = data; - - ldata->layout = item->name; - ldata->list = g_slist_prepend (ldata->list, g_strdup (item->name)); - xkl_config_registry_foreach_layout_variant (config, item->name, add_variant, data); - ldata->layout = NULL; -} -#endif - -gchar * -gdm_get_layout_from_name (const char *name) -{ -#ifdef HAVE_LIBXKLAVIER - XklConfigItem *item; - char *layout; - char *variant; - char *result; - char *id1; - char *id2; - char *p; - - init_xkl (); - - id1 = g_strdup (name); - p = strchr (id1, '\t'); - - if (p != NULL) { - id2 = p + 1; - *p = 0; - } else { - id2 = NULL; - } - - item = xkl_config_item_new (); - - g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id1); - if (xkl_config_registry_find_layout (config_registry, item)) { - layout = g_strdup(item->description); - } else { - layout = g_strdup_printf ("Layout %s", id1); - } - - if (id2 != NULL) { - g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", id2); - if (xkl_config_registry_find_variant (config_registry, id1, item)) - variant = g_strdup(item->description); - else - variant = g_strdup_printf ("Variant %s", id2); - } else { - variant = NULL; - } - - g_object_unref (item); - - g_free (id1); - - if (variant != NULL) { - result = g_strdup_printf ("%s (%s)", layout, variant); - g_free (layout); - g_free (variant); - } else { - result = layout; - } - - return result; -#else - return NULL; -#endif -} - -char ** -gdm_get_all_layout_names (void) -{ -#ifdef HAVE_LIBXKLAVIER - GSList *l; - int len; - int i; - char **layouts; - LayoutData data; - - data.list = NULL; - data.layout = NULL; - - init_xkl (); - - xkl_config_registry_foreach_layout (config_registry, add_layout, &data); - - len = g_slist_length (data.list); - - layouts = g_new (char *, len + 1); - layouts[len] = NULL; - - for (i = 0, l = data.list; i < len; i++, l = l->next) { - layouts[len - i - 1] = l->data; - } - - g_slist_free (data.list); - - return layouts; -#else - return NULL; -#endif -} - -gboolean -gdm_layout_is_valid (const char *layout_variant) -{ -#ifdef HAVE_LIBXKLAVIER - XklConfigItem *item; - char *layout; - char *variant; - gboolean retval; - - layout = g_strdup (layout_variant); - variant = strchr (layout, '\t'); - if (variant != NULL) { - variant[0] = '\0'; - variant++; - } - - item = xkl_config_item_new (); - g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", layout); - - retval = xkl_config_registry_find_layout (config_registry, item); - - if (retval && variant != NULL) { - g_snprintf (item->name, XKL_MAX_CI_NAME_LENGTH, "%s", variant); - retval = xkl_config_registry_find_variant (config_registry, layout, item); - } - - g_object_unref (item); - g_free (layout); - - return retval; -#else - return TRUE; -#endif -} - -const char * -gdm_layout_get_default_layout (void) -{ -#ifdef HAVE_LIBXKLAVIER - init_xkl (); - - if (initial_config->layouts) - return initial_config->layouts[0]; - else - return NULL; -#else - return NULL; -#endif -} - -void -gdm_layout_activate (const char *layout) -{ -#ifdef HAVE_LIBXKLAVIER - XklConfigRec *config; - char *p; - - init_xkl (); - - config = xkl_config_rec_new (); - config->model = g_strdup (initial_config->model); - - if (layout == NULL) { - config->layouts = g_strdupv (initial_config->layouts); - config->variants = g_strdupv (initial_config->variants); - config->options = g_strdupv (initial_config->options); - } else { - config->layouts = g_new0 (char *, 2); - config->layouts[0] = g_strdup (layout); - - p = strchr (config->layouts[0], '\t'); - if (p != NULL) { - config->variants = g_new0 (char *, 2); - config->layouts[0][p - config->layouts[0]] = 0; - config->variants[0] = g_strdup (p + 1); - } - } - - xkl_config_rec_activate (config, engine); - - g_object_unref (config); -#endif -} - diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-layouts.h gdm-3.0.0/gui/simple-greeter/gdm-layouts.h --- gdm-2.32.1/gui/simple-greeter/gdm-layouts.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-layouts.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2008 Red Hat, 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 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. - * - * Written by: Matthias Clasen - */ - -#ifndef __GDM_LAYOUTS_H -#define __GDM_LAYOUTS_H - -G_BEGIN_DECLS - -char * gdm_get_layout_from_name (const char *name); -char ** gdm_get_all_layout_names (void); -gboolean gdm_layout_is_valid (const char *layout); -const char * gdm_layout_get_default_layout (void); -void gdm_layout_activate (const char *layout); - -G_END_DECLS - -#endif /* __GDM_LAYOUT_CHOOSER_WIDGET_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-scrollable-widget.c gdm-3.0.0/gui/simple-greeter/gdm-scrollable-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-scrollable-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-scrollable-widget.c 2011-04-04 14:37:16.000000000 +0000 @@ -58,9 +58,9 @@ guint key_press_signal_id; guint key_release_signal_id; - GQueue *key_event_queue; + int forced_height; - guint child_adjustments_stale : 1; + GQueue *key_event_queue; }; struct GdmScrollableWidgetAnimation @@ -120,24 +120,35 @@ on_animation_tick (GdmScrollableWidgetAnimation *animation, double progress) { + GdmScrollableWidget *scrollable_widget; int progress_in_pixels; - int width; int height; + scrollable_widget = GDM_SCROLLABLE_WIDGET (animation->widget); + progress_in_pixels = progress * (animation->start_height - animation->desired_height); height = animation->start_height - progress_in_pixels; + scrollable_widget->priv->forced_height = height; - gtk_widget_get_size_request (animation->widget, &width, NULL); - gtk_widget_set_size_request (animation->widget, width, height); + gtk_widget_queue_resize (animation->widget); if (animation->step_func != NULL) { GdmTimer *timer; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; height = animation->desired_height; - height -= gtk_widget_get_style (animation->widget)->ythickness * 2; - height -= gtk_container_get_border_width (GTK_CONTAINER (animation->widget)) * 2; + context = gtk_widget_get_style_context (animation->widget); + state = gtk_widget_get_state_flags (animation->widget); + + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); + + height -= padding.top + padding.bottom; + height -= border.top + border.bottom; timer = g_object_ref (animation->timer); animation->step_func (GDM_SCROLLABLE_WIDGET (animation->widget), @@ -146,8 +157,8 @@ animation->step_func_user_data); if (gdm_timer_is_started (timer)) { - height += gtk_widget_get_style (animation->widget)->ythickness * 2; - height += gtk_container_get_border_width (GTK_CONTAINER (animation->widget)) * 2; + height += padding.top + padding.bottom; + height += border.top + border.bottom; animation->desired_height = height; } @@ -213,7 +224,6 @@ on_animation_stop (GdmScrollableWidgetAnimation *animation) { GdmScrollableWidget *widget; - int width; widget = GDM_SCROLLABLE_WIDGET (animation->widget); @@ -224,10 +234,6 @@ gdm_scrollable_widget_animation_free (widget->priv->animation); widget->priv->animation = NULL; - gtk_widget_get_size_request (GTK_WIDGET (widget), &width, NULL); - gtk_widget_set_size_request (GTK_WIDGET (widget), width, -1); - gtk_widget_queue_resize (GTK_WIDGET (widget)); - gdm_scrollable_unredirect_input (widget); } @@ -252,6 +258,7 @@ static gboolean gdm_scrollable_widget_needs_scrollbar (GdmScrollableWidget *widget) { + GtkWidget *child; gboolean needs_scrollbar; if (widget->priv->scrollbar == NULL) { @@ -262,21 +269,26 @@ return FALSE; } - if (widget->priv->child_adjustments_stale) { - return FALSE; - } - - if (gtk_bin_get_child (GTK_BIN (widget)) != NULL) { - GtkRequisition child_requisition; - GtkAllocation widget_allocation; + child = gtk_bin_get_child (GTK_BIN (widget)); + if (child != NULL && GTK_IS_SCROLLABLE (child)) { + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; int available_height; + int child_scrolled_height; + + context = gtk_widget_get_style_context (GTK_WIDGET (widget)); + state = gtk_widget_get_state_flags (GTK_WIDGET (widget)); - gtk_widget_get_allocation (GTK_WIDGET (widget), &widget_allocation); + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); - gtk_widget_get_child_requisition (gtk_bin_get_child (GTK_BIN (widget)), - &child_requisition); - available_height = widget_allocation.height; - needs_scrollbar = child_requisition.height > available_height; + available_height = gtk_widget_get_allocated_height (GTK_WIDGET (widget)); + available_height -= padding.top + padding.bottom; + available_height -= border.top + border.bottom; + + gtk_widget_get_preferred_height (child, NULL, &child_scrolled_height); + needs_scrollbar = child_scrolled_height > available_height; } else { needs_scrollbar = FALSE; } @@ -285,56 +297,103 @@ } static void -gdm_scrollable_widget_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gdm_scrollable_widget_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size) { GdmScrollableWidget *scrollable_widget; - GtkRequisition child_requisition; - gboolean child_adjustments_stale; - - scrollable_widget = GDM_SCROLLABLE_WIDGET (widget); + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; + GtkRequisition scrollbar_requisition; + GtkRequisition minimum_req, natural_req; + GtkWidget *child; + int min_child_size, nat_child_size; - requisition->width = 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->height = 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); - requisition->width += 2 * gtk_widget_get_style (widget)->xthickness; - requisition->height += 2 * gtk_widget_get_style (widget)->ythickness; + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); - child_adjustments_stale = FALSE; - GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); - - if (child && gtk_widget_get_visible (child)) { - - int old_child_height; - gtk_widget_get_child_requisition (child, - &child_requisition); - old_child_height = child_requisition.height; + scrollable_widget = GDM_SCROLLABLE_WIDGET (widget); - gtk_widget_size_request (child, - &child_requisition); + minimum_req.width = padding.left + padding.right; + minimum_req.width += border.left + border.right; + minimum_req.height = padding.top + padding.bottom; + minimum_req.height += border.top + border.bottom; + + natural_req.width = padding.left + padding.right; + natural_req.width += border.left + border.right; + natural_req.height = padding.top + padding.bottom; + natural_req.height += border.top + border.bottom; + + if (orientation == GTK_ORIENTATION_VERTICAL + && scrollable_widget->priv->forced_height >= 0) { + minimum_req.height += scrollable_widget->priv->forced_height; + natural_req.height += scrollable_widget->priv->forced_height; + } else { + child = gtk_bin_get_child (GTK_BIN (widget)); - requisition->width += child_requisition.width; - requisition->height += child_requisition.height; + gtk_widget_get_preferred_size (scrollable_widget->priv->scrollbar, + &scrollbar_requisition, + NULL); + + if (child && gtk_widget_get_visible (child)) { + if (orientation == GTK_ORIENTATION_HORIZONTAL) { + gtk_widget_get_preferred_width (child, + &min_child_size, + &nat_child_size); + minimum_req.width += min_child_size; + natural_req.width += nat_child_size; + } else { + gtk_widget_get_preferred_height (child, + &min_child_size, + &nat_child_size); + + minimum_req.height += min_child_size; + natural_req.height += nat_child_size; + } + } - child_adjustments_stale = old_child_height != child_requisition.height; + if (gdm_scrollable_widget_needs_scrollbar (scrollable_widget)) { + minimum_req.height = MAX (minimum_req.height, + scrollbar_requisition.height); + minimum_req.width += scrollbar_requisition.width; + natural_req.height = MAX (natural_req.height, + scrollbar_requisition.height); + natural_req.width += scrollbar_requisition.width; + } } - if (gdm_scrollable_widget_needs_scrollbar (scrollable_widget)) { - GtkRequisition scrollbar_requisition; - - gtk_widget_show (scrollable_widget->priv->scrollbar); - - gtk_widget_size_request (scrollable_widget->priv->scrollbar, - &scrollbar_requisition); - - requisition->height = MAX (requisition->height, - scrollbar_requisition.height); - requisition->width += scrollbar_requisition.width; + if (orientation == GTK_ORIENTATION_HORIZONTAL) { + if (minimum_size) + *minimum_size = minimum_req.width; + if (natural_size) + *natural_size = natural_req.width; } else { - gtk_widget_hide (scrollable_widget->priv->scrollbar); + if (minimum_size) + *minimum_size = minimum_req.height; + if (natural_size) + *natural_size = natural_req.height; } +} + +static void +gdm_scrollable_widget_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gdm_scrollable_widget_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); +} - scrollable_widget->priv->child_adjustments_stale = child_adjustments_stale; +static void +gdm_scrollable_widget_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) +{ + gdm_scrollable_widget_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); } static void @@ -347,75 +406,81 @@ gboolean has_child; gboolean needs_scrollbar; gboolean is_flipped; + GtkWidget *child; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; scrollable_widget = GDM_SCROLLABLE_WIDGET (widget); + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); - gtk_widget_set_allocation (widget, allocation); + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); - GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); + gtk_widget_set_allocation (widget, allocation); + child = gtk_bin_get_child (GTK_BIN (widget)); has_child = child && gtk_widget_get_visible (child); needs_scrollbar = gdm_scrollable_widget_needs_scrollbar (scrollable_widget); is_flipped = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; if (needs_scrollbar) { - GtkRequisition scrollbar_requisition; - - gtk_widget_get_child_requisition (scrollable_widget->priv->scrollbar, - &scrollbar_requisition); + gtk_widget_show (scrollable_widget->priv->scrollbar); - scrollbar_allocation.width = scrollbar_requisition.width; + gtk_widget_get_preferred_width (scrollable_widget->priv->scrollbar, NULL, &scrollbar_allocation.width); if (!is_flipped) { scrollbar_allocation.x = allocation->x + allocation->width; - scrollbar_allocation.x -= gtk_container_get_border_width (GTK_CONTAINER (widget)); - scrollbar_allocation.x -= scrollbar_allocation.width; + scrollbar_allocation.x -= scrollbar_allocation.width - padding.right; } else { - scrollbar_allocation.x = allocation->x; - scrollbar_allocation.x += gtk_container_get_border_width (GTK_CONTAINER (widget)); + scrollbar_allocation.x = allocation->x + padding.right + border.right; } scrollbar_allocation.height = allocation->height; - scrollbar_allocation.height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - scrollbar_allocation.y = allocation->y; - scrollbar_allocation.y += gtk_container_get_border_width (GTK_CONTAINER (widget)); + scrollbar_allocation.y = allocation->y + padding.top; gtk_widget_size_allocate (scrollable_widget->priv->scrollbar, &scrollbar_allocation); + } else { + gtk_widget_hide (scrollable_widget->priv->scrollbar); } if (has_child) { child_allocation.width = allocation->width; - child_allocation.width -= 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - child_allocation.width -= 2 * gtk_widget_get_style (widget)->xthickness; + child_allocation.width = MAX (child_allocation.width - padding.left, 1); + child_allocation.width = MAX (child_allocation.width - padding.right, 1); + child_allocation.width = MAX (child_allocation.width - border.left, 1); + child_allocation.width = MAX (child_allocation.width - border.right, 1); if (needs_scrollbar) { - child_allocation.width -= scrollbar_allocation.width; + child_allocation.width = MAX (child_allocation.width - scrollbar_allocation.width, 1); } if (!is_flipped) { child_allocation.x = allocation->x; - child_allocation.x += gtk_container_get_border_width (GTK_CONTAINER (widget)); - child_allocation.x += gtk_widget_get_style (widget)->xthickness; + child_allocation.x += padding.left; + child_allocation.x += border.left; } else { child_allocation.x = allocation->x + allocation->width; - child_allocation.x -= gtk_container_get_border_width (GTK_CONTAINER (widget)); child_allocation.x -= child_allocation.width; - child_allocation.x -= gtk_widget_get_style (widget)->xthickness; + child_allocation.x -= padding.left; + child_allocation.x -= border.left; } child_allocation.height = allocation->height; - child_allocation.height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); - child_allocation.height -= 2 * gtk_widget_get_style (widget)->ythickness; + child_allocation.height = MAX (child_allocation.height - padding.top, 1); + child_allocation.height = MAX (child_allocation.height - border.top, 1); + child_allocation.height = MAX (child_allocation.height - padding.bottom, 1); + child_allocation.height = MAX (child_allocation.height - border.bottom, 1); child_allocation.y = allocation->y; - child_allocation.y += gtk_container_get_border_width (GTK_CONTAINER (widget)); - child_allocation.y += gtk_widget_get_style (widget)->ythickness; + child_allocation.y += padding.top; + child_allocation.y += border.top; gtk_widget_size_allocate (child, &child_allocation); - scrollable_widget->priv->child_adjustments_stale = FALSE; } } @@ -433,14 +498,17 @@ G_CALLBACK (gtk_widget_queue_resize), container); - gtk_widget_set_scroll_adjustments (child, NULL, adjustment); + if (GTK_IS_SCROLLABLE (child)) + g_object_set (child, "hadjustment", NULL, "vadjustment", adjustment, NULL); + else + g_warning ("gdm_scrollable_widget_add(): cannot add non scrollable widget"); } static void gdm_scrollable_widget_remove (GtkContainer *container, GtkWidget *child) { - gtk_widget_set_scroll_adjustments (child, NULL, NULL); + g_object_set (child, "hadjustment", NULL, "vadjustment", NULL, NULL); GTK_CONTAINER_CLASS (gdm_scrollable_widget_parent_class)->remove (container, child); } @@ -471,7 +539,7 @@ } static void -gdm_scrollable_widget_destroy (GtkObject *object) +gdm_scrollable_widget_destroy (GtkWidget *object) { GdmScrollableWidget *scrollable_widget; @@ -480,7 +548,7 @@ gtk_widget_unparent (scrollable_widget->priv->scrollbar); gtk_widget_destroy (scrollable_widget->priv->scrollbar); - GTK_OBJECT_CLASS (gdm_scrollable_widget_parent_class)->destroy (object); + GTK_WIDGET_CLASS (gdm_scrollable_widget_parent_class)->destroy (object); } static void @@ -496,8 +564,8 @@ } static gboolean -gdm_scrollable_widget_expose_event (GtkWidget *widget, - GdkEventExpose *event) +gdm_scrollable_widget_draw (GtkWidget *widget, + cairo_t *cr) { GdmScrollableWidget *scrollable_widget; int x; @@ -505,8 +573,18 @@ int width; int height; gboolean is_flipped; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; GtkAllocation widget_allocation; + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + is_flipped = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; + + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); + gtk_widget_get_allocation (widget, &widget_allocation); scrollable_widget = GDM_SCROLLABLE_WIDGET (widget); @@ -515,13 +593,11 @@ return FALSE; } - is_flipped = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; - - x = widget_allocation.x; - x += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + x = 0; + x += padding.left; width = widget_allocation.width; - width -= 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + width -= padding.left + padding.right; if (gdm_scrollable_widget_needs_scrollbar (scrollable_widget)) { GtkAllocation scrollbar_allocation; @@ -533,18 +609,18 @@ } } - y = widget_allocation.y; - y += 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + y = 0; + y += padding.top; height = widget_allocation.height; - height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (widget)); + height -= padding.top + padding.bottom; - gtk_paint_shadow (gtk_widget_get_style (widget), gtk_widget_get_window (widget), - gtk_widget_get_state (widget), GTK_SHADOW_IN, - &event->area, widget, "scrolled_window", - x, y, width, height); + if (width > 0 && height > 0) { + gtk_render_frame (context, cr, + x, y, width, height); + } - return GTK_WIDGET_CLASS (gdm_scrollable_widget_parent_class)->expose_event (widget, event); + return GTK_WIDGET_CLASS (gdm_scrollable_widget_parent_class)->draw (widget, cr); } static gboolean @@ -569,7 +645,7 @@ GdkModifierType mask, GtkScrollType scroll) { - guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; + guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left; gtk_binding_entry_add_signal (binding_set, keyval, mask, "scroll-child", 1, @@ -584,10 +660,10 @@ GdkModifierType modifiers, GtkDirectionType direction) { - gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Tab, modifiers, "move-focus-out", 1, GTK_TYPE_DIRECTION_TYPE, direction); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Tab, modifiers, "move-focus-out", 1, GTK_TYPE_DIRECTION_TYPE, direction); } @@ -599,14 +675,14 @@ binding_set = gtk_binding_set_by_class (klass); - add_scroll_binding (binding_set, GDK_Up, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD); - add_scroll_binding (binding_set, GDK_Down, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD); + add_scroll_binding (binding_set, GDK_KEY_Up, GDK_CONTROL_MASK, GTK_SCROLL_STEP_BACKWARD); + add_scroll_binding (binding_set, GDK_KEY_Down, GDK_CONTROL_MASK, GTK_SCROLL_STEP_FORWARD); - add_scroll_binding (binding_set, GDK_Page_Up, 0, GTK_SCROLL_PAGE_BACKWARD); - add_scroll_binding (binding_set, GDK_Page_Down, 0, GTK_SCROLL_PAGE_FORWARD); + add_scroll_binding (binding_set, GDK_KEY_Page_Up, 0, GTK_SCROLL_PAGE_BACKWARD); + add_scroll_binding (binding_set, GDK_KEY_Page_Down, 0, GTK_SCROLL_PAGE_FORWARD); - add_scroll_binding (binding_set, GDK_Home, 0, GTK_SCROLL_START); - add_scroll_binding (binding_set, GDK_End, 0, GTK_SCROLL_END); + add_scroll_binding (binding_set, GDK_KEY_Home, 0, GTK_SCROLL_START); + add_scroll_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END); add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD); add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD); @@ -616,29 +692,29 @@ gdm_scrollable_widget_class_init (GdmScrollableWidgetClass *klass) { GObjectClass *object_class; - GtkObjectClass *gtk_object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; GdmScrollableWidgetClass *scrollable_widget_class; object_class = G_OBJECT_CLASS (klass); - gtk_object_class = GTK_OBJECT_CLASS (klass); widget_class = GTK_WIDGET_CLASS (klass); container_class = GTK_CONTAINER_CLASS (klass); scrollable_widget_class = GDM_SCROLLABLE_WIDGET_CLASS (klass); object_class->finalize = gdm_scrollable_widget_finalize; - gtk_object_class->destroy = gdm_scrollable_widget_destroy; + widget_class->destroy = gdm_scrollable_widget_destroy; - widget_class->size_request = gdm_scrollable_widget_size_request; + widget_class->get_preferred_width = gdm_scrollable_widget_get_preferred_width; + widget_class->get_preferred_height = gdm_scrollable_widget_get_preferred_height; widget_class->size_allocate = gdm_scrollable_widget_size_allocate; - widget_class->expose_event = gdm_scrollable_widget_expose_event; + widget_class->draw = gdm_scrollable_widget_draw; widget_class->scroll_event = gdm_scrollable_widget_scroll_event; container_class->add = gdm_scrollable_widget_add; container_class->remove = gdm_scrollable_widget_remove; container_class->forall = gdm_scrollable_widget_forall; + gtk_container_class_handle_border_width (container_class); signals[SCROLL_CHILD] = g_signal_new ("scroll-child", @@ -668,6 +744,7 @@ { gtk_widget_push_composite_child (); widget->priv->scrollbar = gtk_vscrollbar_new (NULL); + g_object_set (widget->priv->scrollbar, "expand", TRUE, NULL); gtk_widget_set_composite_name (widget->priv->scrollbar, "scrollbar"); gtk_widget_pop_composite_child (); gtk_widget_set_parent (widget->priv->scrollbar, GTK_WIDGET (widget)); @@ -685,12 +762,36 @@ } static void +gdm_scrollable_widget_adopt_style_from_scrolled_window_class (GdmScrollableWidget *widget) +{ + GtkStyleContext *context; + GtkWidgetPath *path; + + context = gtk_widget_get_style_context (GTK_WIDGET (widget)); + + gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); + + path = gtk_widget_path_new (); + gtk_widget_path_append_type (path, GTK_TYPE_SCROLLED_WINDOW); + gtk_style_context_set_path (context, path); + gtk_widget_path_free (path); +} + +static void gdm_scrollable_widget_init (GdmScrollableWidget *widget) { widget->priv = GDM_SCROLLABLE_WIDGET_GET_PRIVATE (widget); + widget->priv->forced_height = -1; + gdm_scrollable_widget_add_scrollbar (widget); gdm_scrollable_widget_add_invisible_event_sink (widget); + + gdm_scrollable_widget_adopt_style_from_scrolled_window_class (widget); + g_signal_connect (G_OBJECT (widget), + "style-updated", + G_CALLBACK (gdm_scrollable_widget_adopt_style_from_scrolled_window_class), + NULL); } GtkWidget * @@ -737,6 +838,10 @@ { GtkWidget *widget; gboolean input_redirected; + GtkAllocation widget_allocation; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; g_return_if_fail (GDM_IS_SCROLLABLE_WIDGET (scrollable_widget)); widget = GTK_WIDGET (scrollable_widget); @@ -746,6 +851,8 @@ input_redirected = gdm_scrollable_redirect_input_to_event_sink (scrollable_widget); if (!input_redirected || gdm_scrollable_widget_animations_are_disabled (scrollable_widget)) { + scrollable_widget->priv->forced_height = height; + if (step_func != NULL) { step_func (scrollable_widget, 0.0, &height, step_user_data); } @@ -761,10 +868,15 @@ return; } - height += gtk_widget_get_style (widget)->ythickness * 2; - height += gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2; + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); + + height += padding.top + padding.bottom; + height += border.top + border.bottom; - GtkAllocation widget_allocation; gtk_widget_get_allocation (widget, &widget_allocation); scrollable_widget->priv->animation = diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-session-option-widget.c gdm-3.0.0/gui/simple-greeter/gdm-session-option-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-session-option-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-session-option-widget.c 2011-04-04 14:37:16.000000000 +0000 @@ -160,7 +160,6 @@ object = g_object_new (GDM_TYPE_SESSION_OPTION_WIDGET, "label-text", _("Session"), - "icon-name", "session-properties", NULL); return GTK_WIDGET (object); diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-simple-greeter.schemas.in gdm-3.0.0/gui/simple-greeter/gdm-simple-greeter.schemas.in --- gdm-2.32.1/gui/simple-greeter/gdm-simple-greeter.schemas.in 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-simple-greeter.schemas.in 2011-04-04 14:37:16.000000000 +0000 @@ -79,18 +79,6 @@ - /schemas/apps/gdm/simple-greeter/recent-layouts - /apps/gdm/simple-greeter/recent-layouts - gdm-simple-greeter - list - string - [] - - Recently selected keyboard layouts - Set to a list of keyboard layouts to be shown by default in the login window. - - - /schemas/apps/gdm/simple-greeter/wm_use_compiz /apps/gdm/simple-greeter/wm_use_compiz gdm-simple-greeter diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user.c gdm-3.0.0/gui/simple-greeter/gdm-user.c --- gdm-2.32.1/gui/simple-greeter/gdm-user.c 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1096 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * Copyright (C) 2007-2008 William Jon McCann - * - * 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 - */ - -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include "gdm-user-private.h" - -#define GDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_USER, GdmUserClass)) -#define GDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_USER)) -#define GDM_USER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_USER, GdmUserClass)) - -#define GLOBAL_FACEDIR DATADIR "/faces" -#define MAX_FILE_SIZE 65536 - -#define ACCOUNTS_NAME "org.freedesktop.Accounts" -#define ACCOUNTS_USER_INTERFACE "org.freedesktop.Accounts.User" - -enum { - PROP_0, - PROP_IS_LOADED -}; - -enum { - CHANGED, - SESSIONS_CHANGED, - LAST_SIGNAL -}; - -struct _GdmUser { - GObject parent; - - DBusGConnection *connection; - DBusGProxy *accounts_proxy; - DBusGProxy *object_proxy; - DBusGProxyCall *get_all_call; - char *object_path; - - uid_t uid; - char *user_name; - char *real_name; - char *icon_file; - GList *sessions; - gulong login_frequency; - - guint is_loaded : 1; -}; - -struct _GdmUserClass -{ - GObjectClass parent_class; -}; - -static void gdm_user_finalize (GObject *object); -static gboolean check_user_file (const char *filename); - -static guint signals[LAST_SIGNAL] = { 0 }; - -G_DEFINE_TYPE (GdmUser, gdm_user, G_TYPE_OBJECT) - -static int -session_compare (const char *a, - const char *b) -{ - if (a == NULL) { - return 1; - } else if (b == NULL) { - return -1; - } - - return strcmp (a, b); -} - -void -_gdm_user_add_session (GdmUser *user, - const char *ssid) -{ - GList *li; - - g_return_if_fail (GDM_IS_USER (user)); - g_return_if_fail (ssid != NULL); - - li = g_list_find_custom (user->sessions, ssid, (GCompareFunc)session_compare); - if (li == NULL) { - g_debug ("GdmUser: adding session %s", ssid); - user->sessions = g_list_prepend (user->sessions, g_strdup (ssid)); - g_signal_emit (user, signals[SESSIONS_CHANGED], 0); - } else { - g_debug ("GdmUser: session already present: %s", ssid); - } -} - -void -_gdm_user_remove_session (GdmUser *user, - const char *ssid) -{ - GList *li; - - g_return_if_fail (GDM_IS_USER (user)); - g_return_if_fail (ssid != NULL); - - li = g_list_find_custom (user->sessions, ssid, (GCompareFunc)session_compare); - if (li != NULL) { - g_debug ("GdmUser: removing session %s", ssid); - g_free (li->data); - user->sessions = g_list_delete_link (user->sessions, li); - g_signal_emit (user, signals[SESSIONS_CHANGED], 0); - } else { - g_debug ("GdmUser: session not found: %s", ssid); - } -} - -guint -gdm_user_get_num_sessions (GdmUser *user) -{ - return g_list_length (user->sessions); -} - -static void -gdm_user_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GdmUser *user; - - user = GDM_USER (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gdm_user_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GdmUser *user; - - user = GDM_USER (object); - - switch (prop_id) { - case PROP_IS_LOADED: - g_value_set_boolean (value, user->is_loaded); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gdm_user_class_init (GdmUserClass *class) -{ - GObjectClass *gobject_class; - - gobject_class = G_OBJECT_CLASS (class); - - gobject_class->finalize = gdm_user_finalize; - gobject_class->set_property = gdm_user_set_property; - gobject_class->get_property = gdm_user_get_property; - - g_object_class_install_property (gobject_class, - PROP_IS_LOADED, - g_param_spec_boolean ("is-loaded", - NULL, - NULL, - FALSE, - G_PARAM_READABLE)); - - signals [CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals [SESSIONS_CHANGED] = - g_signal_new ("sessions-changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); -} - -static void -gdm_user_init (GdmUser *user) -{ - GError *error; - - user->user_name = NULL; - user->real_name = NULL; - user->sessions = NULL; - - error = NULL; - user->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (user->connection == NULL) { - g_warning ("Couldn't connect to system bus: %s", error->message); - } -} - -static void -gdm_user_finalize (GObject *object) -{ - GdmUser *user; - - user = GDM_USER (object); - - g_free (user->user_name); - g_free (user->real_name); - g_free (user->icon_file); - g_free (user->object_path); - - if (user->accounts_proxy != NULL) { - g_object_unref (user->accounts_proxy); - } - - if (user->object_proxy != NULL) { - g_object_unref (user->object_proxy); - } - - if (user->connection != NULL) { - dbus_g_connection_unref (user->connection); - } - - if (G_OBJECT_CLASS (gdm_user_parent_class)->finalize) - (*G_OBJECT_CLASS (gdm_user_parent_class)->finalize) (object); -} - -static void -set_is_loaded (GdmUser *user, - gboolean is_loaded) -{ - if (user->is_loaded != is_loaded) { - user->is_loaded = is_loaded; - g_object_notify (G_OBJECT (user), "is-loaded"); - } -} - -/** - * _gdm_user_update_from_pwent: - * @user: the user object to update. - * @pwent: the user data to use. - * - * Updates the properties of @user using the data in @pwent. - **/ -void -_gdm_user_update_from_pwent (GdmUser *user, - const struct passwd *pwent) -{ - gchar *real_name = NULL; - gboolean changed; - - g_return_if_fail (GDM_IS_USER (user)); - g_return_if_fail (pwent != NULL); - g_return_if_fail (user->object_path == NULL); - - changed = FALSE; - - /* Display Name */ - if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') { - gchar *first_comma = NULL; - gchar *valid_utf8_name = NULL; - - if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) { - valid_utf8_name = pwent->pw_gecos; - first_comma = strchr (valid_utf8_name, ','); - } else { - g_warning ("User %s has invalid UTF-8 in GECOS field. " - "It would be a good thing to check /etc/passwd.", - pwent->pw_name ? pwent->pw_name : ""); - } - - if (first_comma) { - real_name = g_strndup (valid_utf8_name, - (first_comma - valid_utf8_name)); - } else if (valid_utf8_name) { - real_name = g_strdup (valid_utf8_name); - } else { - real_name = NULL; - } - - if (real_name && real_name[0] == '\0') { - g_free (real_name); - real_name = NULL; - } - } else { - real_name = NULL; - } - - if (g_strcmp0 (real_name, user->real_name) != 0) { - g_free (user->real_name); - user->real_name = real_name; - changed = TRUE; - } else { - g_free (real_name); - } - - /* UID */ - if (pwent->pw_uid != user->uid) { - user->uid = pwent->pw_uid; - changed = TRUE; - } - - /* Username */ - if (g_strcmp0 (pwent->pw_name, user->user_name) != 0) { - g_free (user->icon_file); - user->icon_file = NULL; - if (pwent->pw_name != NULL) { - gboolean res; - - user->icon_file = g_build_filename (GDM_CACHE_DIR, pwent->pw_name, "face", NULL); - - res = check_user_file (user->icon_file); - if (!res) { - g_free (user->icon_file); - user->icon_file = g_build_filename (GLOBAL_FACEDIR, pwent->pw_name, NULL); - } - } - - g_free (user->user_name); - user->user_name = g_strdup (pwent->pw_name); - changed = TRUE; - } - - if (!user->is_loaded) { - set_is_loaded (user, TRUE); - } - - if (changed) { - g_signal_emit (user, signals[CHANGED], 0); - } -} - -/** - * _gdm_user_update_login_frequency: - * @user: the user object to update - * @login_frequency: the number of times the user has logged in - * - * Updates the login frequency of @user - **/ -void -_gdm_user_update_login_frequency (GdmUser *user, - guint64 login_frequency) -{ - g_return_if_fail (GDM_IS_USER (user)); - - if (login_frequency == user->login_frequency) { - return; - } - - user->login_frequency = login_frequency; - g_signal_emit (user, signals[CHANGED], 0); -} - -/** - * gdm_user_get_uid: - * @user: the user object to examine. - * - * Retrieves the ID of @user. - * - * Returns: (transfer none): a pointer to an array of characters which must not be modified or - * freed, or %NULL. - **/ - -gulong -gdm_user_get_uid (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), -1); - - return user->uid; -} - -/** - * gdm_user_get_real_name: - * @user: the user object to examine. - * - * Retrieves the display name of @user. - * - * Returns: (transfer none): a pointer to an array of characters which must not be modified or - * freed, or %NULL. - **/ -const char * -gdm_user_get_real_name (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), NULL); - - return (user->real_name ? user->real_name : user->user_name); -} - -/** - * gdm_user_get_user_name: - * @user: the user object to examine. - * - * Retrieves the login name of @user. - * - * Returns: (transfer none): a pointer to an array of characters which must not be modified or - * freed, or %NULL. - **/ - -const char * -gdm_user_get_user_name (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), NULL); - - return user->user_name; -} - -/** - * gdm_user_get_login_frequency: - * @user: a #GdmUser - * - * Returns the number of times @user has logged in. - * - * Returns: the login frequency - */ -gulong -gdm_user_get_login_frequency (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), 0); - - return user->login_frequency; -} - -int -gdm_user_collate (GdmUser *user1, - GdmUser *user2) -{ - const char *str1; - const char *str2; - gulong num1; - gulong num2; - guint len1; - guint len2; - - g_return_val_if_fail (GDM_IS_USER (user1), 0); - g_return_val_if_fail (GDM_IS_USER (user2), 0); - - num1 = user1->login_frequency; - num2 = user2->login_frequency; - - if (num1 > num2) { - return -1; - } - - if (num1 < num2) { - return 1; - } - - - len1 = g_list_length (user1->sessions); - len2 = g_list_length (user2->sessions); - - if (len1 > len2) { - return -1; - } - - if (len1 < len2) { - return 1; - } - - /* if login frequency is equal try names */ - if (user1->real_name != NULL) { - str1 = user1->real_name; - } else { - str1 = user1->user_name; - } - - if (user2->real_name != NULL) { - str2 = user2->real_name; - } else { - str2 = user2->user_name; - } - - if (str1 == NULL && str2 != NULL) { - return -1; - } - - if (str1 != NULL && str2 == NULL) { - return 1; - } - - if (str1 == NULL && str2 == NULL) { - return 0; - } - - return g_utf8_collate (str1, str2); -} - -static gboolean -check_user_file (const char *filename) -{ - gssize max_file_size = MAX_FILE_SIZE; - struct stat fileinfo; - - /* Exists/Readable? */ - if (stat (filename, &fileinfo) < 0) { - return FALSE; - } - - /* Is a regular file */ - if (G_UNLIKELY (!S_ISREG (fileinfo.st_mode))) { - return FALSE; - } - - /* Size is kosher? */ - if (G_UNLIKELY (fileinfo.st_size > max_file_size)) { - return FALSE; - } - - return TRUE; -} - -static void -rounded_rectangle (cairo_t *cr, - gdouble aspect, - gdouble x, - gdouble y, - gdouble corner_radius, - gdouble width, - gdouble height) -{ - gdouble radius; - gdouble degrees; - - radius = corner_radius / aspect; - degrees = G_PI / 180.0; - - cairo_new_sub_path (cr); - cairo_arc (cr, - x + width - radius, - y + radius, - radius, - -90 * degrees, - 0 * degrees); - cairo_arc (cr, - x + width - radius, - y + height - radius, - radius, - 0 * degrees, - 90 * degrees); - cairo_arc (cr, - x + radius, - y + height - radius, - radius, - 90 * degrees, - 180 * degrees); - cairo_arc (cr, - x + radius, - y + radius, - radius, - 180 * degrees, - 270 * degrees); - cairo_close_path (cr); -} - -static cairo_surface_t * -surface_from_pixbuf (GdkPixbuf *pixbuf) -{ - cairo_surface_t *surface; - cairo_t *cr; - - surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ? - CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf)); - cr = cairo_create (surface); - gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); - cairo_paint (cr); - cairo_destroy (cr); - - return surface; -} - -/** - * go_cairo_convert_data_to_pixbuf: - * @src: a pointer to pixel data in cairo format - * @dst: a pointer to pixel data in pixbuf format - * @width: image width - * @height: image height - * @rowstride: data rowstride - * - * Converts the pixel data stored in @src in CAIRO_FORMAT_ARGB32 cairo format - * to GDK_COLORSPACE_RGB pixbuf format and move them - * to @dst. If @src == @dst, pixel are converted in place. - **/ - -static void -go_cairo_convert_data_to_pixbuf (unsigned char *dst, - unsigned char const *src, - int width, - int height, - int rowstride) -{ - int i,j; - unsigned int t; - unsigned char a, b, c; - - g_return_if_fail (dst != NULL); - -#define MULT(d,c,a,t) G_STMT_START { t = (a)? c * 255 / a: 0; d = t;} G_STMT_END - - if (src == dst || src == NULL) { - for (i = 0; i < height; i++) { - for (j = 0; j < width; j++) { -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - MULT(a, dst[2], dst[3], t); - MULT(b, dst[1], dst[3], t); - MULT(c, dst[0], dst[3], t); - dst[0] = a; - dst[1] = b; - dst[2] = c; -#else - MULT(a, dst[1], dst[0], t); - MULT(b, dst[2], dst[0], t); - MULT(c, dst[3], dst[0], t); - dst[3] = dst[0]; - dst[0] = a; - dst[1] = b; - dst[2] = c; -#endif - dst += 4; - } - dst += rowstride - width * 4; - } - } else { - for (i = 0; i < height; i++) { - for (j = 0; j < width; j++) { -#if G_BYTE_ORDER == G_LITTLE_ENDIAN - MULT(dst[0], src[2], src[3], t); - MULT(dst[1], src[1], src[3], t); - MULT(dst[2], src[0], src[3], t); - dst[3] = src[3]; -#else - MULT(dst[0], src[1], src[0], t); - MULT(dst[1], src[2], src[0], t); - MULT(dst[2], src[3], src[0], t); - dst[3] = src[0]; -#endif - src += 4; - dst += 4; - } - src += rowstride - width * 4; - dst += rowstride - width * 4; - } - } -#undef MULT -} - -static void -cairo_to_pixbuf (guint8 *src_data, - GdkPixbuf *dst_pixbuf) -{ - unsigned char *src; - unsigned char *dst; - guint w; - guint h; - guint rowstride; - - w = gdk_pixbuf_get_width (dst_pixbuf); - h = gdk_pixbuf_get_height (dst_pixbuf); - rowstride = gdk_pixbuf_get_rowstride (dst_pixbuf); - - dst = gdk_pixbuf_get_pixels (dst_pixbuf); - src = src_data; - - go_cairo_convert_data_to_pixbuf (dst, src, w, h, rowstride); -} - -static GdkPixbuf * -frame_pixbuf (GdkPixbuf *source) -{ - GdkPixbuf *dest; - cairo_t *cr; - cairo_surface_t *surface; - guint w; - guint h; - guint rowstride; - int frame_width; - double radius; - guint8 *data; - - frame_width = 2; - - w = gdk_pixbuf_get_width (source) + frame_width * 2; - h = gdk_pixbuf_get_height (source) + frame_width * 2; - radius = w / 10; - - dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - TRUE, - 8, - w, - h); - rowstride = gdk_pixbuf_get_rowstride (dest); - - - data = g_new0 (guint8, h * rowstride); - - surface = cairo_image_surface_create_for_data (data, - CAIRO_FORMAT_ARGB32, - w, - h, - rowstride); - cr = cairo_create (surface); - cairo_surface_destroy (surface); - - /* set up image */ - cairo_rectangle (cr, 0, 0, w, h); - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0); - cairo_fill (cr); - - rounded_rectangle (cr, - 1.0, - frame_width + 0.5, - frame_width + 0.5, - radius, - w - frame_width * 2 - 1, - h - frame_width * 2 - 1); - cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3); - cairo_fill_preserve (cr); - - surface = surface_from_pixbuf (source); - cairo_set_source_surface (cr, surface, frame_width, frame_width); - cairo_fill (cr); - cairo_surface_destroy (surface); - - cairo_to_pixbuf (data, dest); - - cairo_destroy (cr); - g_free (data); - - return dest; -} - -/** - * gdm_user_is_logged_in: - * @user: a #GdmUser - * - * Returns whether or not #GdmUser is currently logged in. - * - * Returns: %TRUE or %FALSE - */ -gboolean -gdm_user_is_logged_in (GdmUser *user) -{ - return user->sessions != NULL; -} - -/** - * gdm_user_render_icon: - * @user: a #GdmUser - * @icon_size: the size to render the icon at - * - * Returns a #GdkPixbuf of the account icon belonging to @user - * at the pixel size specified by @icon_size. - * - * Returns: (transfer full): a #GdkPixbuf - */ -GdkPixbuf * -gdm_user_render_icon (GdmUser *user, - gint icon_size) -{ - GdkPixbuf *pixbuf; - GdkPixbuf *framed; - gboolean res; - GError *error; - - g_return_val_if_fail (GDM_IS_USER (user), NULL); - g_return_val_if_fail (icon_size > 12, NULL); - - pixbuf = NULL; - if (user->icon_file) { - res = check_user_file (user->icon_file); - if (res) { - pixbuf = gdk_pixbuf_new_from_file_at_size (user->icon_file, - icon_size, - icon_size, - NULL); - } else { - pixbuf = NULL; - } - } - - if (pixbuf != NULL) { - goto out; - } - - error = NULL; - pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - - "avatar-default", - icon_size, - GTK_ICON_LOOKUP_FORCE_SIZE, - &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } - out: - - if (pixbuf != NULL) { - framed = frame_pixbuf (pixbuf); - if (framed != NULL) { - g_object_unref (pixbuf); - pixbuf = framed; - } - } - - return pixbuf; -} - -/** - * gdm_user_get_icon_file: - * @user: a #GdmUser - * - * Returns the path to the account icon belonging to @user. - * - * Returns: (transfer none): a path to an icon - */ -const char * -gdm_user_get_icon_file (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), NULL); - - return user->icon_file; -} - -/** - * gdm_user_get_object_path: - * @user: a #GdmUser - * - * Returns the user accounts service object path of @user, - * or %NULL if @user doesn't have an object path associated - * with it. - * - * Returns: (transfer none): the primary ConsoleKit session id of the user - */ -const char * -gdm_user_get_object_path (GdmUser *user) -{ - g_return_val_if_fail (GDM_IS_USER (user), NULL); - - return user->object_path; -} - -/** - * gdm_user_get_primary_session_id: - * @user: a #GdmUser - * - * Returns the primary ConsoleKit session id of @user, or %NULL if @user isn't - * logged in. - * - * Returns: (transfer none): the primary ConsoleKit session id of the user - */ -const char * -gdm_user_get_primary_session_id (GdmUser *user) -{ - if (!gdm_user_is_logged_in (user)) { - g_debug ("User %s is not logged in, so has no primary session", - gdm_user_get_user_name (user)); - return NULL; - } - - /* FIXME: better way to choose? */ - return user->sessions->data; -} - -static void -collect_props (const gchar *key, - const GValue *value, - GdmUser *user) -{ - gboolean handled = TRUE; - - if (strcmp (key, "Uid") == 0) { - user->uid = g_value_get_uint64 (value); - } else if (strcmp (key, "UserName") == 0) { - g_free (user->user_name); - user->user_name = g_value_dup_string (value); - } else if (strcmp (key, "RealName") == 0) { - g_free (user->real_name); - user->real_name = g_value_dup_string (value); - } else if (strcmp (key, "AccountType") == 0) { - /* ignore */ - } else if (strcmp (key, "Email") == 0) { - /* ignore */ - } else if (strcmp (key, "Language") == 0) { - /* ignore */ - } else if (strcmp (key, "Location") == 0) { - /* ignore */ - } else if (strcmp (key, "LoginFrequency") == 0) { - user->login_frequency = g_value_get_uint64 (value); - } else if (strcmp (key, "IconFile") == 0) { - gboolean res; - - g_free (user->icon_file); - user->icon_file = g_value_dup_string (value); - - res = check_user_file (user->icon_file); - if (!res) { - g_free (user->icon_file); - user->icon_file = g_build_filename (GLOBAL_FACEDIR, user->user_name, NULL); - } - } else if (strcmp (key, "Locked") == 0) { - /* ignore */ - } else if (strcmp (key, "AutomaticLogin") == 0) { - /* ignore */ - } else if (strcmp (key, "PasswordMode") == 0) { - /* ignore */ - } else if (strcmp (key, "PasswordHint") == 0) { - /* ignore */ - } else if (strcmp (key, "HomeDirectory") == 0) { - /* ignore */ - } else if (strcmp (key, "Shell") == 0) { - /* ignore */ - } else { - handled = FALSE; - } - - if (!handled) { - g_debug ("unhandled property %s", key); - } -} - -static void -on_get_all_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUser *user) -{ - GError *error; - GHashTable *hash_table; - gboolean res; - - g_assert (user->get_all_call == call); - g_assert (user->object_proxy == proxy); - - error = NULL; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), - &hash_table, - G_TYPE_INVALID); - user->get_all_call = NULL; - user->object_proxy = NULL; - - if (! res) { - g_debug ("Error calling GetAll() when retrieving properties for %s: %s", - user->object_path, error->message); - g_error_free (error); - goto out; - } - g_hash_table_foreach (hash_table, (GHFunc) collect_props, user); - g_hash_table_unref (hash_table); - - if (!user->is_loaded) { - set_is_loaded (user, TRUE); - } - - g_signal_emit (user, signals[CHANGED], 0); - -out: - g_object_unref (proxy); -} - -static gboolean -update_info (GdmUser *user) -{ - DBusGProxy *proxy; - DBusGProxyCall *call; - - proxy = dbus_g_proxy_new_for_name (user->connection, - ACCOUNTS_NAME, - user->object_path, - DBUS_INTERFACE_PROPERTIES); - - call = dbus_g_proxy_begin_call (proxy, - "GetAll", - (DBusGProxyCallNotify) - on_get_all_finished, - user, - NULL, - G_TYPE_STRING, - ACCOUNTS_USER_INTERFACE, - G_TYPE_INVALID); - - if (call == NULL) { - g_warning ("GdmUser: failed to make GetAll call"); - goto failed; - } - - user->get_all_call = call; - user->object_proxy = proxy; - return TRUE; - -failed: - if (proxy != NULL) { - g_object_unref (proxy); - } - - return FALSE; -} - -static void -changed_handler (DBusGProxy *proxy, - gpointer *data) -{ - GdmUser *user = GDM_USER (data); - - update_info (user); -} - -/** - * _gdm_user_update_from_object_path: - * @user: the user object to update. - * @object_path: the object path of the user to use. - * - * Updates the properties of @user from the accounts service via - * the object path in @object_path. - **/ -void -_gdm_user_update_from_object_path (GdmUser *user, - const char *object_path) -{ - g_return_if_fail (GDM_IS_USER (user)); - g_return_if_fail (object_path != NULL); - g_return_if_fail (user->object_path == NULL); - - user->object_path = g_strdup (object_path); - - user->accounts_proxy = dbus_g_proxy_new_for_name (user->connection, - ACCOUNTS_NAME, - user->object_path, - ACCOUNTS_USER_INTERFACE); - dbus_g_proxy_set_default_timeout (user->accounts_proxy, INT_MAX); - dbus_g_proxy_add_signal (user->accounts_proxy, "Changed", G_TYPE_INVALID); - - dbus_g_proxy_connect_signal (user->accounts_proxy, "Changed", - G_CALLBACK (changed_handler), user, NULL); - - if (!update_info (user)) { - g_warning ("Couldn't update info for user with object path %s", object_path); - } -} - -/** - * gdm_user_is_loaded: - * @user: a #GdmUser - * - * Determines whether or not the user object is loaded and ready to read from. - * #GdmUserManager:is-loaded property must be %TRUE before calling - * gdm_user_manager_list_users() - * - * Returns: %TRUE or %FALSE - */ -gboolean -gdm_user_is_loaded (GdmUser *user) -{ - return user->is_loaded; -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user-chooser-widget.c gdm-3.0.0/gui/simple-greeter/gdm-user-chooser-widget.c --- gdm-2.32.1/gui/simple-greeter/gdm-user-chooser-widget.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user-chooser-widget.c 2011-04-04 14:37:16.000000000 +0000 @@ -37,7 +37,9 @@ #include -#include "gdm-user-manager.h" +#include +#include + #include "gdm-user-chooser-widget.h" #include "gdm-settings-keys.h" #include "gdm-settings-client.h" @@ -59,7 +61,7 @@ struct GdmUserChooserWidgetPrivate { - GdmUserManager *manager; + ActUserManager *manager; GtkIconTheme *icon_theme; GSList *users_to_add; @@ -170,45 +172,326 @@ } static void +rounded_rectangle (cairo_t *cr, + gdouble aspect, + gdouble x, + gdouble y, + gdouble corner_radius, + gdouble width, + gdouble height) +{ + gdouble radius; + gdouble degrees; + + radius = corner_radius / aspect; + degrees = G_PI / 180.0; + + cairo_new_sub_path (cr); + cairo_arc (cr, + x + width - radius, + y + radius, + radius, + -90 * degrees, + 0 * degrees); + cairo_arc (cr, + x + width - radius, + y + height - radius, + radius, + 0 * degrees, + 90 * degrees); + cairo_arc (cr, + x + radius, + y + height - radius, + radius, + 90 * degrees, + 180 * degrees); + cairo_arc (cr, + x + radius, + y + radius, + radius, + 180 * degrees, + 270 * degrees); + cairo_close_path (cr); +} + +static cairo_surface_t * +surface_from_pixbuf (GdkPixbuf *pixbuf) +{ + cairo_surface_t *surface; + cairo_t *cr; + + surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ? + CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, + gdk_pixbuf_get_width (pixbuf), + gdk_pixbuf_get_height (pixbuf)); + cr = cairo_create (surface); + gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + + return surface; +} + +/** + * go_cairo_convert_data_to_pixbuf: + * @src: a pointer to pixel data in cairo format + * @dst: a pointer to pixel data in pixbuf format + * @width: image width + * @height: image height + * @rowstride: data rowstride + * + * Converts the pixel data stored in @src in CAIRO_FORMAT_ARGB32 cairo format + * to GDK_COLORSPACE_RGB pixbuf format and move them + * to @dst. If @src == @dst, pixel are converted in place. + **/ + +static void +go_cairo_convert_data_to_pixbuf (unsigned char *dst, + unsigned char const *src, + int width, + int height, + int rowstride) +{ + int i,j; + unsigned int t; + unsigned char a, b, c; + + g_return_if_fail (dst != NULL); + +#define MULT(d,c,a,t) G_STMT_START { t = (a)? c * 255 / a: 0; d = t;} G_STMT_END + + if (src == dst || src == NULL) { + for (i = 0; i < height; i++) { + for (j = 0; j < width; j++) { +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + MULT(a, dst[2], dst[3], t); + MULT(b, dst[1], dst[3], t); + MULT(c, dst[0], dst[3], t); + dst[0] = a; + dst[1] = b; + dst[2] = c; +#else + MULT(a, dst[1], dst[0], t); + MULT(b, dst[2], dst[0], t); + MULT(c, dst[3], dst[0], t); + dst[3] = dst[0]; + dst[0] = a; + dst[1] = b; + dst[2] = c; +#endif + dst += 4; + } + dst += rowstride - width * 4; + } + } else { + for (i = 0; i < height; i++) { + for (j = 0; j < width; j++) { +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + MULT(dst[0], src[2], src[3], t); + MULT(dst[1], src[1], src[3], t); + MULT(dst[2], src[0], src[3], t); + dst[3] = src[3]; +#else + MULT(dst[0], src[1], src[0], t); + MULT(dst[1], src[2], src[0], t); + MULT(dst[2], src[3], src[0], t); + dst[3] = src[0]; +#endif + src += 4; + dst += 4; + } + src += rowstride - width * 4; + dst += rowstride - width * 4; + } + } +#undef MULT +} + +static void +cairo_to_pixbuf (guint8 *src_data, + GdkPixbuf *dst_pixbuf) +{ + unsigned char *src; + unsigned char *dst; + guint w; + guint h; + guint rowstride; + + w = gdk_pixbuf_get_width (dst_pixbuf); + h = gdk_pixbuf_get_height (dst_pixbuf); + rowstride = gdk_pixbuf_get_rowstride (dst_pixbuf); + + dst = gdk_pixbuf_get_pixels (dst_pixbuf); + src = src_data; + + go_cairo_convert_data_to_pixbuf (dst, src, w, h, rowstride); +} + +static GdkPixbuf * +frame_pixbuf (GdkPixbuf *source) +{ + GdkPixbuf *dest; + cairo_t *cr; + cairo_surface_t *surface; + guint w; + guint h; + guint rowstride; + int frame_width; + double radius; + guint8 *data; + + frame_width = 2; + + w = gdk_pixbuf_get_width (source) + frame_width * 2; + h = gdk_pixbuf_get_height (source) + frame_width * 2; + radius = w / 10; + + dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + TRUE, + 8, + w, + h); + rowstride = gdk_pixbuf_get_rowstride (dest); + + + data = g_new0 (guint8, h * rowstride); + + surface = cairo_image_surface_create_for_data (data, + CAIRO_FORMAT_ARGB32, + w, + h, + rowstride); + cr = cairo_create (surface); + cairo_surface_destroy (surface); + + /* set up image */ + cairo_rectangle (cr, 0, 0, w, h); + cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0); + cairo_fill (cr); + + rounded_rectangle (cr, + 1.0, + frame_width + 0.5, + frame_width + 0.5, + radius, + w - frame_width * 2 - 1, + h - frame_width * 2 - 1); + cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3); + cairo_fill_preserve (cr); + + surface = surface_from_pixbuf (source); + cairo_set_source_surface (cr, surface, frame_width, frame_width); + cairo_fill (cr); + cairo_surface_destroy (surface); + + cairo_to_pixbuf (data, dest); + + cairo_destroy (cr); + g_free (data); + + return dest; +} + +static GdkPixbuf * +render_user_icon (GdmUserChooserWidget *widget, + ActUser *user) +{ + int size; + const char *file; + GdkPixbuf *pixbuf; + GdkPixbuf *framed; + + pixbuf = NULL; + + size = get_icon_height_for_widget (GTK_WIDGET (widget)); + file = act_user_get_icon_file (user); + + if (file) { + pixbuf = gdk_pixbuf_new_from_file_at_size (file, size, size, NULL); + } + + if (pixbuf == NULL) { + GError *error; + + error = NULL; + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), + "avatar-default", + size, + GTK_ICON_LOOKUP_FORCE_SIZE, + &error); + if (error != NULL) { + g_warning ("%s", error->message); + g_error_free (error); + } + } + + if (pixbuf != NULL) { + framed = frame_pixbuf (pixbuf); + g_object_unref (pixbuf); + + pixbuf = framed; + } + + return pixbuf; +} + +static void update_item_for_user (GdmUserChooserWidget *widget, - GdmUser *user) + ActUser *user) { GdkPixbuf *pixbuf; char *tooltip; gboolean is_logged_in; - int size; char *escaped_username; + const char *real_name; char *escaped_real_name; - if (!gdm_user_is_loaded (user)) { + if (!act_user_is_loaded (user)) { return; } - size = get_icon_height_for_widget (GTK_WIDGET (widget)); - pixbuf = gdm_user_render_icon (user, size); + pixbuf = render_user_icon (widget, user); if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) { pixbuf = g_object_ref (widget->priv->stock_person_pixbuf); } tooltip = g_strdup_printf (_("Log in as %s"), - gdm_user_get_user_name (user)); + act_user_get_user_name (user)); - is_logged_in = gdm_user_is_logged_in (user); + is_logged_in = act_user_is_logged_in (user); g_debug ("GdmUserChooserWidget: User added name:%s logged-in:%d pixbuf:%p", - gdm_user_get_user_name (user), + act_user_get_user_name (user), is_logged_in, pixbuf); - escaped_username = g_markup_escape_text (gdm_user_get_user_name (user), -1); - escaped_real_name = g_markup_escape_text (gdm_user_get_real_name (user), -1); + escaped_username = g_markup_escape_text (act_user_get_user_name (user), -1); + + real_name = act_user_get_real_name (user); + if (real_name == NULL || real_name[0] == '\0') { + real_name = act_user_get_user_name (user); + } + escaped_real_name = g_markup_escape_text (real_name, -1); + + /* Ignore updates we aren't interested in */ + if (!gdm_chooser_widget_lookup_item (GDM_CHOOSER_WIDGET (widget), + escaped_username, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL)) { + return; + } + gdm_chooser_widget_update_item (GDM_CHOOSER_WIDGET (widget), escaped_username, pixbuf, escaped_real_name, tooltip, - gdm_user_get_login_frequency (user), + act_user_get_login_frequency (user), is_logged_in, FALSE); g_free (escaped_real_name); @@ -225,7 +508,7 @@ const char *id, GdmUserChooserWidget *user_chooser) { - GdmUser *user; + ActUser *user; g_debug ("GdmUserChooserWidget: Loading item for id=%s", id); @@ -241,7 +524,7 @@ return; } - user = gdm_user_manager_get_user (user_chooser->priv->manager, id); + user = act_user_manager_get_user (user_chooser->priv->manager, id); if (user != NULL) { update_item_for_user (user_chooser, user); } @@ -467,33 +750,52 @@ static void add_user (GdmUserChooserWidget *widget, - GdmUser *user) + ActUser *user) { GdkPixbuf *pixbuf; char *tooltip; gboolean is_logged_in; char *escaped_username; + const char *real_name; char *escaped_real_name; if (!widget->priv->show_normal_users) { return; } - pixbuf = g_object_ref (widget->priv->stock_person_pixbuf); + if (strcmp (act_user_get_user_name (user), GDM_USERNAME) == 0) { + return; + } + + if (act_user_get_uid (user) == 0) { + return; + } + + g_debug ("GdmUserChooserWidget: User added: %s", act_user_get_user_name (user)); + if (widget->priv->stock_person_pixbuf != NULL) { + pixbuf = g_object_ref (widget->priv->stock_person_pixbuf); + } else { + pixbuf = NULL; + } tooltip = g_strdup_printf (_("Log in as %s"), - gdm_user_get_user_name (user)); + act_user_get_user_name (user)); - is_logged_in = gdm_user_is_logged_in (user); + is_logged_in = act_user_is_logged_in (user); + + escaped_username = g_markup_escape_text (act_user_get_user_name (user), -1); + real_name = act_user_get_real_name (user); + if (real_name == NULL || real_name[0] == '\0') { + real_name = act_user_get_user_name (user); + } + escaped_real_name = g_markup_escape_text (real_name, -1); - escaped_username = g_markup_escape_text (gdm_user_get_user_name (user), -1); - escaped_real_name = g_markup_escape_text (gdm_user_get_real_name (user), -1); gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget), escaped_username, pixbuf, escaped_real_name, tooltip, - gdm_user_get_login_frequency (user), + act_user_get_login_frequency (user), is_logged_in, FALSE, (GdmChooserWidgetItemLoadFunc) on_item_load, @@ -510,8 +812,8 @@ } static void -on_user_added (GdmUserManager *manager, - GdmUser *user, +on_user_added (ActUserManager *manager, + ActUser *user, GdmUserChooserWidget *widget) { /* wait for all users to be loaded */ @@ -522,19 +824,31 @@ } static void -on_user_removed (GdmUserManager *manager, - GdmUser *user, +on_user_removed (ActUserManager *manager, + ActUser *user, GdmUserChooserWidget *widget) { const char *user_name; - g_debug ("GdmUserChooserWidget: User removed: %s", gdm_user_get_user_name (user)); + g_debug ("GdmUserChooserWidget: User removed: %s", act_user_get_user_name (user)); /* wait for all users to be loaded */ if (! widget->priv->loaded) { return; } - user_name = gdm_user_get_user_name (user); + user_name = act_user_get_user_name (user); + + /* Ignore removals we aren't interested in */ + if (!gdm_chooser_widget_lookup_item (GDM_CHOOSER_WIDGET (widget), + user_name, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL)) { + return; + } gdm_chooser_widget_remove_item (GDM_CHOOSER_WIDGET (widget), user_name); @@ -543,17 +857,17 @@ } static void -on_user_is_logged_in_changed (GdmUserManager *manager, - GdmUser *user, +on_user_is_logged_in_changed (ActUserManager *manager, + ActUser *user, GdmUserChooserWidget *widget) { const char *user_name; gboolean is_logged_in; - g_debug ("GdmUserChooserWidget: User logged in changed: %s", gdm_user_get_user_name (user)); + g_debug ("GdmUserChooserWidget: User logged in changed: %s", act_user_get_user_name (user)); - user_name = gdm_user_get_user_name (user); - is_logged_in = gdm_user_is_logged_in (user); + user_name = act_user_get_user_name (user); + is_logged_in = act_user_is_logged_in (user); gdm_chooser_widget_set_item_in_use (GDM_CHOOSER_WIDGET (widget), user_name, @@ -561,8 +875,8 @@ } static void -on_user_changed (GdmUserManager *manager, - GdmUser *user, +on_user_changed (ActUserManager *manager, + ActUser *user, GdmUserChooserWidget *widget) { /* wait for all users to be loaded */ @@ -596,7 +910,12 @@ gdm_chooser_widget_loaded (GDM_CHOOSER_WIDGET (widget)); } - return (widget->priv->users_to_add != NULL); + if (widget->priv->users_to_add == NULL) { + widget->priv->add_users_idle_id = 0; + return FALSE; + } + + return TRUE; } static void @@ -608,7 +927,7 @@ } static void -on_is_loaded_changed (GdmUserManager *manager, +on_is_loaded_changed (ActUserManager *manager, GParamSpec *pspec, GdmUserChooserWidget *widget) { @@ -618,7 +937,7 @@ g_debug ("GdmUserChooserWidget: Users loaded"); - users = gdm_user_manager_list_users (manager); + users = act_user_manager_list_users (manager); g_slist_foreach (users, (GFunc) g_object_ref, NULL); widget->priv->users_to_add = g_slist_concat (widget->priv->users_to_add, g_slist_copy (users)); @@ -654,38 +973,7 @@ { if (widget->priv->show_normal_users) { - char *temp; - gboolean res; - gboolean include_all; - GSList *includes; - GSList *excludes; - - widget->priv->manager = gdm_user_manager_ref_default (); - - /* exclude/include */ - g_debug ("Setting users to include:"); - res = gdm_settings_client_get_string (GDM_KEY_INCLUDE, - &temp); - parse_string_list (temp, &includes); - - g_debug ("Setting users to exclude:"); - res = gdm_settings_client_get_string (GDM_KEY_EXCLUDE, - &temp); - parse_string_list (temp, &excludes); - - include_all = FALSE; - res = gdm_settings_client_get_boolean (GDM_KEY_INCLUDE_ALL, - &include_all); - g_object_set (widget->priv->manager, - "include-all", include_all, - "include-usernames-list", includes, - "exclude-usernames-list", excludes, - NULL); - - g_slist_foreach (includes, (GFunc) g_free, NULL); - g_slist_free (includes); - g_slist_foreach (excludes, (GFunc) g_free, NULL); - g_slist_free (excludes); + widget->priv->manager = act_user_manager_get_default (); g_signal_connect (widget->priv->manager, "user-added", @@ -707,7 +995,6 @@ "user-changed", G_CALLBACK (on_user_changed), widget); - gdm_user_manager_queue_load (widget->priv->manager); } else { gdm_chooser_widget_loaded (GDM_CHOOSER_WIDGET (widget)); } @@ -829,6 +1116,9 @@ int size; const char *icon_name; va_list argument_list; + gint *sizes; + gint candidate_size; + int i; array = g_ptr_array_new (); @@ -845,9 +1135,29 @@ size = get_icon_height_for_widget (GTK_WIDGET (widget)); + sizes = gtk_icon_theme_get_icon_sizes (widget->priv->icon_theme, first_name); + + candidate_size = 0; + for (i = 0; sizes[i] != 0; i++) { + + /* scalable */ + if (sizes[i] == -1) { + candidate_size = sizes[i]; + break; + } + + if (ABS (size - sizes[i]) < ABS (size - candidate_size)) { + candidate_size = sizes[i]; + } + } + + if (candidate_size == 0) { + candidate_size = size; + } + icon_info = gtk_icon_theme_choose_icon (widget->priv->icon_theme, (const char **) array->pdata, - size, + candidate_size, GTK_ICON_LOOKUP_GENERIC_FALLBACK); g_ptr_array_free (array, FALSE); @@ -864,8 +1174,16 @@ g_error_free (error); } } else { + GdkPixbuf *scaled_pixbuf; + + guchar pixel = 0x00000000; + g_warning ("Could not find icon '%s' or fallbacks", first_name); - pixbuf = NULL; + pixbuf = gdk_pixbuf_new_from_data (&pixel, GDK_COLORSPACE_RGB, + TRUE, 8, 1, 1, 1, NULL, NULL); + scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, size, size, GDK_INTERP_NEAREST); + g_object_unref (pixbuf); + pixbuf = scaled_pixbuf; } return pixbuf; @@ -914,7 +1232,14 @@ IconUpdateData *data) { if (data->old_icon == *image) { + if (*image != NULL) { + g_object_unref (*image); + } *image = data->new_icon; + + if (*image != NULL) { + g_object_ref (*image); + } return TRUE; } diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user.h gdm-3.0.0/gui/simple-greeter/gdm-user.h --- gdm-2.32.1/gui/simple-greeter/gdm-user.h 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * Copyright (C) 2007-2008 William Jon McCann - * - * 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 - */ - -/* - * Facade object for user data, owned by GdmUserManager - */ - -#ifndef __GDM_USER_H__ -#define __GDM_USER_H__ - -#include -#include -#include - -G_BEGIN_DECLS - -#define GDM_TYPE_USER (gdm_user_get_type ()) -#define GDM_USER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_USER, GdmUser)) -#define GDM_IS_USER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_USER)) - -typedef struct _GdmUser GdmUser; -typedef struct _GdmUserClass GdmUserClass; - -GType gdm_user_get_type (void) G_GNUC_CONST; - -GdmUser *gdm_user_new_from_object_path (const char *path); -const char *gdm_user_get_object_path (GdmUser *user); - -gulong gdm_user_get_uid (GdmUser *user); -const char *gdm_user_get_user_name (GdmUser *user); -const char *gdm_user_get_real_name (GdmUser *user); -guint gdm_user_get_num_sessions (GdmUser *user); -gboolean gdm_user_is_logged_in (GdmUser *user); -gulong gdm_user_get_login_frequency (GdmUser *user); -const char *gdm_user_get_icon_file (GdmUser *user); -const char *gdm_user_get_primary_session_id (GdmUser *user); - -GdkPixbuf *gdm_user_render_icon (GdmUser *user, - gint icon_size); - -gint gdm_user_collate (GdmUser *user1, - GdmUser *user2); -gboolean gdm_user_is_loaded (GdmUser *user); - -G_END_DECLS - -#endif diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user-manager.c gdm-3.0.0/gui/simple-greeter/gdm-user-manager.c --- gdm-2.32.1/gui/simple-greeter/gdm-user-manager.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user-manager.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,3082 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007-2008 William Jon McCann - * - * 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. - * - */ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_PATHS_H -#include -#endif /* HAVE_PATHS_H */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "gdm-user-manager.h" -#include "gdm-user-private.h" - -#define GDM_USER_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_USER_MANAGER, GdmUserManagerPrivate)) - -#define CK_NAME "org.freedesktop.ConsoleKit" - -#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" -#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" -#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" -#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" - -#define GDM_DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH)) - -/* Prefs Defaults */ - -#ifdef __sun -#define FALLBACK_MINIMAL_UID 100 -#else -#define FALLBACK_MINIMAL_UID 500 -#endif - -#ifndef _PATH_SHELLS -#define _PATH_SHELLS "/etc/shells" -#endif -#define PATH_PASSWD "/etc/passwd" - -#ifndef GDM_USERNAME -#define GDM_USERNAME "gdm" -#endif - -#define RELOAD_PASSWD_THROTTLE_SECS 5 - -/* approximately two months */ -#define LOGIN_FREQUENCY_TIME_WINDOW_SECS (60 * 24 * 60 * 60) - -#define ACCOUNTS_NAME "org.freedesktop.Accounts" -#define ACCOUNTS_PATH "/org/freedesktop/Accounts" -#define ACCOUNTS_INTERFACE "org.freedesktop.Accounts" - -typedef enum { - GDM_USER_MANAGER_SEAT_STATE_UNLOADED = 0, - GDM_USER_MANAGER_SEAT_STATE_GET_SESSION_ID, - GDM_USER_MANAGER_SEAT_STATE_GET_ID, - GDM_USER_MANAGER_SEAT_STATE_GET_PROXY, - GDM_USER_MANAGER_SEAT_STATE_LOADED, -} GdmUserManagerSeatState; - -typedef struct -{ - GdmUserManagerSeatState state; - char *id; - char *session_id; - union { - DBusGProxyCall *get_current_session_call; - DBusGProxyCall *get_seat_id_call; - }; - - DBusGProxy *proxy; -} GdmUserManagerSeat; - -typedef enum { - GDM_USER_MANAGER_NEW_SESSION_STATE_UNLOADED = 0, - GDM_USER_MANAGER_NEW_SESSION_STATE_GET_PROXY, - GDM_USER_MANAGER_NEW_SESSION_STATE_GET_UID, - GDM_USER_MANAGER_NEW_SESSION_STATE_GET_X11_DISPLAY, - GDM_USER_MANAGER_NEW_SESSION_STATE_MAYBE_ADD, - GDM_USER_MANAGER_NEW_SESSION_STATE_LOADED, -} GdmUserManagerNewSessionState; - -typedef struct -{ - GdmUserManager *manager; - GdmUserManagerNewSessionState state; - char *id; - - union { - DBusGProxyCall *get_unix_user_call; - DBusGProxyCall *get_x11_display_call; - }; - - DBusGProxy *proxy; - - uid_t uid; - char *x11_display; -} GdmUserManagerNewSession; - -typedef enum { - GDM_USER_MANAGER_GET_USER_STATE_UNFETCHED = 0, - GDM_USER_MANAGER_GET_USER_STATE_WAIT_FOR_LOADED, - GDM_USER_MANAGER_GET_USER_STATE_ASK_ACCOUNTS_SERVICE, - GDM_USER_MANAGER_GET_USER_STATE_FETCHED -} GdmUserManagerGetUserState; - -typedef struct -{ - GdmUserManager *manager; - GdmUserManagerGetUserState state; - GdmUser *user; - char *username; - char *object_path; - - DBusGProxyCall *call; -} GdmUserManagerFetchUserRequest; - -struct GdmUserManagerPrivate -{ - GHashTable *users_by_name; - GHashTable *users_by_object_path; - GHashTable *sessions; - GHashTable *shells; - DBusGConnection *connection; - DBusGProxyCall *get_sessions_call; - DBusGProxy *accounts_proxy; - - GdmUserManagerSeat seat; - - GSList *new_sessions; - GSList *new_users; - GSList *fetch_user_requests; - - GFileMonitor *passwd_monitor; - GFileMonitor *shells_monitor; - - GSList *exclude_usernames; - GSList *include_usernames; - gboolean include_all; - - gboolean load_passwd_pending; - - guint load_id; - guint reload_passwd_id; - guint ck_history_id; - guint ck_history_watchdog_id; - GPid ck_history_pid; - - gboolean is_loaded; - gboolean has_multiple_users; - gboolean listing_cached_users; -}; - -enum { - PROP_0, - PROP_INCLUDE_ALL, - PROP_INCLUDE_USERNAMES_LIST, - PROP_EXCLUDE_USERNAMES_LIST, - PROP_IS_LOADED, - PROP_HAS_MULTIPLE_USERS -}; - -enum { - USER_ADDED, - USER_REMOVED, - USER_IS_LOGGED_IN_CHANGED, - USER_CHANGED, - LAST_SIGNAL -}; - -static guint signals [LAST_SIGNAL] = { 0, }; - -static void gdm_user_manager_class_init (GdmUserManagerClass *klass); -static void gdm_user_manager_init (GdmUserManager *user_manager); -static void gdm_user_manager_finalize (GObject *object); - -static void load_users_manually (GdmUserManager *manager); -static void monitor_local_users (GdmUserManager *manager); -static void load_seat_incrementally (GdmUserManager *manager); -static void unload_seat (GdmUserManager *manager); -static void load_users (GdmUserManager *manager); -static void queue_load_seat_and_users (GdmUserManager *manager); -static void monitor_local_users (GdmUserManager *manager); - -static void load_new_session_incrementally (GdmUserManagerNewSession *new_session); -static void set_is_loaded (GdmUserManager *manager, gboolean is_loaded); - -static void on_new_user_loaded (GdmUser *user, - GParamSpec *pspec, - GdmUserManager *manager); -static void give_up_and_fetch_user_locally (GdmUserManager *manager, - GdmUserManagerFetchUserRequest *request); -static void fetch_user_locally (GdmUserManager *manager, - GdmUser *user, - const char *username); -static void fetch_user_incrementally (GdmUserManagerFetchUserRequest *request); - -static void maybe_set_is_loaded (GdmUserManager *manager); -static gpointer user_manager_object = NULL; - -G_DEFINE_TYPE (GdmUserManager, gdm_user_manager, G_TYPE_OBJECT) - -GQuark -gdm_user_manager_error_quark (void) -{ - static GQuark ret = 0; - if (ret == 0) { - ret = g_quark_from_static_string ("gdm_user_manager_error"); - } - - return ret; -} - -static gboolean -start_new_login_session (GdmUserManager *manager) -{ - GError *error; - gboolean res; - - res = g_spawn_command_line_async ("gdmflexiserver -s", &error); - if (! res) { - if (error != NULL) { - g_warning ("Unable to start new login: %s", error->message); - g_error_free (error); - } else { - g_warning ("Unable to start new login"); - } - } - - return res; -} - -static gboolean -activate_session_id (GdmUserManager *manager, - const char *seat_id, - const char *session_id) -{ - DBusError local_error; - DBusMessage *message; - DBusMessage *reply; - gboolean ret; - - ret = FALSE; - reply = NULL; - - dbus_error_init (&local_error); - message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit", - seat_id, - "org.freedesktop.ConsoleKit.Seat", - "ActivateSession"); - if (message == NULL) { - goto out; - } - - if (! dbus_message_append_args (message, - DBUS_TYPE_OBJECT_PATH, &session_id, - DBUS_TYPE_INVALID)) { - goto out; - } - - - dbus_error_init (&local_error); - reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (manager->priv->connection), - message, - -1, - &local_error); - if (reply == NULL) { - if (dbus_error_is_set (&local_error)) { - g_warning ("Unable to activate session: %s", local_error.message); - dbus_error_free (&local_error); - goto out; - } - } - - ret = TRUE; - out: - if (message != NULL) { - dbus_message_unref (message); - } - if (reply != NULL) { - dbus_message_unref (reply); - } - - return ret; -} - -static gboolean -session_is_login_window (GdmUserManager *manager, - const char *session_id) -{ - DBusGProxy *proxy; - GError *error; - gboolean res; - gboolean ret; - char *session_type; - - ret = FALSE; - - proxy = dbus_g_proxy_new_for_name (manager->priv->connection, - CK_NAME, - session_id, - CK_SESSION_INTERFACE); - if (proxy == NULL) { - g_warning ("Failed to connect to the ConsoleKit seat object"); - goto out; - } - - session_type = NULL; - error = NULL; - res = dbus_g_proxy_call (proxy, - "GetSessionType", - &error, - G_TYPE_INVALID, - G_TYPE_STRING, &session_type, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_debug ("GdmUserManager: Failed to identify the session type: %s", error->message); - g_error_free (error); - } else { - g_debug ("GdmUserManager: Failed to identify the session type"); - } - goto out; - } - - if (session_type == NULL || session_type[0] == '\0' || strcmp (session_type, "LoginWindow") != 0) { - goto out; - } - - ret = TRUE; - - out: - if (proxy != NULL) { - g_object_unref (proxy); - } - - return ret; -} - -static char * -_get_login_window_session_id (GdmUserManager *manager) -{ - gboolean res; - gboolean can_activate_sessions; - GError *error; - GPtrArray *sessions; - char *primary_ssid; - int i; - - if (manager->priv->seat.id == NULL || manager->priv->seat.id[0] == '\0') { - g_debug ("GdmUserManager: display seat ID is not set; can't switch sessions"); - return NULL; - } - - primary_ssid = NULL; - sessions = NULL; - - can_activate_sessions = gdm_user_manager_can_switch (manager); - - if (! can_activate_sessions) { - g_debug ("GdmUserManager: seat is unable to activate sessions"); - goto out; - } - - error = NULL; - res = dbus_g_proxy_call (manager->priv->seat.proxy, - "GetSessions", - &error, - G_TYPE_INVALID, - dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &sessions, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_warning ("unable to determine sessions for user: %s", - error->message); - g_error_free (error); - } else { - g_warning ("unable to determine sessions for user"); - } - goto out; - } - - for (i = 0; i < sessions->len; i++) { - char *ssid; - - ssid = g_ptr_array_index (sessions, i); - - if (session_is_login_window (manager, ssid)) { - primary_ssid = g_strdup (ssid); - break; - } - } - g_ptr_array_foreach (sessions, (GFunc)g_free, NULL); - g_ptr_array_free (sessions, TRUE); - - out: - - return primary_ssid; -} - -gboolean -gdm_user_manager_goto_login_session (GdmUserManager *manager) -{ - gboolean ret; - gboolean res; - char *ssid; - - g_return_val_if_fail (GDM_IS_USER_MANAGER (manager), FALSE); - g_return_val_if_fail (manager->priv->is_loaded, FALSE); - - ret = FALSE; - - /* First look for any existing LoginWindow sessions on the seat. - If none are found, create a new one. */ - - ssid = _get_login_window_session_id (manager); - if (ssid != NULL) { - res = activate_session_id (manager, manager->priv->seat.id, ssid); - if (res) { - ret = TRUE; - } - } - - if (! ret) { - res = start_new_login_session (manager); - if (res) { - ret = TRUE; - } - } - - return ret; -} - -gboolean -gdm_user_manager_can_switch (GdmUserManager *manager) -{ - gboolean res; - gboolean can_activate_sessions; - GError *error; - - if (!manager->priv->is_loaded) { - g_debug ("GdmUserManager: Unable to switch sessions until fully loaded"); - return FALSE; - } - - if (manager->priv->seat.id == NULL || manager->priv->seat.id[0] == '\0') { - g_debug ("GdmUserManager: display seat ID is not set; can't switch sessions"); - return FALSE; - } - - g_debug ("GdmUserManager: checking if seat can activate sessions"); - - error = NULL; - res = dbus_g_proxy_call (manager->priv->seat.proxy, - "CanActivateSessions", - &error, - G_TYPE_INVALID, - G_TYPE_BOOLEAN, &can_activate_sessions, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_warning ("unable to determine if seat can activate sessions: %s", - error->message); - g_error_free (error); - } else { - g_warning ("unable to determine if seat can activate sessions"); - } - return FALSE; - } - - return can_activate_sessions; -} - -gboolean -gdm_user_manager_activate_user_session (GdmUserManager *manager, - GdmUser *user) -{ - gboolean ret; - const char *ssid; - gboolean res; - - gboolean can_activate_sessions; - g_return_val_if_fail (GDM_IS_USER_MANAGER (manager), FALSE); - g_return_val_if_fail (GDM_IS_USER (user), FALSE); - g_return_val_if_fail (manager->priv->is_loaded, FALSE); - - ret = FALSE; - - can_activate_sessions = gdm_user_manager_can_switch (manager); - - if (! can_activate_sessions) { - g_debug ("GdmUserManager: seat is unable to activate sessions"); - goto out; - } - - ssid = gdm_user_get_primary_session_id (user); - if (ssid == NULL) { - goto out; - } - - res = activate_session_id (manager, manager->priv->seat.id, ssid); - if (! res) { - g_debug ("GdmUserManager: unable to activate session: %s", ssid); - goto out; - } - - ret = TRUE; - out: - return ret; -} - -static void -on_user_sessions_changed (GdmUser *user, - GdmUserManager *manager) -{ - guint nsessions; - - if (! manager->priv->is_loaded) { - return; - } - - nsessions = gdm_user_get_num_sessions (user); - - g_debug ("GdmUserManager: sessions changed user=%s num=%d", - gdm_user_get_user_name (user), - nsessions); - - /* only signal on zero and one */ - if (nsessions > 1) { - return; - } - - g_signal_emit (manager, signals [USER_IS_LOGGED_IN_CHANGED], 0, user); -} - -static void -on_user_changed (GdmUser *user, - GdmUserManager *manager) -{ - if (manager->priv->is_loaded) { - g_debug ("GdmUserManager: user changed"); - g_signal_emit (manager, signals[USER_CHANGED], 0, user); - } -} - -static void -on_get_seat_id_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManager *manager) -{ - GError *error; - char *seat_id; - gboolean res; - - g_assert (manager->priv->seat.get_seat_id_call == call); - - error = NULL; - seat_id = NULL; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - DBUS_TYPE_G_OBJECT_PATH, - &seat_id, - G_TYPE_INVALID); - manager->priv->seat.get_seat_id_call = NULL; - g_object_unref (proxy); - - if (! res) { - if (error != NULL) { - g_debug ("Failed to identify the seat of the " - "current session: %s", - error->message); - g_error_free (error); - } else { - g_debug ("Failed to identify the seat of the " - "current session"); - } - unload_seat (manager); - maybe_set_is_loaded (manager); - return; - } - - g_debug ("GdmUserManager: Found current seat: %s", seat_id); - - manager->priv->seat.id = seat_id; - manager->priv->seat.state++; - - load_seat_incrementally (manager); -} - -static void -get_seat_id_for_current_session (GdmUserManager *manager) -{ - DBusGProxy *proxy; - DBusGProxyCall *call; - - proxy = dbus_g_proxy_new_for_name (manager->priv->connection, - CK_NAME, - manager->priv->seat.session_id, - CK_SESSION_INTERFACE); - if (proxy == NULL) { - g_warning ("Failed to connect to the ConsoleKit session object"); - goto failed; - } - - call = dbus_g_proxy_begin_call (proxy, - "GetSeatId", - (DBusGProxyCallNotify) - on_get_seat_id_finished, - manager, - NULL, - G_TYPE_INVALID); - if (call == NULL) { - g_warning ("GdmUserManager: failed to make GetSeatId call"); - goto failed; - } - - manager->priv->seat.get_seat_id_call = call; - - return; - -failed: - if (proxy != NULL) { - g_object_unref (proxy); - } - - unload_seat (manager); -} - -static gint -match_name_cmpfunc (gconstpointer a, - gconstpointer b) -{ - return g_strcmp0 ((char *) a, - (char *) b); -} - -static gboolean -username_in_exclude_list (GdmUserManager *manager, - const char *username) -{ - GSList *found; - gboolean ret = FALSE; - - /* always exclude the "gdm" user. */ - if (username == NULL || (strcmp (username, GDM_USERNAME) == 0)) { - return TRUE; - } - - if (manager->priv->exclude_usernames != NULL) { - found = g_slist_find_custom (manager->priv->exclude_usernames, - username, - match_name_cmpfunc); - if (found != NULL) { - ret = TRUE; - } - } - - return ret; -} - -static void -add_session_for_user (GdmUserManager *manager, - GdmUser *user, - const char *ssid) -{ - g_hash_table_insert (manager->priv->sessions, - g_strdup (ssid), - g_strdup (gdm_user_get_user_name (user))); - - _gdm_user_add_session (user, ssid); - g_debug ("GdmUserManager: added session for user: %s", gdm_user_get_user_name (user)); -} - -static void -set_has_multiple_users (GdmUserManager *manager, - gboolean has_multiple_users) -{ - if (manager->priv->has_multiple_users != has_multiple_users) { - manager->priv->has_multiple_users = has_multiple_users; - g_object_notify (G_OBJECT (manager), "has-multiple-users"); - } -} - -static GdmUser * -create_new_user (GdmUserManager *manager) -{ - GdmUser *user; - - user = g_object_new (GDM_TYPE_USER, NULL); - - manager->priv->new_users = g_slist_prepend (manager->priv->new_users, user); - - g_signal_connect (user, "notify::is-loaded", G_CALLBACK (on_new_user_loaded), manager); - - return g_object_ref (user); -} - -static void -add_user (GdmUserManager *manager, - GdmUser *user) -{ - const char *object_path; - - g_hash_table_insert (manager->priv->users_by_name, - g_strdup (gdm_user_get_user_name (user)), - g_object_ref (user)); - - object_path = gdm_user_get_object_path (user); - if (object_path != NULL) { - g_hash_table_insert (manager->priv->users_by_object_path, - (gpointer) object_path, - g_object_ref (user)); - } - - g_signal_connect (user, - "sessions-changed", - G_CALLBACK (on_user_sessions_changed), - manager); - g_signal_connect (user, - "changed", - G_CALLBACK (on_user_changed), - manager); - - if (manager->priv->is_loaded) { - g_signal_emit (manager, signals[USER_ADDED], 0, user); - } - - if (g_hash_table_size (manager->priv->users_by_name) > 1) { - set_has_multiple_users (manager, TRUE); - } -} - -static void -remove_user (GdmUserManager *manager, - GdmUser *user) -{ - g_object_ref (user); - - g_signal_handlers_disconnect_by_func (user, on_user_changed, manager); - g_signal_handlers_disconnect_by_func (user, on_user_sessions_changed, manager); - if (gdm_user_get_object_path (user) != NULL) { - g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user)); - } - g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); - - if (manager->priv->is_loaded) { - g_signal_emit (manager, signals[USER_REMOVED], 0, user); - } - - g_object_unref (user); - - if (g_hash_table_size (manager->priv->users_by_name) > 1) { - set_has_multiple_users (manager, FALSE); - } -} - -static void -on_new_user_loaded (GdmUser *user, - GParamSpec *pspec, - GdmUserManager *manager) -{ - const char *username; - GdmUser *old_user; - - if (!gdm_user_is_loaded (user)) { - return; - } - - g_signal_handlers_disconnect_by_func (user, on_new_user_loaded, manager); - manager->priv->new_users = g_slist_remove (manager->priv->new_users, - user); - - username = gdm_user_get_user_name (user); - - if (username == NULL) { - const char *object_path; - - object_path = gdm_user_get_object_path (user); - - if (object_path != NULL) { - g_warning ("GdmUserManager: user has no username " - "(object path: %s, uid: %lu)", - object_path, gdm_user_get_uid (user)); - } else { - g_warning ("GdmUserManager: user has no username (uid: %lu)", - gdm_user_get_uid (user)); - } - g_object_unref (user); - return; - } - - if (username_in_exclude_list (manager, username)) { - g_debug ("GdmUserManager: excluding user '%s'", username); - g_object_unref (user); - return; - } - - old_user = g_hash_table_lookup (manager->priv->users_by_name, username); - - /* If username got added earlier by a different means, trump it now. - */ - if (old_user != NULL) { - remove_user (manager, old_user); - } - - add_user (manager, user); - g_object_unref (user); - - if (manager->priv->new_users == NULL) { - set_is_loaded (manager, TRUE); - } -} - -static GdmUser * -add_new_user_for_object_path (const char *object_path, - GdmUserManager *manager) -{ - GdmUser *user; - - user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path); - - if (user != NULL) { - return user; - } - user = create_new_user (manager); - _gdm_user_update_from_object_path (user, object_path); - - return user; -} - -static void -on_new_user_in_accounts_service (DBusGProxy *proxy, - const char *object_path, - gpointer user_data) -{ - GdmUserManager *manager = GDM_USER_MANAGER (user_data); - - add_new_user_for_object_path (object_path, manager); -} - -static void -on_user_removed_in_accounts_service (DBusGProxy *proxy, - const char *object_path, - gpointer user_data) -{ - GdmUserManager *manager = GDM_USER_MANAGER (user_data); - GdmUser *user; - - user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path); - - manager->priv->new_users = g_slist_remove (manager->priv->new_users, user); - - remove_user (manager, user); -} - -static void -on_get_current_session_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManager *manager) -{ - GError *error; - char *session_id; - gboolean res; - - g_assert (manager->priv->seat.get_current_session_call == call); - g_assert (manager->priv->seat.state == GDM_USER_MANAGER_SEAT_STATE_GET_SESSION_ID); - - error = NULL; - session_id = NULL; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - DBUS_TYPE_G_OBJECT_PATH, - &session_id, - G_TYPE_INVALID); - manager->priv->seat.get_current_session_call = NULL; - g_object_unref (proxy); - - if (! res) { - if (error != NULL) { - g_debug ("Failed to identify the current session: %s", - error->message); - g_error_free (error); - } else { - g_debug ("Failed to identify the current session"); - } - unload_seat (manager); - maybe_set_is_loaded (manager); - return; - } - - manager->priv->seat.session_id = session_id; - manager->priv->seat.state++; - - load_seat_incrementally (manager); -} - -static void -get_current_session_id (GdmUserManager *manager) -{ - DBusGProxy *proxy; - DBusGProxyCall *call; - - proxy = dbus_g_proxy_new_for_name (manager->priv->connection, - CK_NAME, - CK_MANAGER_PATH, - CK_MANAGER_INTERFACE); - if (proxy == NULL) { - g_warning ("Failed to connect to the ConsoleKit manager object"); - goto failed; - } - - call = dbus_g_proxy_begin_call (proxy, - "GetCurrentSession", - (DBusGProxyCallNotify) - on_get_current_session_finished, - manager, - NULL, - G_TYPE_INVALID); - if (call == NULL) { - g_warning ("GdmUserManager: failed to make GetCurrentSession call"); - goto failed; - } - - manager->priv->seat.get_current_session_call = call; - - return; - -failed: - if (proxy != NULL) { - g_object_unref (proxy); - } - - unload_seat (manager); -} - -static void -unload_new_session (GdmUserManagerNewSession *new_session) -{ - GdmUserManager *manager; - - manager = new_session->manager; - - manager->priv->new_sessions = g_slist_remove (manager->priv->new_sessions, - new_session); - - if (new_session->proxy != NULL) { - g_object_unref (new_session->proxy); - } - - g_free (new_session->x11_display); - g_free (new_session->id); - - g_slice_free (GdmUserManagerNewSession, new_session); -} - -static void -get_proxy_for_new_session (GdmUserManagerNewSession *new_session) -{ - GdmUserManager *manager; - DBusGProxy *proxy; - - manager = new_session->manager; - - proxy = dbus_g_proxy_new_for_name (manager->priv->connection, - CK_NAME, - new_session->id, - CK_SESSION_INTERFACE); - if (proxy == NULL) { - g_warning ("Failed to connect to the ConsoleKit '%s' object", - new_session->id); - unload_new_session (new_session); - return; - } - - new_session->proxy = proxy; - new_session->state++; - - load_new_session_incrementally (new_session); -} - -static void -on_get_unix_user_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManagerNewSession *new_session) -{ - GdmUserManager *manager; - GError *error; - guint uid; - gboolean res; - - manager = new_session->manager; - - g_assert (new_session->get_unix_user_call == call); - - error = NULL; - - uid = (guint) -1; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - G_TYPE_UINT, &uid, - G_TYPE_INVALID); - new_session->get_unix_user_call = NULL; - - if (! res) { - if (error != NULL) { - g_debug ("Failed to get uid of session '%s': %s", - new_session->id, error->message); - g_error_free (error); - } else { - g_debug ("Failed to get uid of session '%s'", - new_session->id); - } - unload_new_session (new_session); - return; - } - - g_debug ("GdmUserManager: Found uid of session '%s': %u", - new_session->id, uid); - - new_session->uid = (uid_t) uid; - new_session->state++; - - load_new_session_incrementally (new_session); -} - -static void -get_uid_for_new_session (GdmUserManagerNewSession *new_session) -{ - DBusGProxyCall *call; - - g_assert (new_session->proxy != NULL); - - call = dbus_g_proxy_begin_call (new_session->proxy, - "GetUnixUser", - (DBusGProxyCallNotify) - on_get_unix_user_finished, - new_session, - NULL, - G_TYPE_INVALID); - if (call == NULL) { - g_warning ("GdmUserManager: failed to make GetUnixUser call"); - goto failed; - } - - new_session->get_unix_user_call = call; - return; - -failed: - unload_new_session (new_session); -} - -static void -on_find_user_by_name_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManagerFetchUserRequest *request) -{ - GdmUserManager *manager; - GError *error; - char *object_path; - gboolean res; - - g_assert (request->call == call); - - error = NULL; - object_path = NULL; - manager = request->manager; - res = dbus_g_proxy_end_call (manager->priv->accounts_proxy, - call, - &error, - DBUS_TYPE_G_OBJECT_PATH, - &object_path, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_debug ("GdmUserManager: Failed to find user %s: %s", - request->username, error->message); - g_error_free (error); - } else { - g_debug ("GdmUserManager: Failed to find user %s", - request->username); - } - give_up_and_fetch_user_locally (manager, request); - return; - } - - g_debug ("GdmUserManager: Found object path of user '%s': %s", - request->username, object_path); - request->object_path = object_path; - request->state++; - - fetch_user_incrementally (request); -} - -static void -find_user_in_accounts_service (GdmUserManager *manager, - GdmUserManagerFetchUserRequest *request) -{ - DBusGProxyCall *call; - - g_debug ("GdmUserManager: Looking for user %s in accounts service", - request->username); - - g_assert (manager->priv->accounts_proxy != NULL); - - call = dbus_g_proxy_begin_call (manager->priv->accounts_proxy, - "FindUserByName", - (DBusGProxyCallNotify) - on_find_user_by_name_finished, - request, - NULL, - G_TYPE_STRING, - request->username, - G_TYPE_INVALID); - - if (call == NULL) { - g_warning ("GdmUserManager: failed to make FindUserByName('%s') call", - request->username); - goto failed; - } - - request->call = call; - return; - -failed: - give_up_and_fetch_user_locally (manager, request); -} - -static void -set_is_loaded (GdmUserManager *manager, - gboolean is_loaded) -{ - if (manager->priv->is_loaded != is_loaded) { - manager->priv->is_loaded = is_loaded; - g_object_notify (G_OBJECT (manager), "is-loaded"); - } -} - -static void -on_list_cached_users_finished (DBusGProxy *proxy, - DBusGProxyCall *call_id, - gpointer data) -{ - GdmUserManager *manager = data; - GError *error = NULL; - GPtrArray *paths; - - manager->priv->listing_cached_users = FALSE; - if (!dbus_g_proxy_end_call (proxy, - call_id, - &error, - dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &paths, - G_TYPE_INVALID)) { - g_debug ("GdmUserManager: ListCachedUsers failed: %s", error->message); - g_error_free (error); - - g_object_unref (manager->priv->accounts_proxy); - manager->priv->accounts_proxy = NULL; - - load_users_manually (manager); - - return; - } - - maybe_set_is_loaded (manager); - - g_ptr_array_foreach (paths, (GFunc)add_new_user_for_object_path, manager); - - g_ptr_array_foreach (paths, (GFunc)g_free, NULL); - g_ptr_array_free (paths, TRUE); - - /* Add users who are specifically included */ - if (manager->priv->include_usernames != NULL) { - GSList *l; - - for (l = manager->priv->include_usernames; l != NULL; l = l->next) { - GdmUser *user; - - g_debug ("GdmUserManager: Adding included user %s", (char *)l->data); - /* - * The call to gdm_user_manager_get_user will add the user if it is - * valid and not already in the hash. - */ - user = gdm_user_manager_get_user (manager, l->data); - if (user == NULL) { - g_debug ("GdmUserManager: unable to lookup user '%s'", (char *)l->data); - } - } - } -} - -static void -on_get_x11_display_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManagerNewSession *new_session) -{ - GError *error; - char *x11_display; - gboolean res; - - g_assert (new_session->get_x11_display_call == call); - - error = NULL; - x11_display = NULL; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - G_TYPE_STRING, - &x11_display, - G_TYPE_INVALID); - new_session->get_x11_display_call = NULL; - - if (! res) { - if (error != NULL) { - g_debug ("Failed to get the x11 display of session '%s': %s", - new_session->id, error->message); - g_error_free (error); - } else { - g_debug ("Failed to get the x11 display of session '%s'", - new_session->id); - } - unload_new_session (new_session); - return; - } - - g_debug ("GdmUserManager: Found x11 display of session '%s': %s", - new_session->id, x11_display); - - new_session->x11_display = x11_display; - new_session->state++; - - load_new_session_incrementally (new_session); -} - -static void -get_x11_display_for_new_session (GdmUserManagerNewSession *new_session) -{ - DBusGProxyCall *call; - - g_assert (new_session->proxy != NULL); - - call = dbus_g_proxy_begin_call (new_session->proxy, - "GetX11Display", - (DBusGProxyCallNotify) - on_get_x11_display_finished, - new_session, - NULL, - G_TYPE_INVALID); - if (call == NULL) { - g_warning ("GdmUserManager: failed to make GetX11Display call"); - goto failed; - } - - new_session->get_x11_display_call = call; - return; - -failed: - unload_new_session (new_session); -} - -static gboolean -get_pwent_for_name (const char *name, - struct passwd **pwentp) -{ - struct passwd *pwent; - - do { - errno = 0; - pwent = getpwnam (name); - } while (pwent == NULL && errno == EINTR); - - if (pwentp != NULL) { - *pwentp = pwent; - } - - return (pwent != NULL); -} - -static gboolean -get_pwent_for_uid (uid_t uid, - struct passwd **pwentp) -{ - struct passwd *pwent; - - do { - errno = 0; - pwent = getpwuid (uid); - } while (pwent == NULL && errno == EINTR); - - if (pwentp != NULL) { - *pwentp = pwent; - } - - return (pwent != NULL); -} - -static void -maybe_add_new_session (GdmUserManagerNewSession *new_session) -{ - GdmUserManager *manager; - struct passwd *pwent; - GdmUser *user; - - manager = GDM_USER_MANAGER (new_session->manager); - - errno = 0; - get_pwent_for_uid (new_session->uid, &pwent); - if (pwent == NULL) { - g_warning ("Unable to lookup user ID %d: %s", - (int) new_session->uid, g_strerror (errno)); - goto failed; - } - - /* check exclusions up front */ - if (username_in_exclude_list (manager, pwent->pw_name)) { - g_debug ("GdmUserManager: excluding user '%s'", pwent->pw_name); - goto failed; - } - - user = gdm_user_manager_get_user (manager, pwent->pw_name); - if (user == NULL) { - return; - } - - add_session_for_user (manager, user, new_session->id); - - /* if we haven't yet gotten the login frequency - then at least add one because the session exists */ - if (gdm_user_get_login_frequency (user) == 0) { - _gdm_user_update_login_frequency (user, 1); - } - - manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_LOADED; - unload_new_session (new_session); - return; - -failed: - unload_new_session (new_session); -} - -static void -load_new_session (GdmUserManager *manager, - const char *session_id) -{ - GdmUserManagerNewSession *new_session; - - new_session = g_slice_new0 (GdmUserManagerNewSession); - - new_session->manager = manager; - new_session->id = g_strdup (session_id); - new_session->state = GDM_USER_MANAGER_NEW_SESSION_STATE_UNLOADED + 1; - - manager->priv->new_sessions = g_slist_prepend (manager->priv->new_sessions, - new_session); - load_new_session_incrementally (new_session); -} - -static void -seat_session_added (DBusGProxy *seat_proxy, - const char *session_id, - GdmUserManager *manager) -{ - g_debug ("GdmUserManager: Session added: %s", session_id); - - load_new_session (manager, session_id); -} - -static gint -match_new_session_cmpfunc (gconstpointer a, - gconstpointer b) -{ - GdmUserManagerNewSession *new_session; - const char *session_id; - - new_session = (GdmUserManagerNewSession *) a; - session_id = (const char *) b; - - return strcmp (new_session->id, session_id); -} - -static void -seat_session_removed (DBusGProxy *seat_proxy, - const char *session_id, - GdmUserManager *manager) -{ - GdmUser *user; - GSList *found; - char *username; - - g_debug ("GdmUserManager: Session removed: %s", session_id); - - found = g_slist_find_custom (manager->priv->new_sessions, - session_id, - match_new_session_cmpfunc); - - if (found != NULL) { - GdmUserManagerNewSession *new_session; - - new_session = (GdmUserManagerNewSession *) found->data; - - if (new_session->state > GDM_USER_MANAGER_NEW_SESSION_STATE_GET_X11_DISPLAY) { - g_debug ("GdmUserManager: New session for uid %d on " - "x11 display %s removed before fully loading", - (int) new_session->uid, new_session->x11_display); - } else if (new_session->state > GDM_USER_MANAGER_NEW_SESSION_STATE_GET_UID) { - g_debug ("GdmUserManager: New session for uid %d " - "removed before fully loading", - (int) new_session->uid); - } else { - g_debug ("GdmUserManager: New session removed " - "before fully loading"); - } - unload_new_session (new_session); - return; - } - - /* since the session object may already be gone - * we can't query CK directly */ - - username = g_hash_table_lookup (manager->priv->sessions, session_id); - if (username == NULL) { - return; - } - - user = g_hash_table_lookup (manager->priv->users_by_name, username); - if (user == NULL) { - /* nothing to do */ - return; - } - - g_debug ("GdmUserManager: Session removed for %s", username); - _gdm_user_remove_session (user, session_id); -} - -static void -on_seat_proxy_destroy (DBusGProxy *proxy, - GdmUserManager *manager) -{ - g_debug ("GdmUserManager: seat proxy destroyed"); - - manager->priv->seat.proxy = NULL; -} - -static void -get_seat_proxy (GdmUserManager *manager) -{ - DBusGProxy *proxy; - GError *error; - - g_assert (manager->priv->seat.proxy == NULL); - - error = NULL; - proxy = dbus_g_proxy_new_for_name_owner (manager->priv->connection, - CK_NAME, - manager->priv->seat.id, - CK_SEAT_INTERFACE, - &error); - - if (proxy == NULL) { - if (error != NULL) { - g_warning ("Failed to connect to the ConsoleKit seat object: %s", - error->message); - g_error_free (error); - } else { - g_warning ("Failed to connect to the ConsoleKit seat object"); - } - unload_seat (manager); - return; - } - - g_signal_connect (proxy, "destroy", G_CALLBACK (on_seat_proxy_destroy), manager); - - dbus_g_proxy_add_signal (proxy, - "SessionAdded", - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - dbus_g_proxy_add_signal (proxy, - "SessionRemoved", - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal (proxy, - "SessionAdded", - G_CALLBACK (seat_session_added), - manager, - NULL); - dbus_g_proxy_connect_signal (proxy, - "SessionRemoved", - G_CALLBACK (seat_session_removed), - manager, - NULL); - manager->priv->seat.proxy = proxy; - manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_LOADED; -} - -static void -unload_seat (GdmUserManager *manager) -{ - manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_UNLOADED; - - if (manager->priv->seat.proxy != NULL) { - g_object_unref (manager->priv->seat.proxy); - manager->priv->seat.proxy = NULL; - } - - g_free (manager->priv->seat.id); - manager->priv->seat.id = NULL; - - g_free (manager->priv->seat.session_id); - manager->priv->seat.session_id = NULL; -} - -static void -get_accounts_proxy (GdmUserManager *manager) -{ - DBusGProxy *proxy; - GError *error; - - g_assert (manager->priv->accounts_proxy == NULL); - - error = NULL; - proxy = dbus_g_proxy_new_for_name (manager->priv->connection, - ACCOUNTS_NAME, - ACCOUNTS_PATH, - ACCOUNTS_INTERFACE); - manager->priv->accounts_proxy = proxy; - - dbus_g_proxy_add_signal (proxy, - "UserAdded", - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - dbus_g_proxy_add_signal (proxy, - "UserDeleted", - DBUS_TYPE_G_OBJECT_PATH, - G_TYPE_INVALID); - - dbus_g_proxy_connect_signal (proxy, - "UserAdded", - G_CALLBACK (on_new_user_in_accounts_service), - manager, - NULL); - dbus_g_proxy_connect_signal (proxy, - "UserDeleted", - G_CALLBACK (on_user_removed_in_accounts_service), - manager, - NULL); -} - -static void -load_new_session_incrementally (GdmUserManagerNewSession *new_session) -{ - switch (new_session->state) { - case GDM_USER_MANAGER_NEW_SESSION_STATE_GET_PROXY: - get_proxy_for_new_session (new_session); - break; - case GDM_USER_MANAGER_NEW_SESSION_STATE_GET_UID: - get_uid_for_new_session (new_session); - break; - case GDM_USER_MANAGER_NEW_SESSION_STATE_GET_X11_DISPLAY: - get_x11_display_for_new_session (new_session); - break; - case GDM_USER_MANAGER_NEW_SESSION_STATE_MAYBE_ADD: - maybe_add_new_session (new_session); - break; - case GDM_USER_MANAGER_NEW_SESSION_STATE_LOADED: - break; - default: - g_assert_not_reached (); - } -} - -static void -free_fetch_user_request (GdmUserManagerFetchUserRequest *request) -{ - GdmUserManager *manager; - - manager = request->manager; - - manager->priv->fetch_user_requests = g_slist_remove (manager->priv->fetch_user_requests, request); - g_free (request->username); - g_free (request->object_path); - g_slice_free (GdmUserManagerFetchUserRequest, request); -} - -static void -give_up_and_fetch_user_locally (GdmUserManager *manager, - GdmUserManagerFetchUserRequest *request) -{ - - g_debug ("GdmUserManager: account service unavailable, " - "fetching user %s locally", - request->username); - fetch_user_locally (manager, request->user, request->username); - request->state = GDM_USER_MANAGER_GET_USER_STATE_UNFETCHED; -} - -static void -on_user_manager_maybe_ready_for_request (GdmUserManager *manager, - GParamSpec *pspec, - GdmUserManagerFetchUserRequest *request) -{ - if (!manager->priv->is_loaded) { - return; - } - - g_signal_handlers_disconnect_by_func (manager, on_user_manager_maybe_ready_for_request, request); - - request->state++; - fetch_user_incrementally (request); -} - -static void -fetch_user_incrementally (GdmUserManagerFetchUserRequest *request) -{ - GdmUserManager *manager; - - g_debug ("GdmUserManager: finding user %s state %d", - request->username, request->state); - manager = request->manager; - switch (request->state) { - case GDM_USER_MANAGER_GET_USER_STATE_WAIT_FOR_LOADED: - if (manager->priv->is_loaded) { - request->state++; - fetch_user_incrementally (request); - } else { - g_debug ("GdmUserManager: waiting for user manager to load before finding user %s", - request->username); - g_signal_connect (manager, "notify::is-loaded", - G_CALLBACK (on_user_manager_maybe_ready_for_request), request); - - } - break; - - case GDM_USER_MANAGER_GET_USER_STATE_ASK_ACCOUNTS_SERVICE: - if (manager->priv->accounts_proxy == NULL) { - give_up_and_fetch_user_locally (manager, request); - } else { - find_user_in_accounts_service (manager, request); - } - break; - case GDM_USER_MANAGER_GET_USER_STATE_FETCHED: - g_debug ("GdmUserManager: user %s fetched", request->username); - _gdm_user_update_from_object_path (request->user, request->object_path); - break; - case GDM_USER_MANAGER_GET_USER_STATE_UNFETCHED: - g_debug ("GdmUserManager: user %s was not fetched", request->username); - break; - default: - g_assert_not_reached (); - } - - if (request->state == GDM_USER_MANAGER_GET_USER_STATE_FETCHED || - request->state == GDM_USER_MANAGER_GET_USER_STATE_UNFETCHED) { - g_debug ("GdmUserManager: finished handling request for user %s", - request->username); - free_fetch_user_request (request); - } -} - -static void -fetch_user_from_accounts_service (GdmUserManager *manager, - GdmUser *user, - const char *username) -{ - GdmUserManagerFetchUserRequest *request; - - request = g_slice_new0 (GdmUserManagerFetchUserRequest); - - request->manager = manager; - request->username = g_strdup (username); - request->user = user; - request->state = GDM_USER_MANAGER_GET_USER_STATE_UNFETCHED + 1; - - manager->priv->fetch_user_requests = g_slist_prepend (manager->priv->fetch_user_requests, - request); - fetch_user_incrementally (request); -} - -static void -fetch_user_locally (GdmUserManager *manager, - GdmUser *user, - const char *username) -{ - struct passwd *pwent; - - get_pwent_for_name (username, &pwent); - - if (pwent != NULL) { - _gdm_user_update_from_pwent (user, pwent); - } -} - -/** - * gdm_user_manager_get_user: - * @manager: the manager to query. - * @username: the login name of the user to get. - * - * Retrieves a pointer to the #GdmUser object for the login @username - * from @manager. Trying to use this object before its - * #GdmUser:is-loaded property is %TRUE will result in undefined - * behavior. - * - * Returns: (transfer none): #GdmUser object - **/ -GdmUser * -gdm_user_manager_get_user (GdmUserManager *manager, - const char *username) -{ - GdmUser *user; - - g_return_val_if_fail (GDM_IS_USER_MANAGER (manager), NULL); - g_return_val_if_fail (username != NULL && username[0] != '\0', NULL); - - user = g_hash_table_lookup (manager->priv->users_by_name, username); - - /* if we don't have it loaded try to load it now */ - if (user == NULL) { - user = create_new_user (manager); - - if (manager->priv->accounts_proxy != NULL) { - fetch_user_from_accounts_service (manager, user, username); - } else { - fetch_user_locally (manager, user, username); - } - } - - return user; -} - -/** - * gdm_user_manager_get_user_by_uid: - * @manager: the manager to query. - * @uid: the uid of the user to get. - * - * Retrieves a pointer to the #GdmUser object for the uid @uid - * from @manager. Trying to use this object before its - * #GdmUser:is-loaded property is %TRUE will result in undefined - * behavior. - * - * Returns: (transfer none): #GdmUser object - */ -GdmUser * -gdm_user_manager_get_user_by_uid (GdmUserManager *manager, - gulong uid) -{ - struct passwd *pwent; - - g_return_val_if_fail (GDM_IS_USER_MANAGER (manager), NULL); - - get_pwent_for_uid (uid, &pwent); - if (pwent == NULL) { - g_warning ("GdmUserManager: unable to lookup uid %d", (int)uid); - return NULL; - } - - return gdm_user_manager_get_user (manager, pwent->pw_name); -} - -static void -listify_hash_values_hfunc (gpointer key, - gpointer value, - gpointer user_data) -{ - GSList **list = user_data; - - *list = g_slist_prepend (*list, value); -} - -/** - * gdm_user_manager_list_users: - * @manager: a #GdmUserManager - * - * Get a list of system user accounts - * - * Returns: (element-type GdmUser) (transfer full): List of #GdmUser objects - */ -GSList * -gdm_user_manager_list_users (GdmUserManager *manager) -{ - GSList *retval; - - g_return_val_if_fail (GDM_IS_USER_MANAGER (manager), NULL); - - retval = NULL; - g_hash_table_foreach (manager->priv->users_by_name, listify_hash_values_hfunc, &retval); - - return g_slist_sort (retval, (GCompareFunc) gdm_user_collate); -} - -static gboolean -parse_value_as_ulong (const char *value, - gulong *ulongval) -{ - char *end_of_valid_long; - glong long_value; - gulong ulong_value; - - errno = 0; - long_value = strtol (value, &end_of_valid_long, 10); - - if (*value == '\0' || *end_of_valid_long != '\0') { - return FALSE; - } - - ulong_value = long_value; - if (ulong_value != long_value || errno == ERANGE) { - return FALSE; - } - - *ulongval = ulong_value; - - return TRUE; -} - -static gboolean -parse_ck_history_line (const char *line, - char **user_namep, - gulong *frequencyp) -{ - GRegex *re; - GMatchInfo *match_info; - gboolean res; - gboolean ret; - GError *error; - - ret = FALSE; - re = NULL; - match_info = NULL; - - error = NULL; - re = g_regex_new ("(?P[0-9a-zA-Z]+)[ ]+(?P[0-9]+)", 0, 0, &error); - if (re == NULL) { - if (error != NULL) { - g_critical ("%s", error->message); - } else { - g_critical ("Error in regex call"); - } - goto out; - } - - g_regex_match (re, line, 0, &match_info); - - res = g_match_info_matches (match_info); - if (! res) { - g_warning ("Unable to parse history: %s", line); - goto out; - } - - if (user_namep != NULL) { - *user_namep = g_match_info_fetch_named (match_info, "username"); - } - - if (frequencyp != NULL) { - char *freq; - freq = g_match_info_fetch_named (match_info, "frequency"); - res = parse_value_as_ulong (freq, frequencyp); - g_free (freq); - if (! res) { - goto out; - } - } - - ret = TRUE; - - out: - if (match_info != NULL) { - g_match_info_free (match_info); - } - if (re != NULL) { - g_regex_unref (re); - } - return ret; -} - -static void -process_ck_history_line (GdmUserManager *manager, - const char *line) -{ - gboolean res; - char *username; - gulong frequency; - GdmUser *user; - - frequency = 0; - username = NULL; - res = parse_ck_history_line (line, &username, &frequency); - if (! res) { - return; - } - - if (username_in_exclude_list (manager, username)) { - g_debug ("GdmUserManager: excluding user '%s'", username); - g_free (username); - return; - } - - user = gdm_user_manager_get_user (manager, username); - if (user == NULL) { - g_debug ("GdmUserManager: unable to lookup user '%s'", username); - g_free (username); - return; - } - - _gdm_user_update_login_frequency (user, frequency); - g_free (username); -} - -static void -maybe_set_is_loaded (GdmUserManager *manager) -{ - if (manager->priv->is_loaded) { - return; - } - - if (manager->priv->ck_history_pid != 0) { - return; - } - - if (manager->priv->load_passwd_pending) { - return; - } - - if (manager->priv->get_sessions_call != NULL) { - return; - } - - if (manager->priv->listing_cached_users) { - return; - } - - /* Don't set is_loaded yet unless the seat is already loaded - * or failed to load. - */ - if (manager->priv->seat.state != GDM_USER_MANAGER_SEAT_STATE_LOADED - && manager->priv->seat.state != GDM_USER_MANAGER_SEAT_STATE_UNLOADED) { - return; - } - - set_is_loaded (manager, TRUE); -} - -static gboolean -ck_history_watch (GIOChannel *source, - GIOCondition condition, - GdmUserManager *manager) -{ - GIOStatus status; - gboolean done = FALSE; - - g_return_val_if_fail (manager != NULL, FALSE); - - if (condition & G_IO_IN) { - char *str; - GError *error; - - error = NULL; - status = g_io_channel_read_line (source, &str, NULL, NULL, &error); - if (error != NULL) { - g_warning ("GdmUserManager: unable to read line: %s", error->message); - g_error_free (error); - } - - if (status == G_IO_STATUS_NORMAL) { - g_debug ("GdmUserManager: history output: %s", str); - process_ck_history_line (manager, str); - } else if (status == G_IO_STATUS_EOF) { - done = TRUE; - } - - g_free (str); - } else if (condition & G_IO_HUP) { - done = TRUE; - } - - if (done) { - manager->priv->ck_history_id = 0; - if (manager->priv->ck_history_watchdog_id != 0) { - g_source_remove (manager->priv->ck_history_watchdog_id); - manager->priv->ck_history_watchdog_id = 0; - } - manager->priv->ck_history_pid = 0; - - maybe_set_is_loaded (manager); - - return FALSE; - } - - return TRUE; -} - -static int -signal_pid (int pid, - int signal) -{ - int status = -1; - - status = kill (pid, signal); - - if (status < 0) { - if (errno == ESRCH) { - g_debug ("Child process %lu was already dead.", - (unsigned long) pid); - } else { - char buf [1024]; - snprintf (buf, - sizeof (buf), - "Couldn't kill child process %lu", - (unsigned long) pid); - perror (buf); - } - } - - return status; -} - -static gboolean -ck_history_watchdog (GdmUserManager *manager) -{ - if (manager->priv->ck_history_pid > 0) { - g_debug ("Killing ck-history process"); - signal_pid (manager->priv->ck_history_pid, SIGTERM); - manager->priv->ck_history_pid = 0; - } - - manager->priv->ck_history_watchdog_id = 0; - return FALSE; -} - -static gboolean -load_ck_history (GdmUserManager *manager) -{ - char *command; - char *since; - const char *seat_id; - GError *error; - gboolean res; - char **argv; - int standard_out; - GIOChannel *channel; - GTimeVal tv; - - g_assert (manager->priv->ck_history_id == 0); - - command = NULL; - - seat_id = NULL; - if (manager->priv->seat.id != NULL - && g_str_has_prefix (manager->priv->seat.id, "/org/freedesktop/ConsoleKit/")) { - - seat_id = manager->priv->seat.id + strlen ("/org/freedesktop/ConsoleKit/"); - } - - if (seat_id == NULL) { - g_warning ("Unable to load CK history: no seat-id found"); - goto out; - } - - g_get_current_time (&tv); - tv.tv_sec -= LOGIN_FREQUENCY_TIME_WINDOW_SECS; - since = g_time_val_to_iso8601 (&tv); - - command = g_strdup_printf ("ck-history --frequent --since='%s' --seat='%s' --session-type=''", - since, - seat_id); - g_free (since); - g_debug ("GdmUserManager: running '%s'", command); - error = NULL; - if (! g_shell_parse_argv (command, NULL, &argv, &error)) { - if (error != NULL) { - g_warning ("Could not parse command: %s", error->message); - g_error_free (error); - } else { - g_warning ("Could not parse command"); - } - goto out; - } - - error = NULL; - res = g_spawn_async_with_pipes (NULL, - argv, - NULL, - G_SPAWN_SEARCH_PATH, - NULL, - NULL, - &manager->priv->ck_history_pid, /* pid */ - NULL, - &standard_out, - NULL, - &error); - g_strfreev (argv); - if (! res) { - if (error != NULL) { - g_warning ("Unable to run ck-history: %s", error->message); - g_error_free (error); - } else { - g_warning ("Unable to run ck-history"); - } - goto out; - } - - channel = g_io_channel_unix_new (standard_out); - g_io_channel_set_close_on_unref (channel, TRUE); - g_io_channel_set_flags (channel, - g_io_channel_get_flags (channel) | G_IO_FLAG_NONBLOCK, - NULL); - manager->priv->ck_history_watchdog_id = g_timeout_add_seconds (1, (GSourceFunc) ck_history_watchdog, manager); - manager->priv->ck_history_id = g_io_add_watch (channel, - G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL, - (GIOFunc)ck_history_watch, - manager); - g_io_channel_unref (channel); - - out: - - g_free (command); - - return manager->priv->ck_history_id != 0; -} - -static void -reload_passwd_file (GHashTable *valid_shells, - GSList *exclude_users, - GSList *include_users, - gboolean include_all, - GHashTable *current_users_by_name, - GSList **added_users, - GSList **removed_users) -{ - FILE *fp; - GHashTableIter iter; - GHashTable *new_users_by_name; - GdmUser *user; - char *name; - - new_users_by_name = g_hash_table_new_full (g_str_hash, - g_str_equal, - NULL, - g_object_unref); - - errno = 0; - fp = fopen (PATH_PASSWD, "r"); - if (fp == NULL) { - g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno)); - goto out; - } - - /* Make sure we keep users who are logged in no matter what. */ - g_hash_table_iter_init (&iter, current_users_by_name); - while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) { - struct passwd *pwent; - - get_pwent_for_name (name, &pwent); - if (pwent == NULL) { - continue; - } - - g_object_freeze_notify (G_OBJECT (user)); - _gdm_user_update_from_pwent (user, pwent); - g_hash_table_insert (new_users_by_name, (char *)gdm_user_get_user_name (user), g_object_ref (user)); - } - - if (include_users != NULL) { - GSList *l; - for (l = include_users; l != NULL; l = l->next) { - struct passwd *pwent; - - get_pwent_for_name (l->data, &pwent); - if (pwent == NULL) { - continue; - } - - user = g_hash_table_lookup (new_users_by_name, pwent->pw_name); - if (user != NULL) { - /* already there */ - continue; - } - - user = g_hash_table_lookup (current_users_by_name, pwent->pw_name); - if (user == NULL) { - user = g_object_new (GDM_TYPE_USER, NULL); - } else { - g_object_ref (user); - } - g_object_freeze_notify (G_OBJECT (user)); - _gdm_user_update_from_pwent (user, pwent); - g_hash_table_insert (new_users_by_name, (char *)gdm_user_get_user_name (user), user); - } - } - - if (include_all != TRUE) { - g_debug ("GdmUserManager: include_all is FALSE"); - } else { - struct passwd *pwent; - - g_debug ("GdmUserManager: include_all is TRUE"); - - for (pwent = fgetpwent (fp); - pwent != NULL; - pwent = fgetpwent (fp)) { - - /* Skip users below MinimalUID... */ - if (pwent->pw_uid < FALLBACK_MINIMAL_UID) { - continue; - } - - /* ...And users w/ invalid shells... */ - if (pwent->pw_shell == NULL - || !g_hash_table_lookup (valid_shells, pwent->pw_shell)) { - g_debug ("GdmUserManager: skipping user with bad shell: %s", pwent->pw_name); - continue; - } - - /* always exclude the "gdm" user. */ - if (strcmp (pwent->pw_name, GDM_USERNAME) == 0) { - continue; - } - - /* ...And explicitly excluded users */ - if (exclude_users != NULL) { - GSList *found; - - found = g_slist_find_custom (exclude_users, - pwent->pw_name, - match_name_cmpfunc); - if (found != NULL) { - g_debug ("GdmUserManager: explicitly skipping user: %s", pwent->pw_name); - continue; - } - } - - user = g_hash_table_lookup (new_users_by_name, pwent->pw_name); - if (user != NULL) { - /* already there */ - continue; - } - - user = g_hash_table_lookup (current_users_by_name, pwent->pw_name); - if (user == NULL) { - user = g_object_new (GDM_TYPE_USER, NULL); - } else { - g_object_ref (user); - } - - /* Freeze & update users not already in the new list */ - g_object_freeze_notify (G_OBJECT (user)); - _gdm_user_update_from_pwent (user, pwent); - g_hash_table_insert (new_users_by_name, (char *)gdm_user_get_user_name (user), user); - } - } - - /* Go through and handle added users */ - g_hash_table_iter_init (&iter, new_users_by_name); - while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) { - GdmUser *user2; - user2 = g_hash_table_lookup (current_users_by_name, name); - if (user2 == NULL) { - *added_users = g_slist_prepend (*added_users, g_object_ref (user)); - } - } - - /* Go through and handle removed users */ - g_hash_table_iter_init (&iter, current_users_by_name); - while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) { - GdmUser *user2; - user2 = g_hash_table_lookup (new_users_by_name, name); - if (user2 == NULL) { - *removed_users = g_slist_prepend (*removed_users, g_object_ref (user)); - } - } - - out: - /* Cleanup */ - - fclose (fp); - - g_hash_table_iter_init (&iter, new_users_by_name); - while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) { - g_object_thaw_notify (G_OBJECT (user)); - } - - g_hash_table_destroy (new_users_by_name); -} - -typedef struct { - GdmUserManager *manager; - GSList *exclude_users; - GSList *include_users; - gboolean include_all; - GHashTable *shells; - GHashTable *current_users_by_name; - GSList *added_users; - GSList *removed_users; -} PasswdData; - -static void -passwd_data_free (PasswdData *data) -{ - if (data->manager != NULL) { - g_object_unref (data->manager); - } - - g_slist_foreach (data->added_users, (GFunc) g_object_unref, NULL); - g_slist_free (data->added_users); - - g_slist_foreach (data->removed_users, (GFunc) g_object_unref, NULL); - g_slist_free (data->removed_users); - - g_slist_foreach (data->exclude_users, (GFunc) g_free, NULL); - g_slist_free (data->exclude_users); - - g_slist_foreach (data->include_users, (GFunc) g_free, NULL); - g_slist_free (data->include_users); - - g_slice_free (PasswdData, data); -} - -static gboolean -reload_passwd_job_done (PasswdData *data) -{ - GSList *l; - - g_debug ("GdmUserManager: done reloading passwd file"); - - /* Go through and handle added users */ - for (l = data->added_users; l != NULL; l = l->next) { - add_user (data->manager, l->data); - } - - /* Go through and handle removed users */ - for (l = data->removed_users; l != NULL; l = l->next) { - remove_user (data->manager, l->data); - } - - data->manager->priv->load_passwd_pending = FALSE; - - if (! data->manager->priv->is_loaded) { - maybe_set_is_loaded (data->manager); - - if (data->manager->priv->include_all == TRUE) { - monitor_local_users (data->manager); - } - } - - passwd_data_free (data); - - return FALSE; -} - -static gboolean -do_reload_passwd_job (GIOSchedulerJob *job, - GCancellable *cancellable, - PasswdData *data) -{ - g_debug ("GdmUserManager: reloading passwd file worker"); - - reload_passwd_file (data->shells, - data->exclude_users, - data->include_users, - data->include_all, - data->current_users_by_name, - &data->added_users, - &data->removed_users); - - g_io_scheduler_job_send_to_mainloop_async (job, - (GSourceFunc) reload_passwd_job_done, - data, - NULL); - - return FALSE; -} - -static GSList * -slist_deep_copy (const GSList *list) -{ - GSList *retval; - GSList *l; - - if (list == NULL) - return NULL; - - retval = g_slist_copy ((GSList *) list); - for (l = retval; l != NULL; l = l->next) { - l->data = g_strdup (l->data); - } - - return retval; -} - -static void -schedule_reload_passwd (GdmUserManager *manager) -{ - PasswdData *passwd_data; - - manager->priv->load_passwd_pending = TRUE; - - passwd_data = g_slice_new0 (PasswdData); - passwd_data->manager = g_object_ref (manager); - passwd_data->shells = manager->priv->shells; - passwd_data->exclude_users = slist_deep_copy (manager->priv->exclude_usernames); - passwd_data->include_users = slist_deep_copy (manager->priv->include_usernames); - passwd_data->include_all = manager->priv->include_all; - passwd_data->current_users_by_name = manager->priv->users_by_name; - passwd_data->added_users = NULL; - passwd_data->removed_users = NULL; - - g_debug ("GdmUserManager: scheduling a passwd file update"); - - g_io_scheduler_push_job ((GIOSchedulerJobFunc) do_reload_passwd_job, - passwd_data, - NULL, - G_PRIORITY_DEFAULT, - NULL); -} - -static void -load_sessions_from_array (GdmUserManager *manager, - const char * const *session_ids, - int number_of_sessions) -{ - int i; - - for (i = 0; i < number_of_sessions; i++) { - load_new_session (manager, session_ids[i]); - } -} - -static void -on_get_sessions_finished (DBusGProxy *proxy, - DBusGProxyCall *call, - GdmUserManager *manager) -{ - GError *error; - gboolean res; - GPtrArray *sessions; - - g_assert (manager->priv->get_sessions_call == call); - - error = NULL; - sessions = NULL; - res = dbus_g_proxy_end_call (proxy, - call, - &error, - GDM_DBUS_TYPE_G_OBJECT_PATH_ARRAY, - &sessions, - G_TYPE_INVALID); - - if (! res) { - if (error != NULL) { - g_warning ("unable to determine sessions for seat: %s", - error->message); - g_error_free (error); - } else { - g_warning ("unable to determine sessions for seat"); - } - return; - } - - manager->priv->get_sessions_call = NULL; - g_assert (sessions->len <= G_MAXINT); - load_sessions_from_array (manager, - (const char * const *) sessions->pdata, - (int) sessions->len); - g_ptr_array_foreach (sessions, (GFunc) g_free, NULL); - g_ptr_array_free (sessions, TRUE); - maybe_set_is_loaded (manager); -} - -static void -load_sessions (GdmUserManager *manager) -{ - DBusGProxyCall *call; - - if (manager->priv->seat.proxy == NULL) { - g_debug ("GdmUserManager: no seat proxy; can't load sessions"); - return; - } - - call = dbus_g_proxy_begin_call (manager->priv->seat.proxy, - "GetSessions", - (DBusGProxyCallNotify) - on_get_sessions_finished, - manager, - NULL, - G_TYPE_INVALID); - - if (call == NULL) { - g_warning ("GdmUserManager: failed to make GetSessions call"); - return; - } - - manager->priv->get_sessions_call = call; -} - -static void -reload_shells (GdmUserManager *manager) -{ - char *shell; - - setusershell (); - - g_hash_table_remove_all (manager->priv->shells); - for (shell = getusershell (); shell != NULL; shell = getusershell ()) { - /* skip well known not-real shells */ - if (shell == NULL - || strcmp (shell, "/sbin/nologin") == 0 - || strcmp (shell, "/bin/false") == 0) { - g_debug ("GdmUserManager: skipping shell %s", shell); - continue; - } - g_hash_table_insert (manager->priv->shells, - g_strdup (shell), - GUINT_TO_POINTER (TRUE)); - } - - endusershell (); -} - -static void -load_users_manually (GdmUserManager *manager) -{ - gboolean res; - - manager->priv->shells = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - NULL); - reload_shells (manager); - - load_sessions (manager); - - res = load_ck_history (manager); - schedule_reload_passwd (manager); -} - -static void -load_users (GdmUserManager *manager) -{ - g_assert (manager->priv->accounts_proxy != NULL); - g_debug ("GdmUserManager: calling 'ListCachedUsers'"); - - dbus_g_proxy_begin_call (manager->priv->accounts_proxy, - "ListCachedUsers", - on_list_cached_users_finished, - manager, - NULL, - G_TYPE_INVALID); - manager->priv->listing_cached_users = TRUE; -} - -static void -load_seat_incrementally (GdmUserManager *manager) -{ - g_assert (manager->priv->seat.proxy == NULL); - - switch (manager->priv->seat.state) { - case GDM_USER_MANAGER_SEAT_STATE_GET_SESSION_ID: - get_current_session_id (manager); - break; - case GDM_USER_MANAGER_SEAT_STATE_GET_ID: - get_seat_id_for_current_session (manager); - break; - case GDM_USER_MANAGER_SEAT_STATE_GET_PROXY: - get_seat_proxy (manager); - break; - case GDM_USER_MANAGER_SEAT_STATE_LOADED: - break; - default: - g_assert_not_reached (); - } - - if (manager->priv->seat.state == GDM_USER_MANAGER_SEAT_STATE_LOADED) { - gboolean res; - - load_sessions (manager); - res = load_ck_history (manager); - } - - maybe_set_is_loaded (manager); -} - -static gboolean -load_idle (GdmUserManager *manager) -{ - manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_UNLOADED + 1; - load_seat_incrementally (manager); - load_users (manager); - manager->priv->load_id = 0; - - return FALSE; -} - -static void -queue_load_seat_and_users (GdmUserManager *manager) -{ - if (manager->priv->load_id > 0) { - return; - } - - manager->priv->load_id = g_idle_add ((GSourceFunc)load_idle, manager); -} - -static gboolean -reload_passwd_idle (GdmUserManager *manager) -{ - schedule_reload_passwd (manager); - manager->priv->reload_passwd_id = 0; - - return FALSE; -} - -static void -queue_reload_passwd (GdmUserManager *manager) -{ - if (manager->priv->reload_passwd_id > 0) { - g_source_remove (manager->priv->reload_passwd_id); - } - - manager->priv->reload_passwd_id = g_timeout_add_seconds (RELOAD_PASSWD_THROTTLE_SECS, (GSourceFunc)reload_passwd_idle, manager); -} - -static void -on_shells_monitor_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - GdmUserManager *manager) -{ - if (event_type != G_FILE_MONITOR_EVENT_CHANGED && - event_type != G_FILE_MONITOR_EVENT_CREATED) { - return; - } - - reload_shells (manager); - queue_reload_passwd (manager); -} - -static void -on_passwd_monitor_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - GdmUserManager *manager) -{ - if (event_type != G_FILE_MONITOR_EVENT_CHANGED && - event_type != G_FILE_MONITOR_EVENT_CREATED) { - return; - } - - queue_reload_passwd (manager); -} - -static void -gdm_user_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GdmUserManager *manager; - - manager = GDM_USER_MANAGER (object); - - switch (prop_id) { - case PROP_IS_LOADED: - g_value_set_boolean (value, manager->priv->is_loaded); - break; - case PROP_HAS_MULTIPLE_USERS: - g_value_set_boolean (value, manager->priv->has_multiple_users); - break; - case PROP_INCLUDE_ALL: - g_value_set_boolean (value, manager->priv->include_all); - break; - case PROP_INCLUDE_USERNAMES_LIST: - g_value_set_pointer (value, manager->priv->include_usernames); - break; - case PROP_EXCLUDE_USERNAMES_LIST: - g_value_set_pointer (value, manager->priv->exclude_usernames); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -set_include_usernames (GdmUserManager *manager, - GSList *list) -{ - if (manager->priv->include_usernames != NULL) { - g_slist_foreach (manager->priv->include_usernames, (GFunc) g_free, NULL); - g_slist_free (manager->priv->include_usernames); - } - manager->priv->include_usernames = slist_deep_copy (list); -} - -static void -set_exclude_usernames (GdmUserManager *manager, - GSList *list) -{ - if (manager->priv->exclude_usernames != NULL) { - g_slist_foreach (manager->priv->exclude_usernames, (GFunc) g_free, NULL); - g_slist_free (manager->priv->exclude_usernames); - } - manager->priv->exclude_usernames = slist_deep_copy (list); -} - -static void -set_include_all (GdmUserManager *manager, - gboolean all) -{ - if (manager->priv->include_all != all) { - manager->priv->include_all = all; - } -} - -static void -gdm_user_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GdmUserManager *self; - - self = GDM_USER_MANAGER (object); - - switch (prop_id) { - case PROP_INCLUDE_ALL: - set_include_all (self, g_value_get_boolean (value)); - break; - case PROP_INCLUDE_USERNAMES_LIST: - set_include_usernames (self, g_value_get_pointer (value)); - break; - case PROP_EXCLUDE_USERNAMES_LIST: - set_exclude_usernames (self, g_value_get_pointer (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -monitor_local_users (GdmUserManager *manager) -{ - GFile *file; - GError *error; - - g_debug ("GdmUserManager: Monitoring local users"); - - /* /etc/shells */ - file = g_file_new_for_path (_PATH_SHELLS); - error = NULL; - manager->priv->shells_monitor = g_file_monitor_file (file, - G_FILE_MONITOR_NONE, - NULL, - &error); - if (manager->priv->shells_monitor != NULL) { - g_signal_connect (manager->priv->shells_monitor, - "changed", - G_CALLBACK (on_shells_monitor_changed), - manager); - } else { - g_warning ("Unable to monitor %s: %s", _PATH_SHELLS, error->message); - g_error_free (error); - } - g_object_unref (file); - - /* /etc/passwd */ - file = g_file_new_for_path (PATH_PASSWD); - manager->priv->passwd_monitor = g_file_monitor_file (file, - G_FILE_MONITOR_NONE, - NULL, - &error); - if (manager->priv->passwd_monitor != NULL) { - g_signal_connect (manager->priv->passwd_monitor, - "changed", - G_CALLBACK (on_passwd_monitor_changed), - manager); - } else { - g_warning ("Unable to monitor %s: %s", PATH_PASSWD, error->message); - g_error_free (error); - } - g_object_unref (file); -} - -static void -gdm_user_manager_class_init (GdmUserManagerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gdm_user_manager_finalize; - object_class->get_property = gdm_user_manager_get_property; - object_class->set_property = gdm_user_manager_set_property; - - g_object_class_install_property (object_class, - PROP_IS_LOADED, - g_param_spec_boolean ("is-loaded", - NULL, - NULL, - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property (object_class, - PROP_HAS_MULTIPLE_USERS, - g_param_spec_boolean ("has-multiple-users", - NULL, - NULL, - FALSE, - G_PARAM_READABLE)); - g_object_class_install_property (object_class, - PROP_INCLUDE_ALL, - g_param_spec_boolean ("include-all", - NULL, - NULL, - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_INCLUDE_USERNAMES_LIST, - g_param_spec_pointer ("include-usernames-list", - NULL, - NULL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_EXCLUDE_USERNAMES_LIST, - g_param_spec_pointer ("exclude-usernames-list", - NULL, - NULL, - G_PARAM_READWRITE)); - - signals [USER_ADDED] = - g_signal_new ("user-added", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmUserManagerClass, user_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, GDM_TYPE_USER); - signals [USER_REMOVED] = - g_signal_new ("user-removed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmUserManagerClass, user_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, GDM_TYPE_USER); - signals [USER_IS_LOGGED_IN_CHANGED] = - g_signal_new ("user-is-logged-in-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmUserManagerClass, user_is_logged_in_changed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, GDM_TYPE_USER); - signals [USER_CHANGED] = - g_signal_new ("user-changed", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdmUserManagerClass, user_changed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, GDM_TYPE_USER); - - g_type_class_add_private (klass, sizeof (GdmUserManagerPrivate)); -} - -/** - * gdm_user_manager_queue_load: - * @manager: a #GdmUserManager - * - * Queue loading users into user manager. This must be called, and the - * #GdmUserManager:is-loaded property must be %TRUE before calling - * gdm_user_manager_list_users() - */ -void -gdm_user_manager_queue_load (GdmUserManager *manager) -{ - g_return_if_fail (GDM_IS_USER_MANAGER (manager)); - - if (! manager->priv->is_loaded) { - queue_load_seat_and_users (manager); - } -} - -static void -gdm_user_manager_init (GdmUserManager *manager) -{ - GError *error; - - manager->priv = GDM_USER_MANAGER_GET_PRIVATE (manager); - - /* sessions */ - manager->priv->sessions = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - g_free); - - /* users */ - manager->priv->users_by_name = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - g_object_unref); - - manager->priv->users_by_object_path = g_hash_table_new_full (g_str_hash, - g_str_equal, - NULL, - g_object_unref); - - g_assert (manager->priv->seat.proxy == NULL); - - error = NULL; - manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (manager->priv->connection == NULL) { - if (error != NULL) { - g_warning ("Failed to connect to the D-Bus daemon: %s", error->message); - g_error_free (error); - } else { - g_warning ("Failed to connect to the D-Bus daemon"); - } - return; - } - - get_accounts_proxy (manager); - - manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_UNLOADED; -} - -static void -gdm_user_manager_finalize (GObject *object) -{ - GdmUserManager *manager; - GSList *node; - - g_return_if_fail (object != NULL); - g_return_if_fail (GDM_IS_USER_MANAGER (object)); - - manager = GDM_USER_MANAGER (object); - - g_return_if_fail (manager->priv != NULL); - - if (manager->priv->ck_history_pid > 0) { - g_debug ("Killing ck-history process"); - signal_pid (manager->priv->ck_history_pid, SIGTERM); - } - - g_slist_foreach (manager->priv->new_sessions, - (GFunc) unload_new_session, NULL); - g_slist_free (manager->priv->new_sessions); - - g_slist_foreach (manager->priv->fetch_user_requests, - (GFunc) free_fetch_user_request, NULL); - g_slist_free (manager->priv->fetch_user_requests); - - node = manager->priv->new_users; - while (node != NULL) { - GdmUser *user; - GSList *next_node; - - user = GDM_USER (node->data); - next_node = node->next; - - g_signal_handlers_disconnect_by_func (user, on_new_user_loaded, manager); - g_object_unref (user); - manager->priv->new_users = g_slist_delete_link (manager->priv->new_users, node); - node = next_node; - } - - unload_seat (manager); - - if (manager->priv->exclude_usernames != NULL) { - g_slist_foreach (manager->priv->exclude_usernames, (GFunc) g_free, NULL); - g_slist_free (manager->priv->exclude_usernames); - } - - if (manager->priv->include_usernames != NULL) { - g_slist_foreach (manager->priv->include_usernames, (GFunc) g_free, NULL); - g_slist_free (manager->priv->include_usernames); - } - - if (manager->priv->seat.proxy != NULL) { - g_object_unref (manager->priv->seat.proxy); - } - - if (manager->priv->accounts_proxy != NULL) { - g_object_unref (manager->priv->accounts_proxy); - } - - if (manager->priv->ck_history_id != 0) { - g_source_remove (manager->priv->ck_history_id); - manager->priv->ck_history_id = 0; - } - - if (manager->priv->ck_history_watchdog_id != 0) { - g_source_remove (manager->priv->ck_history_watchdog_id); - manager->priv->ck_history_watchdog_id = 0; - } - - if (manager->priv->load_id > 0) { - g_source_remove (manager->priv->load_id); - manager->priv->load_id = 0; - } - - if (manager->priv->reload_passwd_id > 0) { - g_source_remove (manager->priv->reload_passwd_id); - manager->priv->reload_passwd_id = 0; - } - - g_hash_table_destroy (manager->priv->sessions); - - if (manager->priv->passwd_monitor != NULL) { - g_file_monitor_cancel (manager->priv->passwd_monitor); - } - - g_hash_table_destroy (manager->priv->users_by_name); - g_hash_table_destroy (manager->priv->users_by_object_path); - - if (manager->priv->shells_monitor != NULL) { - g_file_monitor_cancel (manager->priv->shells_monitor); - } - - if (manager->priv->shells != NULL) { - g_hash_table_destroy (manager->priv->shells); - } - - G_OBJECT_CLASS (gdm_user_manager_parent_class)->finalize (object); -} - -/** - * gdm_user_manager_ref_default: - * - * Queue loading users into user manager. This must be called, and the - * #GdmUserManager:is-loaded property must be %TRUE before calling - * gdm_user_manager_list_users() - * - * Returns: (transfer full): user manager object - */ -GdmUserManager * -gdm_user_manager_ref_default (void) -{ - if (user_manager_object != NULL) { - g_object_ref (user_manager_object); - } else { - user_manager_object = g_object_new (GDM_TYPE_USER_MANAGER, NULL); - g_object_add_weak_pointer (user_manager_object, - (gpointer *) &user_manager_object); - } - - return GDM_USER_MANAGER (user_manager_object); -} diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user-manager.h gdm-3.0.0/gui/simple-greeter/gdm-user-manager.h --- gdm-2.32.1/gui/simple-greeter/gdm-user-manager.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user-manager.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann - * - * 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. - * - */ - -#ifndef __GDM_USER_MANAGER_H__ -#define __GDM_USER_MANAGER_H__ - -#include - -#include "gdm-user.h" - -G_BEGIN_DECLS - -#define GDM_TYPE_USER_MANAGER (gdm_user_manager_get_type ()) -#define GDM_USER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_USER_MANAGER, GdmUserManager)) -#define GDM_USER_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_USER_MANAGER, GdmUserManagerClass)) -#define GDM_IS_USER_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_USER_MANAGER)) -#define GDM_IS_USER_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_USER_MANAGER)) -#define GDM_USER_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_USER_MANAGER, GdmUserManagerClass)) - -typedef struct GdmUserManagerPrivate GdmUserManagerPrivate; -typedef struct GdmUserManager GdmUserManager; -typedef struct GdmUserManagerClass GdmUserManagerClass; -typedef enum GdmUserManagerError GdmUserManagerError; - -struct GdmUserManager -{ - GObject parent; - GdmUserManagerPrivate *priv; -}; - -struct GdmUserManagerClass -{ - GObjectClass parent_class; - - void (* user_added) (GdmUserManager *user_manager, - GdmUser *user); - void (* user_removed) (GdmUserManager *user_manager, - GdmUser *user); - void (* user_is_logged_in_changed) (GdmUserManager *user_manager, - GdmUser *user); - void (* user_changed) (GdmUserManager *user_manager, - GdmUser *user); -}; - -enum GdmUserManagerError -{ - GDM_USER_MANAGER_ERROR_GENERAL, - GDM_USER_MANAGER_ERROR_KEY_NOT_FOUND -}; - -#define GDM_USER_MANAGER_ERROR gdm_user_manager_error_quark () - -GQuark gdm_user_manager_error_quark (void); -GType gdm_user_manager_get_type (void); - -GdmUserManager * gdm_user_manager_ref_default (void); - -void gdm_user_manager_queue_load (GdmUserManager *manager); -GSList * gdm_user_manager_list_users (GdmUserManager *manager); -GdmUser * gdm_user_manager_get_user (GdmUserManager *manager, - const char *username); -GdmUser * gdm_user_manager_get_user_by_uid (GdmUserManager *manager, - gulong uid); - -gboolean gdm_user_manager_activate_user_session (GdmUserManager *manager, - GdmUser *user); - -gboolean gdm_user_manager_can_switch (GdmUserManager *manager); - -gboolean gdm_user_manager_goto_login_session (GdmUserManager *manager); - -G_END_DECLS - -#endif /* __GDM_USER_MANAGER_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/gdm-user-private.h gdm-3.0.0/gui/simple-greeter/gdm-user-private.h --- gdm-2.32.1/gui/simple-greeter/gdm-user-private.h 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/gdm-user-private.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * - * 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 - */ - -/* - * Private interfaces to the GdmUser object - */ - -#ifndef __GDM_USER_PRIVATE_H_ -#define __GDM_USER_PRIVATE_H_ - -#include - -#include "gdm-user.h" - -G_BEGIN_DECLS - -void _gdm_user_update_from_object_path (GdmUser *user, - const char *object_path); - -void _gdm_user_update_from_pwent (GdmUser *user, - const struct passwd *pwent); - -void _gdm_user_update_login_frequency (GdmUser *user, - guint64 login_frequency); - -void _gdm_user_add_session (GdmUser *user, - const char *session_id); -void _gdm_user_remove_session (GdmUser *user, - const char *session_id); - -G_END_DECLS - -#endif /* !__GDM_USER_PRIVATE__ */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/fixedtip.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/fixedtip.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/fixedtip.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/fixedtip.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,261 +0,0 @@ -/* Metacity fixed tooltip routine */ - -/* - * Copyright (C) 2001 Havoc Pennington - * Copyright (C) 2003-2006 Vincent Untz - * - * 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. - */ - -#include "fixedtip.h" - -/* Signals */ -enum -{ - CLICKED, - LAST_SIGNAL -}; - -static guint fixedtip_signals[LAST_SIGNAL] = { 0 }; - -struct _NaFixedTipPrivate -{ - GtkWidget *parent; - GtkWidget *label; - GtkOrientation orientation; -}; - -G_DEFINE_TYPE (NaFixedTip, na_fixed_tip, GTK_TYPE_WINDOW) - -static gboolean -button_press_handler (GtkWidget *fixedtip, - GdkEventButton *event, - gpointer data) -{ - if (event->button == 1 && event->type == GDK_BUTTON_PRESS) - g_signal_emit (fixedtip, fixedtip_signals[CLICKED], 0); - - return FALSE; -} - -static gboolean -expose_handler (GtkWidget *fixedtip) -{ - GtkRequisition req; - - gtk_widget_size_request (fixedtip, &req); - - gtk_paint_flat_box (gtk_widget_get_style (fixedtip), gtk_widget_get_window (fixedtip), - GTK_STATE_NORMAL, GTK_SHADOW_OUT, - NULL, fixedtip, "tooltip", - 0, 0, req.width, req.height); - - return FALSE; -} - -static void -na_fixed_tip_class_init (NaFixedTipClass *class) -{ - fixedtip_signals[CLICKED] = - g_signal_new ("clicked", - G_OBJECT_CLASS_TYPE (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaFixedTipClass, clicked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - g_type_class_add_private (class, sizeof (NaFixedTipPrivate)); -} - -/* Did you already see this code? Yes, it's gtk_tooltips_ force_window() ;-) */ -static void -na_fixed_tip_init (NaFixedTip *fixedtip) -{ - GtkWidget *label; - - fixedtip->priv = G_TYPE_INSTANCE_GET_PRIVATE (fixedtip, NA_TYPE_FIXED_TIP, - NaFixedTipPrivate); - - gtk_window_set_type_hint (GTK_WINDOW (fixedtip), - GDK_WINDOW_TYPE_HINT_TOOLTIP); - - gtk_widget_set_app_paintable (GTK_WIDGET (fixedtip), TRUE); - gtk_window_set_resizable (GTK_WINDOW (fixedtip), FALSE); - gtk_widget_set_name (GTK_WIDGET (fixedtip), "gtk-tooltips"); - gtk_container_set_border_width (GTK_CONTAINER (fixedtip), 4); - - label = gtk_label_new (NULL); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (fixedtip), label); - fixedtip->priv->label = label; - - g_signal_connect (fixedtip, "expose_event", - G_CALLBACK (expose_handler), NULL); - - gtk_widget_add_events (GTK_WIDGET (fixedtip), GDK_BUTTON_PRESS_MASK); - - g_signal_connect (fixedtip, "button_press_event", - G_CALLBACK (button_press_handler), NULL); - - fixedtip->priv->orientation = GTK_ORIENTATION_HORIZONTAL; -} - -static void -na_fixed_tip_position (NaFixedTip *fixedtip) -{ - GdkScreen *screen; - GtkRequisition req; - int root_x; - int root_y; - int parent_width; - int parent_height; - int screen_width; - int screen_height; - - screen = gtk_widget_get_screen (fixedtip->priv->parent); - gtk_window_set_screen (GTK_WINDOW (fixedtip), screen); - - gtk_widget_size_request (GTK_WIDGET (fixedtip), &req); - - gdk_window_get_origin (gtk_widget_get_window (fixedtip->priv->parent), &root_x, &root_y); - gdk_drawable_get_size (GDK_DRAWABLE (gtk_widget_get_window (fixedtip->priv->parent)), - &parent_width, &parent_height); - - screen_width = gdk_screen_get_width (screen); - screen_height = gdk_screen_get_height (screen); - - /* pad between panel and message window */ -#define PAD 5 - - if (fixedtip->priv->orientation == GTK_ORIENTATION_VERTICAL) - { - if (root_x <= screen_width / 2) - root_x += parent_width + PAD; - else - root_x -= req.width + PAD; - } - else - { - if (root_y <= screen_height / 2) - root_y += parent_height + PAD; - else - root_y -= req.height + PAD; - } - - /* Push onscreen */ - if ((root_x + req.width) > screen_width) - root_x = screen_width - req.width; - - if ((root_y + req.height) > screen_height) - root_y = screen_height - req.height; - - gtk_window_move (GTK_WINDOW (fixedtip), root_x, root_y); -} - -static void -na_fixed_tip_parent_size_allocated (GtkWidget *parent, - GtkAllocation *allocation, - NaFixedTip *fixedtip) -{ - na_fixed_tip_position (fixedtip); -} - -static void -na_fixed_tip_parent_screen_changed (GtkWidget *parent, - GdkScreen *new_screen, - NaFixedTip *fixedtip) -{ - na_fixed_tip_position (fixedtip); -} - -GtkWidget * -na_fixed_tip_new (GtkWidget *parent, - GtkOrientation orientation) -{ - NaFixedTip *fixedtip; - - g_return_val_if_fail (parent != NULL, NULL); - - fixedtip = g_object_new (NA_TYPE_FIXED_TIP, NULL); - - /* It doesn't work if we do this in na_fixed_tip_init(), so do it here */ - gtk_window_set_type_hint (GTK_WINDOW (fixedtip), GTK_WINDOW_POPUP); - - fixedtip->priv->parent = parent; - -#if 0 - //FIXME: would be nice to be able to get the toplevel for the tip, but this - //doesn't work - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (parent); - /* - if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel)) - gtk_window_set_transient_for (GTK_WINDOW (fixedtip), GTK_WINDOW (toplevel)); - */ -#endif - - fixedtip->priv->orientation = orientation; - - //FIXME: would be nice to move the tip when the notification area moves - g_signal_connect_object (parent, "size-allocate", - G_CALLBACK (na_fixed_tip_parent_size_allocated), - fixedtip, 0); - g_signal_connect_object (parent, "screen-changed", - G_CALLBACK (na_fixed_tip_parent_screen_changed), - fixedtip, 0); - - na_fixed_tip_position (fixedtip); - - return GTK_WIDGET (fixedtip); -} - -void -na_fixed_tip_set_markup (GtkWidget *widget, - const char *markup_text) -{ - NaFixedTip *fixedtip; - - g_return_if_fail (NA_IS_FIXED_TIP (widget)); - - fixedtip = NA_FIXED_TIP (widget); - - gtk_label_set_markup (GTK_LABEL (fixedtip->priv->label), - markup_text); - - na_fixed_tip_position (fixedtip); -} - -void -na_fixed_tip_set_orientation (GtkWidget *widget, - GtkOrientation orientation) -{ - NaFixedTip *fixedtip; - - g_return_if_fail (NA_IS_FIXED_TIP (widget)); - - fixedtip = NA_FIXED_TIP (widget); - - if (orientation == fixedtip->priv->orientation) - return; - - fixedtip->priv->orientation = orientation; - - na_fixed_tip_position (fixedtip); -} diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/fixedtip.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/fixedtip.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/fixedtip.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/fixedtip.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/* Fixed tooltip routine */ - -/* - * Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc. - * Copyright (C) 2003-2006 Vincent Untz - * - * 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. - */ - -#ifndef FIXED_TIP_H -#define FIXED_TIP_H - -#include - -G_BEGIN_DECLS - -#define NA_TYPE_FIXED_TIP (na_fixed_tip_get_type ()) -#define NA_FIXED_TIP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_FIXED_TIP, NaFixedTip)) -#define NA_FIXED_TIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_FIXED_TIP, NaFixedTipClass)) -#define NA_IS_FIXED_TIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_FIXED_TIP)) -#define NA_IS_FIXED_TIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_FIXED_TIP)) -#define NA_FIXED_TIP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_FIXED_TIP, NaFixedTipClass)) - -typedef struct _NaFixedTip NaFixedTip; -typedef struct _NaFixedTipPrivate NaFixedTipPrivate; -typedef struct _NaFixedTipClass NaFixedTipClass; - -struct _NaFixedTip -{ - GtkWindow parent_instance; - - NaFixedTipPrivate *priv; -}; - -struct _NaFixedTipClass -{ - GtkWindowClass parent_class; - - void (* clicked) (NaFixedTip *fixedtip); -}; - -GType na_fixed_tip_get_type (void); - -GtkWidget *na_fixed_tip_new (GtkWidget *parent, - GtkOrientation orientation); - -void na_fixed_tip_set_markup (GtkWidget *widget, - const char *markup_text); - -void na_fixed_tip_set_orientation (GtkWidget *widget, - GtkOrientation orientation); - -G_END_DECLS - -#endif /* FIXED_TIP_H */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/Makefile.am gdm-3.0.0/gui/simple-greeter/libnotificationarea/Makefile.am --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -NULL = - -INCLUDES = \ - -I. \ - -I.. \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOGDIR=\"$(logdir)\" \ - -DPIXMAPDIR=\"$(pixmapdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - $(GTK_CFLAGS) \ - $(XLIB_CFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = \ - libnotificationarea.la \ - $(NULL) - -BUILT_SOURCES = \ - na-marshal.c \ - na-marshal.h \ - $(NULL) - -libnotificationarea_la_SOURCES = \ - fixedtip.h \ - fixedtip.c \ - obox.c \ - obox.h \ - na-tray.c \ - na-tray.h \ - na-tray-child.c \ - na-tray-child.h \ - na-tray-manager.c \ - na-tray-manager.h \ - na-marshal.c \ - na-marshal.h \ - $(NULL) - -libnotificationarea_la_LIBADD = \ - $(GTK_LIBS) \ - $(XLIB_LIBS) \ - $(NULL) - -libnotificationarea_la_LDFLAGS = \ - -export-dynamic \ - $(NULL) - -EXTRA_DIST = \ - na-marshal.list \ - $(NULL) - -na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@ - -na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL) - echo "#include \"na-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@ - -noinst_PROGRAMS = testtray - -testtray_SOURCES = \ - testtray.c \ - $(NULL) - -testtray_LDADD = \ - libnotificationarea.la \ - $(GREETER_LIBS) \ - $(XLIB_LIBS) \ - $(NULL) diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/Makefile.in gdm-3.0.0/gui/simple-greeter/libnotificationarea/Makefile.in --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,724 +0,0 @@ -# Makefile.in generated by automake 1.11.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. -# 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@ -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@ -noinst_PROGRAMS = testtray$(EXEEXT) -subdir = gui/simple-greeter/libnotificationarea -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libnotificationarea_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__objects_1 = -am_libnotificationarea_la_OBJECTS = fixedtip.lo obox.lo na-tray.lo \ - na-tray-child.lo na-tray-manager.lo na-marshal.lo \ - $(am__objects_1) -libnotificationarea_la_OBJECTS = $(am_libnotificationarea_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -libnotificationarea_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnotificationarea_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) -am_testtray_OBJECTS = testtray.$(OBJEXT) $(am__objects_1) -testtray_OBJECTS = $(am_testtray_OBJECTS) -testtray_DEPENDENCIES = libnotificationarea.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_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_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(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 = $(libnotificationarea_la_SOURCES) $(testtray_SOURCES) -DIST_SOURCES = $(libnotificationarea_la_SOURCES) $(testtray_SOURCES) -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@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ -AR = @AR@ -AT_BINDIR = @AT_BINDIR@ -AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BINDIR = @BINDIR@ -CANBERRA_GTK_CFLAGS = @CANBERRA_GTK_CFLAGS@ -CANBERRA_GTK_LIBS = @CANBERRA_GTK_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ -CHECK_LIBS = @CHECK_LIBS@ -COMMON_CFLAGS = @COMMON_CFLAGS@ -COMMON_LIBS = @COMMON_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DAEMON_CFLAGS = @DAEMON_CFLAGS@ -DAEMON_LIBS = @DAEMON_LIBS@ -DATADIR = @DATADIR@ -DATADIRNAME = @DATADIRNAME@ -DBUS_SYS_DIR = @DBUS_SYS_DIR@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ -EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ -EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ -EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ -EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ -EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ -EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ -EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@ -EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@ -FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GDMCHOOSER = @GDMCHOOSER@ -GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ -GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ -GDM_GROUPNAME = @GDM_GROUPNAME@ -GDM_OLD_CONF = @GDM_OLD_CONF@ -GDM_PID_FILE = @GDM_PID_FILE@ -GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@ -GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@ -GDM_USERNAME = @GDM_USERNAME@ -GDM_WORKING_DIR = @GDM_WORKING_DIR@ -GDM_XAUTH_DIR = @GDM_XAUTH_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@ -HAVE_PAM = @HAVE_PAM@ -HELP_DIR = @HELP_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@ -LANG_CONFIG_FILE = @LANG_CONFIG_FILE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDIR = @LIBDIR@ -LIBEXECDIR = @LIBEXECDIR@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWRAP_LIBS = @LIBWRAP_LIBS@ -LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@ -LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOCALSTATEDIR = @LOCALSTATEDIR@ -LTLIBOBJS = @LTLIBOBJS@ -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@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -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@ -PAM_LIBS = @PAM_LIBS@ -PAM_PREFIX = @PAM_PREFIX@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -RBAC_LIBS = @RBAC_LIBS@ -SBINDIR = @SBINDIR@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ -SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ -SIMPLE_GREETER_CFLAGS = @SIMPLE_GREETER_CFLAGS@ -SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LIBS@ -SOUND_PROGRAM = @SOUND_PROGRAM@ -STRIP = @STRIP@ -SYSCONFDIR = @SYSCONFDIR@ -UPOWER = @UPOWER@ -UPOWER_CFLAGS = @UPOWER_CFLAGS@ -UPOWER_LIBS = @UPOWER_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@ -XDMCP_LIBS = @XDMCP_LIBS@ -XEVIE_OPTION = @XEVIE_OPTION@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XLIB_CFLAGS = @XLIB_CFLAGS@ -XLIB_LIBS = @XLIB_LIBS@ -XMKMF = @XMKMF@ -XSESSION_SHELL = @XSESSION_SHELL@ -X_CFLAGS = @X_CFLAGS@ -X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PATH = @X_PATH@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_SERVER = @X_SERVER@ -X_SERVER_PATH = @X_SERVER_PATH@ -X_XNEST_CMD = @X_XNEST_CMD@ -X_XNEST_CONFIG_OPTIONS = @X_XNEST_CONFIG_OPTIONS@ -X_XNEST_UNSCALED_FONTPATH = @X_XNEST_UNSCALED_FONTPATH@ -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_CXX = @ac_ct_CXX@ -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@ -authdir = @authdir@ -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@ -dmconfdir = @dmconfdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gdmconfdir = @gdmconfdir@ -gdmlocaledir = @gdmlocaledir@ -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@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -logdir = @logdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pixmapdir = @pixmapdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -sysconfsubdir = @sysconfsubdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -NULL = -INCLUDES = \ - -I. \ - -I.. \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOGDIR=\"$(logdir)\" \ - -DPIXMAPDIR=\"$(pixmapdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - $(GTK_CFLAGS) \ - $(XLIB_CFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = \ - libnotificationarea.la \ - $(NULL) - -BUILT_SOURCES = \ - na-marshal.c \ - na-marshal.h \ - $(NULL) - -libnotificationarea_la_SOURCES = \ - fixedtip.h \ - fixedtip.c \ - obox.c \ - obox.h \ - na-tray.c \ - na-tray.h \ - na-tray-child.c \ - na-tray-child.h \ - na-tray-manager.c \ - na-tray-manager.h \ - na-marshal.c \ - na-marshal.h \ - $(NULL) - -libnotificationarea_la_LIBADD = \ - $(GTK_LIBS) \ - $(XLIB_LIBS) \ - $(NULL) - -libnotificationarea_la_LDFLAGS = \ - -export-dynamic \ - $(NULL) - -EXTRA_DIST = \ - na-marshal.list \ - $(NULL) - -testtray_SOURCES = \ - testtray.c \ - $(NULL) - -testtray_LDADD = \ - libnotificationarea.la \ - $(GREETER_LIBS) \ - $(XLIB_LIBS) \ - $(NULL) - -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 gui/simple-greeter/libnotificationarea/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu gui/simple-greeter/libnotificationarea/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): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_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 -libnotificationarea.la: $(libnotificationarea_la_OBJECTS) $(libnotificationarea_la_DEPENDENCIES) - $(AM_V_CCLD)$(libnotificationarea_la_LINK) $(libnotificationarea_la_OBJECTS) $(libnotificationarea_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_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 -testtray$(EXEEXT): $(testtray_OBJECTS) $(testtray_DEPENDENCIES) - @rm -f testtray$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(testtray_OBJECTS) $(testtray_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixedtip.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/na-marshal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/na-tray-child.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/na-tray-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/na-tray.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obox.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testtray.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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -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 - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ - 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 -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; }; }'`; \ - 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" - -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 $(LTLIBRARIES) $(PROGRAMS) -installdirs: -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: - $(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 -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." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS 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-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 -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: - -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - ctags 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-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 uninstall uninstall-am - - -na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL) - $(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@ - -na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL) - echo "#include \"na-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@ - -# 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 gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.c 2011-03-28 16:57:56.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ -#include "na-marshal.h" - -#include - - -#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_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) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:OBJECT,OBJECT (na-marshal.list:1) */ -void -_na_marshal_VOID__OBJECT_OBJECT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_OBJECT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_object (param_values + 2), - data2); -} - -/* VOID:OBJECT,STRING,LONG,LONG (na-marshal.list:2) */ -void -_na_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - glong arg_3, - glong arg_4, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 5); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_STRING_LONG_LONG) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - g_marshal_value_peek_long (param_values + 3), - g_marshal_value_peek_long (param_values + 4), - data2); -} - -/* VOID:OBJECT,LONG (na-marshal.list:3) */ -void -_na_marshal_VOID__OBJECT_LONG (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_LONG) (gpointer data1, - gpointer arg_1, - glong arg_2, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_LONG callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_LONG) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_long (param_values + 2), - data2); -} - diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.h 2011-03-28 16:57:56.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ - -#ifndef ___na_marshal_MARSHAL_H__ -#define ___na_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:OBJECT,OBJECT (na-marshal.list:1) */ -extern void _na_marshal_VOID__OBJECT_OBJECT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,STRING,LONG,LONG (na-marshal.list:2) */ -extern void _na_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,LONG (na-marshal.list:3) */ -extern void _na_marshal_VOID__OBJECT_LONG (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* ___na_marshal_MARSHAL_H__ */ - diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.list gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.list --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-marshal.list 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-marshal.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -VOID:OBJECT,OBJECT -VOID:OBJECT,STRING,LONG,LONG -VOID:OBJECT,LONG diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,827 +0,0 @@ -/* - * Copyright (C) 2002 Red Hat, Inc. - * Copyright (C) 2003-2006 Vincent Untz - * Copyright (C) 2007 Christian Persch - * - * 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. - */ - -#include -#include - -#include - -#include "na-tray-manager.h" -#include "fixedtip.h" - -#include "na-tray.h" - -#define ICON_SPACING 1 -#define MIN_BOX_SIZE 3 - -typedef struct -{ - NaTrayManager *tray_manager; - GSList *all_trays; - GHashTable *icon_table; - GHashTable *tip_table; -} TraysScreen; - -struct _NaTrayPrivate -{ - GdkScreen *screen; - TraysScreen *trays_screen; - - GtkWidget *box; - GtkWidget *frame; - - guint idle_redraw_id; - - GtkOrientation orientation; -}; - -typedef struct -{ - char *text; - glong id; - glong timeout; -} IconTipBuffer; - -typedef struct -{ - NaTray *tray; /* tray containing the tray icon */ - GtkWidget *icon; /* tray icon sending the message */ - GtkWidget *fixedtip; - guint source_id; - glong id; /* id of the current message */ - GSList *buffer; /* buffered messages */ -} IconTip; - -enum -{ - PROP_0, - PROP_ORIENTATION, - PROP_SCREEN -}; - -static gboolean initialized = FALSE; -static TraysScreen *trays_screens = NULL; - -static void icon_tip_show_next (IconTip *icontip); - -/* NaBox, an instantiable GtkBox */ - -typedef GtkBox NaBox; -typedef GtkBoxClass NaBoxClass; - -static GType na_box_get_type (void); - -G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX) - -static void -na_box_init (NaBox *box) -{ -} - -static void -na_box_class_init (NaBoxClass *klass) -{ -} - -/* NaTray */ - -G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN) - -static NaTray * -get_tray (TraysScreen *trays_screen) -{ - if (trays_screen->all_trays == NULL) - return NULL; - - return trays_screen->all_trays->data; -} - -const char *roles[] = { - "keyboard", - "volume", - "bluetooth", - "network", - "battery", - NULL -}; - -const char *wmclass_roles[] = { - "Bluetooth-applet", "bluetooth", - "Gnome-volume-control-applet", "volume", - "Nm-applet", "network", - "Gnome-power-manager", "battery", - NULL, -}; - -static const char * -find_role (const char *wmclass) -{ - int i; - - for (i = 0; wmclass_roles[i]; i += 2) - { - if (strcmp (wmclass, wmclass_roles[i]) == 0) - return wmclass_roles[i + 1]; - } - - return NULL; -} - -static int -find_role_pos (const char *role) -{ - int i; - - for (i = 0; roles[i]; i++) - { - if (strcmp (role, roles[i]) == 0) - break; - } - - return i + 1; -} - -static void -tray_added (NaTrayManager *manager, - GtkWidget *icon, - TraysScreen *trays_screen) -{ - NaTray *tray; - NaTrayPrivate *priv; - GList *l, *children; - int position; - char *class_a; - const char *role; - int role_position; - - tray = get_tray (trays_screen); - if (tray == NULL) - return; - - priv = tray->priv; - - g_assert (priv->trays_screen == trays_screen); - - g_hash_table_insert (trays_screen->icon_table, icon, tray); - - position = 0; - - class_a = NULL; - na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a); - if (!class_a) - goto insert; - - role = find_role (class_a); - g_free (class_a); - if (!role) - goto insert; - - role_position = find_role_pos (role); - g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position)); - - children = gtk_container_get_children (GTK_CONTAINER (priv->box)); - for (l = g_list_last (children); l; l = l->prev) - { - GtkWidget *child = l->data; - gint rp; - - rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position")); - if (rp == 0 || rp < role_position) - { - position = g_list_index (children, child) + 1; - break; - } - } - g_list_free (children); - - if (position < 0) - position = 0; - -insert: - gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (priv->box), icon, position); - - gtk_widget_show (icon); -} - -static void -tray_removed (NaTrayManager *manager, - GtkWidget *icon, - TraysScreen *trays_screen) -{ - NaTray *tray; - - tray = g_hash_table_lookup (trays_screen->icon_table, icon); - if (tray == NULL) - return; - - g_assert (tray->priv->trays_screen == trays_screen); - - g_hash_table_remove (trays_screen->icon_table, icon); - /* this will also destroy the tip associated to this icon */ - g_hash_table_remove (trays_screen->tip_table, icon); -} - -static void -icon_tip_buffer_free (gpointer data, - gpointer userdata) -{ - IconTipBuffer *buffer; - - buffer = data; - - g_free (buffer->text); - buffer->text = NULL; - - g_free (buffer); -} - -static void -icon_tip_free (gpointer data) -{ - IconTip *icontip; - - if (data == NULL) - return; - - icontip = data; - - if (icontip->fixedtip != NULL) - gtk_widget_destroy (GTK_WIDGET (icontip->fixedtip)); - icontip->fixedtip = NULL; - - if (icontip->source_id != 0) - g_source_remove (icontip->source_id); - icontip->source_id = 0; - - if (icontip->buffer != NULL) - { - g_slist_foreach (icontip->buffer, icon_tip_buffer_free, NULL); - g_slist_free (icontip->buffer); - } - icontip->buffer = NULL; - - g_free (icontip); -} - -static int -icon_tip_buffer_compare (gconstpointer a, - gconstpointer b) -{ - const IconTipBuffer *buffer_a = a; - const IconTipBuffer *buffer_b = b; - - if (buffer_a == NULL || buffer_b == NULL) - return !(buffer_a == buffer_b); - - return buffer_a->id - buffer_b->id; -} - -static void -icon_tip_show_next_clicked (GtkWidget *widget, - gpointer data) -{ - icon_tip_show_next ((IconTip *) data); -} - -static gboolean -icon_tip_show_next_timeout (gpointer data) -{ - IconTip *icontip = (IconTip *) data; - - icon_tip_show_next (icontip); - - return FALSE; -} - -static void -icon_tip_show_next (IconTip *icontip) -{ - IconTipBuffer *buffer; - - if (icontip->buffer == NULL) - { - /* this will also destroy the tip window */ - g_hash_table_remove (icontip->tray->priv->trays_screen->tip_table, - icontip->icon); - return; - } - - if (icontip->source_id != 0) - g_source_remove (icontip->source_id); - icontip->source_id = 0; - - buffer = icontip->buffer->data; - icontip->buffer = g_slist_remove (icontip->buffer, buffer); - - if (icontip->fixedtip == NULL) - { - icontip->fixedtip = na_fixed_tip_new (icontip->icon, - na_tray_get_orientation (icontip->tray)); - - g_signal_connect (icontip->fixedtip, "clicked", - G_CALLBACK (icon_tip_show_next_clicked), icontip); - } - - na_fixed_tip_set_markup (icontip->fixedtip, buffer->text); - - if (!gtk_widget_get_mapped (icontip->fixedtip)) - gtk_widget_show (icontip->fixedtip); - - icontip->id = buffer->id; - - if (buffer->timeout > 0) - icontip->source_id = g_timeout_add_seconds (buffer->timeout, - icon_tip_show_next_timeout, - icontip); - - icon_tip_buffer_free (buffer, NULL); -} - -static void -message_sent (NaTrayManager *manager, - GtkWidget *icon, - const char *text, - glong id, - glong timeout, - TraysScreen *trays_screen) -{ - IconTip *icontip; - IconTipBuffer find_buffer; - IconTipBuffer *buffer; - gboolean show_now; - - icontip = g_hash_table_lookup (trays_screen->tip_table, icon); - - find_buffer.id = id; - if (icontip && - (icontip->id == id || - g_slist_find_custom (icontip->buffer, &find_buffer, - icon_tip_buffer_compare) != NULL)) - /* we already have this message, so ignore it */ - /* FIXME: in an ideal world, we'd remember all the past ids and ignore them - * too */ - return; - - show_now = FALSE; - - if (icontip == NULL) - { - NaTray *tray; - - tray = g_hash_table_lookup (trays_screen->icon_table, icon); - if (tray == NULL) - { - /* We don't know about the icon sending the message, so ignore it. - * But this should never happen since NaTrayManager shouldn't send - * us the message if there's no socket for it. */ - g_critical ("Ignoring a message sent by a tray icon " - "we don't know: \"%s\".\n", text); - return; - } - - icontip = g_new0 (IconTip, 1); - icontip->tray = tray; - icontip->icon = icon; - - g_hash_table_insert (trays_screen->tip_table, icon, icontip); - - show_now = TRUE; - } - - buffer = g_new0 (IconTipBuffer, 1); - - buffer->text = g_strdup (text); - buffer->id = id; - buffer->timeout = timeout; - - icontip->buffer = g_slist_append (icontip->buffer, buffer); - - if (show_now) - icon_tip_show_next (icontip); -} - -static void -message_cancelled (NaTrayManager *manager, - GtkWidget *icon, - glong id, - TraysScreen *trays_screen) -{ - IconTip *icontip; - IconTipBuffer find_buffer; - GSList *cancel_buffer_l; - IconTipBuffer *cancel_buffer; - - icontip = g_hash_table_lookup (trays_screen->tip_table, icon); - if (icontip == NULL) - return; - - if (icontip->id == id) - { - icon_tip_show_next (icontip); - return; - } - - find_buffer.id = id; - cancel_buffer_l = g_slist_find_custom (icontip->buffer, &find_buffer, - icon_tip_buffer_compare); - if (cancel_buffer_l == NULL) - return; - - cancel_buffer = cancel_buffer_l->data; - icon_tip_buffer_free (cancel_buffer, NULL); - - icontip->buffer = g_slist_remove_link (icontip->buffer, cancel_buffer_l); - g_slist_free_1 (cancel_buffer_l); -} - -static void -update_orientation_for_messages (gpointer key, - gpointer value, - gpointer data) -{ - NaTray *tray; - IconTip *icontip; - - if (value == NULL) - return; - - icontip = value; - tray = data; - if (icontip->tray != tray) - return; - - if (icontip->fixedtip) - na_fixed_tip_set_orientation (icontip->fixedtip, tray->priv->orientation); -} - -static void -update_size_and_orientation (NaTray *tray) -{ - NaTrayPrivate *priv = tray->priv; - - gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), priv->orientation); - - /* This only happens when setting the property during object construction */ - if (!priv->trays_screen) - return; - - g_hash_table_foreach (priv->trays_screen->tip_table, - update_orientation_for_messages, tray); - - if (get_tray (priv->trays_screen) == tray) - na_tray_manager_set_orientation (priv->trays_screen->tray_manager, - priv->orientation); - - /* note, you want this larger if the frame has non-NONE relief by default. */ - switch (priv->orientation) - { - case GTK_ORIENTATION_VERTICAL: - /* Give box a min size so the frame doesn't look dumb */ - gtk_widget_set_size_request (priv->box, MIN_BOX_SIZE, -1); - break; - case GTK_ORIENTATION_HORIZONTAL: - gtk_widget_set_size_request (priv->box, -1, MIN_BOX_SIZE); - break; - } -} - -/* Children with alpha channels have been set to be composited by calling - * gdk_window_set_composited(). We need to paint these children ourselves. - */ -static void -na_tray_expose_icon (GtkWidget *widget, - gpointer data) -{ - cairo_t *cr = data; - - if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget))) - { - GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); - - gdk_cairo_set_source_pixmap (cr, gtk_widget_get_window (widget), - widget_allocation.x, - widget_allocation.y); - cairo_paint (cr); - } -} - -static void -na_tray_expose_box (GtkWidget *box, - GdkEventExpose *event) -{ - cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (box)); - - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - - gtk_container_foreach (GTK_CONTAINER (box), na_tray_expose_icon, cr); - - cairo_destroy (cr); -} - -static void -na_tray_init (NaTray *tray) -{ - NaTrayPrivate *priv; - - priv = tray->priv = G_TYPE_INSTANCE_GET_PRIVATE (tray, NA_TYPE_TRAY, NaTrayPrivate); - - priv->screen = NULL; - priv->orientation = GTK_ORIENTATION_HORIZONTAL; - - priv->frame = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_container_add (GTK_CONTAINER (tray), priv->frame); - gtk_widget_show (priv->frame); - - priv->box = g_object_new (na_box_get_type (), NULL); - g_signal_connect (priv->box, "expose-event", - G_CALLBACK (na_tray_expose_box), tray); - gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING); - gtk_container_add (GTK_CONTAINER (priv->frame), priv->box); - gtk_widget_show (priv->box); -} - -static GObject * -na_tray_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) -{ - GObject *object; - NaTray *tray; - NaTrayPrivate *priv; - int screen_number; - - object = G_OBJECT_CLASS (na_tray_parent_class)->constructor (type, - n_construct_properties, - construct_params); - tray = NA_TRAY (object); - priv = tray->priv; - - g_assert (priv->screen != NULL); - - if (!initialized) - { - GdkDisplay *display; - int n_screens; - - display = gdk_display_get_default (); - n_screens = gdk_display_get_n_screens (display); - trays_screens = g_new0 (TraysScreen, n_screens); - initialized = TRUE; - } - - screen_number = gdk_screen_get_number (priv->screen); - - if (trays_screens [screen_number].tray_manager == NULL) - { - NaTrayManager *tray_manager; - - tray_manager = na_tray_manager_new (); - - if (na_tray_manager_manage_screen (tray_manager, priv->screen)) - { - trays_screens [screen_number].tray_manager = tray_manager; - - na_tray_manager_set_padding (tray_manager, 0); - - g_signal_connect (tray_manager, "tray_icon_added", - G_CALLBACK (tray_added), - &trays_screens [screen_number]); - g_signal_connect (tray_manager, "tray_icon_removed", - G_CALLBACK (tray_removed), - &trays_screens [screen_number]); - g_signal_connect (tray_manager, "message_sent", - G_CALLBACK (message_sent), - &trays_screens [screen_number]); - g_signal_connect (tray_manager, "message_cancelled", - G_CALLBACK (message_cancelled), - &trays_screens [screen_number]); - - trays_screens [screen_number].icon_table = g_hash_table_new (NULL, - NULL); - trays_screens [screen_number].tip_table = g_hash_table_new_full ( - NULL, - NULL, - NULL, - icon_tip_free); - } - else - { - g_printerr ("System tray didn't get the system tray manager selection for screen %d\n", - screen_number); - g_object_unref (tray_manager); - } - } - - priv->trays_screen = &trays_screens [screen_number]; - trays_screens [screen_number].all_trays = g_slist_append (trays_screens [screen_number].all_trays, - tray); - - update_size_and_orientation (tray); - - return object; -} - -static void -na_tray_dispose (GObject *object) -{ - NaTray *tray = NA_TRAY (object); - NaTrayPrivate *priv = tray->priv; - TraysScreen *trays_screen = priv->trays_screen; - - if (trays_screen != NULL) - { - trays_screen->all_trays = g_slist_remove (trays_screen->all_trays, tray); - - if (trays_screen->all_trays == NULL) - { - /* Make sure we drop the manager selection */ - g_object_unref (trays_screen->tray_manager); - trays_screen->tray_manager = NULL; - - g_hash_table_destroy (trays_screen->icon_table); - trays_screen->icon_table = NULL; - - g_hash_table_destroy (trays_screen->tip_table); - trays_screen->tip_table = NULL; - } - else - { - NaTray *new_tray; - - new_tray = get_tray (trays_screen); - if (new_tray != NULL) - na_tray_manager_set_orientation (trays_screen->tray_manager, - na_tray_get_orientation (new_tray)); - } - } - - priv->trays_screen = NULL; - - if (priv->idle_redraw_id != 0) - { - g_source_remove (priv->idle_redraw_id); - priv->idle_redraw_id = 0; - } - - G_OBJECT_CLASS (na_tray_parent_class)->dispose (object); -} - -static void -na_tray_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - NaTray *tray = NA_TRAY (object); - NaTrayPrivate *priv = tray->priv; - - switch (prop_id) - { - case PROP_ORIENTATION: - na_tray_set_orientation (tray, g_value_get_enum (value)); - break; - case PROP_SCREEN: - priv->screen = g_value_get_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -na_tray_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - gtk_widget_size_request (gtk_bin_get_child (GTK_BIN (widget)), requisition); -} - -static void -na_tray_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - gtk_widget_size_allocate (gtk_bin_get_child (GTK_BIN (widget)), allocation); -} - -static void -na_tray_class_init (NaTrayClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - gobject_class->constructor = na_tray_constructor; - gobject_class->set_property = na_tray_set_property; - gobject_class->dispose = na_tray_dispose; - - widget_class->size_request = na_tray_size_request; - widget_class->size_allocate = na_tray_size_allocate; - - g_object_class_install_property - (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", "orientation", "orientation", - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property - (gobject_class, - PROP_SCREEN, - g_param_spec_object ("screen", "screen", "screen", - GDK_TYPE_SCREEN, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - g_type_class_add_private (gobject_class, sizeof (NaTrayPrivate)); -} - -NaTray * -na_tray_new_for_screen (GdkScreen *screen, - GtkOrientation orientation) -{ - return g_object_new (NA_TYPE_TRAY, - "screen", screen, - "orientation", orientation, - NULL); -} - -void -na_tray_set_orientation (NaTray *tray, - GtkOrientation orientation) -{ - NaTrayPrivate *priv = tray->priv; - - if (orientation == priv->orientation) - return; - - priv->orientation = orientation; - - update_size_and_orientation (tray); -} - -GtkOrientation -na_tray_get_orientation (NaTray *tray) -{ - return tray->priv->orientation; -} - -static gboolean -idle_redraw_cb (NaTray *tray) -{ - NaTrayPrivate *priv = tray->priv; - - gtk_container_foreach (GTK_CONTAINER (priv->box), (GtkCallback)na_tray_child_force_redraw, tray); - - priv->idle_redraw_id = 0; - - return FALSE; -} - -void -na_tray_set_padding (NaTray *tray, - gint padding) -{ - NaTrayPrivate *priv = tray->priv; - - if (get_tray (priv->trays_screen) == tray) - na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding); -} - -void -na_tray_force_redraw (NaTray *tray) -{ - NaTrayPrivate *priv = tray->priv; - - /* Force the icons to redraw their backgrounds. - */ - if (priv->idle_redraw_id == 0) - priv->idle_redraw_id = g_idle_add ((GSourceFunc) idle_redraw_cb, tray); -} diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-child.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-child.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-child.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-child.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,516 +0,0 @@ -/* na-tray-child.c - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * Copyright (C) 2008 Red Hat, Inc. - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include - -#include "na-tray-child.h" - -#include -#include -#include -#include - -G_DEFINE_TYPE (NaTrayChild, na_tray_child, GTK_TYPE_SOCKET) - -static void -na_tray_child_finalize (GObject *object) -{ - G_OBJECT_CLASS (na_tray_child_parent_class)->finalize (object); -} - -static void -na_tray_child_realize (GtkWidget *widget) -{ - NaTrayChild *child = NA_TRAY_CHILD (widget); - GdkVisual *visual = gtk_widget_get_visual (widget); - - GTK_WIDGET_CLASS (na_tray_child_parent_class)->realize (widget); - - if (child->has_alpha) - { - /* We have real transparency with an ARGB visual and the Composite - * extension. */ - - /* Set a transparent background */ - GdkColor transparent = { 0, 0, 0, 0 }; /* only pixel=0 matters */ - gdk_window_set_background (gtk_widget_get_window (widget), &transparent); - gdk_window_set_composited (gtk_widget_get_window (widget), TRUE); - - child->parent_relative_bg = FALSE; - } - else if (visual == gdk_drawable_get_visual (GDK_DRAWABLE (gdk_window_get_parent (gtk_widget_get_window (widget))))) - { - /* Otherwise, if the visual matches the visual of the parent window, we - * can use a parent-relative background and fake transparency. */ - gdk_window_set_back_pixmap (gtk_widget_get_window (widget), NULL, TRUE); - - child->parent_relative_bg = TRUE; - } - else - { - /* Nothing to do; the icon will sit on top of an ugly gray box */ - child->parent_relative_bg = FALSE; - } - - gdk_window_set_composited (gtk_widget_get_window (widget), child->composited); - - gtk_widget_set_app_paintable (GTK_WIDGET (child), - child->parent_relative_bg || child->has_alpha); - - /* Double-buffering will interfere with the parent-relative-background fake - * transparency, since the double-buffer code doesn't know how to fill in the - * background of the double-buffer correctly. - */ - gtk_widget_set_double_buffered (GTK_WIDGET (child), - child->parent_relative_bg); -} - -static void -na_tray_child_style_set (GtkWidget *widget, - GtkStyle *previous_style) -{ - /* The default handler resets the background according to the new style. - * We either use a transparent background or a parent-relative background - * and ignore the style background. So, just don't chain up. - */ -} - -#if 0 -/* This is adapted from code that was commented out in na-tray-manager.c; the - * code in na-tray-manager.c wouldn't have worked reliably, this will. So maybe - * it can be reenabled. On other hand, things seem to be working fine without - * it. - * - * If reenabling, you need to hook it up in na_tray_child_class_init(). - */ -static void -na_tray_child_size_request (GtkWidget *widget, - GtkRequisition *request) -{ - GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_request (widget, request); - - /* - * Make sure the icons have a meaningful size .. - */ - if ((request->width < 16) || (request->height < 16)) - { - gint nw = MAX (24, request->width); - gint nh = MAX (24, request->height); - g_warning ("Tray icon has requested a size of (%ix%i), resizing to (%ix%i)", - req.width, req.height, nw, nh); - request->width = nw; - request->height = nh; - } -} -#endif - -static void -na_tray_child_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - NaTrayChild *child = NA_TRAY_CHILD (widget); - - GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); - gboolean moved = allocation->x != widget_allocation.x || - allocation->y != widget_allocation.y; - gboolean resized = allocation->width != widget_allocation.width || - allocation->height != widget_allocation.height; - - /* When we are allocating the widget while mapped we need special handling - * for both real and fake transparency. - * - * Real transparency: we need to invalidate and trigger a redraw of the old - * and new areas. (GDK really should handle this for us, but doesn't as of - * GTK+-2.14) - * - * Fake transparency: if the widget moved, we need to force the contents to - * be redrawn with the new offset for the parent-relative background. - */ - if ((moved || resized) && gtk_widget_get_mapped (widget)) - { - if (na_tray_child_has_alpha (child)) - gdk_window_invalidate_rect (gdk_window_get_parent (gtk_widget_get_window (widget)), - &widget_allocation, FALSE); - } - - GTK_WIDGET_CLASS (na_tray_child_parent_class)->size_allocate (widget, - allocation); - - if ((moved || resized) && gtk_widget_get_mapped (widget)) - { - if (na_tray_child_has_alpha (NA_TRAY_CHILD (widget))) - gdk_window_invalidate_rect (gdk_window_get_parent (gtk_widget_get_window (widget)), - &widget_allocation, FALSE); - else if (moved && child->parent_relative_bg) - na_tray_child_force_redraw (child); - } -} - -/* The plug window should completely occupy the area of the child, so we won't - * get an expose event. But in case we do (the plug unmaps itself, say), this - * expose handler draws with real or fake transparency. - */ -static gboolean -na_tray_child_expose_event (GtkWidget *widget, - GdkEventExpose *event) -{ - NaTrayChild *child = NA_TRAY_CHILD (widget); - - if (na_tray_child_has_alpha (child)) - { - /* Clear to transparent */ - cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); - cairo_set_source_rgba (cr, 0, 0, 0, 0); - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - gdk_cairo_region (cr, event->region); - cairo_fill (cr); - cairo_destroy (cr); - } - else if (child->parent_relative_bg) - { - /* Clear to parent-relative pixmap */ - gdk_window_clear_area (gtk_widget_get_window (widget), - event->area.x, event->area.y, - event->area.width, event->area.height); - } - - return FALSE; -} - -static void -na_tray_child_init (NaTrayChild *child) -{ -} - -static void -na_tray_child_class_init (NaTrayChildClass *klass) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - - gobject_class = (GObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - - gobject_class->finalize = na_tray_child_finalize; - widget_class->style_set = na_tray_child_style_set; - widget_class->realize = na_tray_child_realize; - widget_class->size_allocate = na_tray_child_size_allocate; - widget_class->expose_event = na_tray_child_expose_event; -} - -GtkWidget * -na_tray_child_new (GdkScreen *screen, - Window icon_window) -{ - XWindowAttributes window_attributes; - Display *xdisplay; - NaTrayChild *child; - GdkVisual *visual; - gboolean visual_has_alpha; - GdkColormap *colormap; - gboolean new_colormap; - int result; - - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - g_return_val_if_fail (icon_window != None, NULL); - - xdisplay = GDK_SCREEN_XDISPLAY (screen); - - /* We need to determine the visual of the window we are embedding and create - * the socket in the same visual. - */ - - gdk_error_trap_push (); - result = XGetWindowAttributes (xdisplay, icon_window, - &window_attributes); - gdk_error_trap_pop (); - - if (!result) /* Window already gone */ - return NULL; - - visual = gdk_x11_screen_lookup_visual (screen, - window_attributes.visual->visualid); - if (!visual) /* Icon window is on another screen? */ - return NULL; - - new_colormap = FALSE; - - if (visual == gdk_screen_get_rgb_visual (screen)) - colormap = gdk_screen_get_rgb_colormap (screen); - else if (visual == gdk_screen_get_rgba_visual (screen)) - colormap = gdk_screen_get_rgba_colormap (screen); - else if (visual == gdk_screen_get_system_visual (screen)) - colormap = gdk_screen_get_system_colormap (screen); - else - { - colormap = gdk_colormap_new (visual, FALSE); - new_colormap = TRUE; - } - - child = g_object_new (NA_TYPE_TRAY_CHILD, NULL); - child->icon_window = icon_window; - - gtk_widget_set_colormap (GTK_WIDGET (child), colormap); - - /* We have alpha if the visual has something other than red, green, - * and blue */ - visual_has_alpha = visual->red_prec + visual->blue_prec + visual->green_prec < visual->depth; - child->has_alpha = (visual_has_alpha && - gdk_display_supports_composite (gdk_screen_get_display (screen))); - - child->composited = child->has_alpha; - - if (new_colormap) - g_object_unref (colormap); - - return GTK_WIDGET (child); -} - -char * -na_tray_child_get_title (NaTrayChild *child) -{ - char *retval = NULL; - GdkDisplay *display; - Atom utf8_string, atom, type; - int result; - int format; - gulong nitems; - gulong bytes_after; - gchar *val; - - g_return_val_if_fail (NA_IS_TRAY_CHILD (child), NULL); - - display = gtk_widget_get_display (GTK_WIDGET (child)); - - utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"); - atom = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME"); - - gdk_error_trap_push (); - - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), - child->icon_window, - atom, - 0, G_MAXLONG, - False, utf8_string, - &type, &format, &nitems, - &bytes_after, (guchar **)&val); - - if (gdk_error_trap_pop () || result != Success) - return NULL; - - if (type != utf8_string || - format != 8 || - nitems == 0) - { - if (val) - XFree (val); - return NULL; - } - - if (!g_utf8_validate (val, nitems, NULL)) - { - XFree (val); - return NULL; - } - - retval = g_strndup (val, nitems); - - XFree (val); - - return retval; -} - -/** - * na_tray_child_has_alpha; - * @child: a #NaTrayChild - * - * Checks if the child has an ARGB visual and real alpha transparence. - * (as opposed to faked alpha transparency with an parent-relative - * background) - * - * Return value: %TRUE if the child has an alpha transparency - */ -gboolean -na_tray_child_has_alpha (NaTrayChild *child) -{ - g_return_val_if_fail (NA_IS_TRAY_CHILD (child), FALSE); - - return child->has_alpha; -} - -/** - * na_tray_child_set_composited; - * @child: a #NaTrayChild - * @composited: %TRUE if the child's window should be redirected - * - * Sets whether the #GdkWindow of the child should be set redirected - * using gdk_window_set_composited(). By default this is based off of - * na_tray_child_has_alpha(), but it may be useful to override it in - * certain circumstances; for example, if the #NaTrayChild is added - * to a parent window and that parent window is composited against the - * background. - */ -void -na_tray_child_set_composited (NaTrayChild *child, - gboolean composited) -{ - g_return_if_fail (NA_IS_TRAY_CHILD (child)); - - if (child->composited == composited) - return; - - child->composited = composited; - if (gtk_widget_get_realized (GTK_WIDGET (child))) - gdk_window_set_composited (gtk_widget_get_window (GTK_WIDGET (child)), composited); -} - -/* If we are faking transparency with a window-relative background, force a - * redraw of the icon. This should be called if the background changes or if - * the child is shifted with respect to the background. - */ -void -na_tray_child_force_redraw (NaTrayChild *child) -{ - GtkWidget *widget = GTK_WIDGET (child); - - if (gtk_widget_get_mapped (widget) && child->parent_relative_bg) - { -#if 1 - /* Sending an ExposeEvent might cause redraw problems if the - * icon is expecting the server to clear-to-background before - * the redraw. It should be ok for GtkStatusIcon or EggTrayIcon. - */ - Display *xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)); - XEvent xev; - - GtkAllocation widget_allocation; - gtk_widget_get_allocation (widget, &widget_allocation); - - xev.xexpose.type = Expose; - xev.xexpose.window = GDK_WINDOW_XWINDOW (gtk_socket_get_plug_window (GTK_SOCKET (child))); - xev.xexpose.x = 0; - xev.xexpose.y = 0; - xev.xexpose.width = widget_allocation.width; - xev.xexpose.height = widget_allocation.height; - xev.xexpose.count = 0; - - gdk_error_trap_push (); - XSendEvent (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)), - xev.xexpose.window, - False, ExposureMask, - &xev); - /* We have to sync to reliably catch errors from the XSendEvent(), - * since that is asynchronous. - */ - XSync (xdisplay, False); - gdk_error_trap_pop (); -#else - /* Hiding and showing is the safe way to do it, but can result in more - * flickering. - */ - gdk_window_hide (gtk_widget_get_window (widget)); - gdk_window_show (gtk_widget_get_window (widget)); -#endif - } -} - - -/* from libwnck xutils.c */ -static char * -latin1_to_utf8 (const char *latin1) -{ - GString *str; - const char *p; - - str = g_string_new (NULL); - - p = latin1; - while (*p) - { - g_string_append_unichar (str, (gunichar) *p); - ++p; - } - - return g_string_free (str, FALSE); -} - -/* derived from libwnck xutils.c */ -static void -_get_wmclass (Display *xdisplay, - Window xwindow, - char **res_class, - char **res_name) -{ - XClassHint ch; - char *retval; - - gdk_error_trap_push (); - - ch.res_name = NULL; - ch.res_class = NULL; - - XGetClassHint (xdisplay, xwindow, &ch); - - gdk_error_trap_pop (); - - retval = NULL; - - if (res_class) - *res_class = NULL; - - if (res_name) - *res_name = NULL; - - if (ch.res_name) - { - if (res_name) - *res_name = latin1_to_utf8 (ch.res_name); - - XFree (ch.res_name); - } - - if (ch.res_class) - { - if (res_class) - *res_class = latin1_to_utf8 (ch.res_class); - - XFree (ch.res_class); - } -} - -void -na_tray_child_get_wm_class (NaTrayChild *child, - char **res_name, - char **res_class) -{ - GdkDisplay *display; - - g_return_if_fail (NA_IS_TRAY_CHILD (child)); - - display = gtk_widget_get_display (GTK_WIDGET (child)); - - _get_wmclass (GDK_DISPLAY_XDISPLAY (display), - child->icon_window, - res_class, - res_name); -} diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-child.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-child.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-child.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-child.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* na-tray-child.h - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * Copyright (C) 2008 Red Hat, Inc. - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __NA_TRAY_CHILD_H__ -#define __NA_TRAY_CHILD_H__ - -#include -#include - -G_BEGIN_DECLS - -#define NA_TYPE_TRAY_CHILD (na_tray_child_get_type ()) -#define NA_TRAY_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_TRAY_CHILD, NaTrayChild)) -#define NA_TRAY_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_TRAY_CHILD, NaTrayChildClass)) -#define NA_IS_TRAY_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY_CHILD)) -#define NA_IS_TRAY_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY_CHILD)) -#define NA_TRAY_CHILD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY_CHILD, NaTrayChildClass)) - -typedef struct _NaTrayChild NaTrayChild; -typedef struct _NaTrayChildClass NaTrayChildClass; -typedef struct _NaTrayChildChild NaTrayChildChild; - -struct _NaTrayChild -{ - GtkSocket parent_instance; - Window icon_window; - guint has_alpha : 1; - guint composited : 1; - guint parent_relative_bg : 1; -}; - -struct _NaTrayChildClass -{ - GtkSocketClass parent_class; -}; - -GType na_tray_child_get_type (void); - -GtkWidget *na_tray_child_new (GdkScreen *screen, - Window icon_window); -char *na_tray_child_get_title (NaTrayChild *child); -gboolean na_tray_child_has_alpha (NaTrayChild *child); -void na_tray_child_set_composited (NaTrayChild *child, - gboolean composited); -void na_tray_child_force_redraw (NaTrayChild *child); -void na_tray_child_get_wm_class (NaTrayChild *child, - char **res_name, - char **res_class); - -G_END_DECLS - -#endif /* __NA_TRAY_CHILD_H__ */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* na-tray-tray.h - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Used to be: eggtraytray.h - */ - -#ifndef __NA_TRAY_H__ -#define __NA_TRAY_H__ - -#ifdef GDK_WINDOWING_X11 -#include -#endif -#include - -G_BEGIN_DECLS - -#define NA_TYPE_TRAY (na_tray_get_type ()) -#define NA_TRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_TRAY, NaTray)) -#define NA_TRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_TRAY, NaTrayClass)) -#define NA_IS_TRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY)) -#define NA_IS_TRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY)) -#define NA_TRAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY, NaTrayClass)) - -typedef struct _NaTray NaTray; -typedef struct _NaTrayPrivate NaTrayPrivate; -typedef struct _NaTrayClass NaTrayClass; - -struct _NaTray -{ - GtkBin parent_instance; - - NaTrayPrivate *priv; -}; - -struct _NaTrayClass -{ - GtkBinClass parent_class; -}; - -GType na_tray_get_type (void); -NaTray *na_tray_new_for_screen (GdkScreen *screen, - GtkOrientation orientation); -void na_tray_set_orientation (NaTray *tray, - GtkOrientation orientation); -GtkOrientation na_tray_get_orientation (NaTray *tray); -void na_tray_set_padding (NaTray *tray, - gint padding); -void na_tray_force_redraw (NaTray *tray); - -G_END_DECLS - -#endif /* __NA_TRAY_H__ */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-manager.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-manager.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-manager.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-manager.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,886 +0,0 @@ -/* na-tray-manager.c - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Used to be: eggtraymanager.c - */ - -#include -#include -#include - -#include "na-tray-manager.h" - -#include -#include -#if defined (GDK_WINDOWING_X11) -#include -#include -#elif defined (GDK_WINDOWING_WIN32) -#include -#endif -#include - -#include "na-marshal.h" - -/* Signals */ -enum -{ - TRAY_ICON_ADDED, - TRAY_ICON_REMOVED, - MESSAGE_SENT, - MESSAGE_CANCELLED, - LOST_SELECTION, - LAST_SIGNAL -}; - -enum { - PROP_0, - PROP_ORIENTATION -}; - -typedef struct -{ - long id, len; - long remaining_len; - - long timeout; - char *str; -#ifdef GDK_WINDOWING_X11 - Window window; -#endif -} PendingMessage; - -static guint manager_signals[LAST_SIGNAL]; - -#define SYSTEM_TRAY_REQUEST_DOCK 0 -#define SYSTEM_TRAY_BEGIN_MESSAGE 1 -#define SYSTEM_TRAY_CANCEL_MESSAGE 2 - -#define SYSTEM_TRAY_ORIENTATION_HORZ 0 -#define SYSTEM_TRAY_ORIENTATION_VERT 1 - -#ifdef GDK_WINDOWING_X11 -static gboolean na_tray_manager_check_running_screen_x11 (GdkScreen *screen); -#endif - -static void na_tray_manager_finalize (GObject *object); -static void na_tray_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void na_tray_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void na_tray_manager_unmanage (NaTrayManager *manager); - -G_DEFINE_TYPE (NaTrayManager, na_tray_manager, G_TYPE_OBJECT) - -static void -na_tray_manager_init (NaTrayManager *manager) -{ - manager->invisible = NULL; - manager->socket_table = g_hash_table_new (NULL, NULL); -} - -static void -na_tray_manager_class_init (NaTrayManagerClass *klass) -{ - GObjectClass *gobject_class; - - gobject_class = (GObjectClass *)klass; - - gobject_class->finalize = na_tray_manager_finalize; - gobject_class->set_property = na_tray_manager_set_property; - gobject_class->get_property = na_tray_manager_get_property; - - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", - "orientation", - "orientation", - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - manager_signals[TRAY_ICON_ADDED] = - g_signal_new ("tray_icon_added", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GTK_TYPE_SOCKET); - - manager_signals[TRAY_ICON_REMOVED] = - g_signal_new ("tray_icon_removed", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GTK_TYPE_SOCKET); - manager_signals[MESSAGE_SENT] = - g_signal_new ("message_sent", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, message_sent), - NULL, NULL, - _na_marshal_VOID__OBJECT_STRING_LONG_LONG, - G_TYPE_NONE, 4, - GTK_TYPE_SOCKET, - G_TYPE_STRING, - G_TYPE_LONG, - G_TYPE_LONG); - manager_signals[MESSAGE_CANCELLED] = - g_signal_new ("message_cancelled", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled), - NULL, NULL, - _na_marshal_VOID__OBJECT_LONG, - G_TYPE_NONE, 2, - GTK_TYPE_SOCKET, - G_TYPE_LONG); - manager_signals[LOST_SELECTION] = - g_signal_new ("lost_selection", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - -#if defined (GDK_WINDOWING_X11) - /* Nothing */ -#elif defined (GDK_WINDOWING_WIN32) - g_warning ("Port NaTrayManager to Win32"); -#else - g_warning ("Port NaTrayManager to this GTK+ backend"); -#endif -} - -static void -na_tray_manager_finalize (GObject *object) -{ - NaTrayManager *manager; - - manager = NA_TRAY_MANAGER (object); - - na_tray_manager_unmanage (manager); - - g_list_free (manager->messages); - g_hash_table_destroy (manager->socket_table); - - G_OBJECT_CLASS (na_tray_manager_parent_class)->finalize (object); -} - -static void -na_tray_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - NaTrayManager *manager = NA_TRAY_MANAGER (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - na_tray_manager_set_orientation (manager, g_value_get_enum (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -na_tray_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NaTrayManager *manager = NA_TRAY_MANAGER (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - g_value_set_enum (value, manager->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -NaTrayManager * -na_tray_manager_new (void) -{ - NaTrayManager *manager; - - manager = g_object_new (NA_TYPE_TRAY_MANAGER, NULL); - - return manager; -} - -#ifdef GDK_WINDOWING_X11 - -static gboolean -na_tray_manager_plug_removed (GtkSocket *socket, - NaTrayManager *manager) -{ - NaTrayChild *child = NA_TRAY_CHILD (socket); - - g_hash_table_remove (manager->socket_table, - GINT_TO_POINTER (child->icon_window)); - g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child); - - /* This destroys the socket. */ - return FALSE; -} - -static void -na_tray_manager_handle_dock_request (NaTrayManager *manager, - XClientMessageEvent *xevent) -{ - Window icon_window = xevent->data.l[2]; - GtkWidget *child; - - if (g_hash_table_lookup (manager->socket_table, - GINT_TO_POINTER (icon_window))) - { - /* We already got this notification earlier, ignore this one */ - return; - } - - child = na_tray_child_new (manager->screen, icon_window); - if (child == NULL) /* already gone or other error */ - return; - - g_signal_emit (manager, manager_signals[TRAY_ICON_ADDED], 0, - child); - - /* If the child wasn't attached, then destroy it */ - - if (!GTK_IS_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (child)))) - { - gtk_widget_destroy (child); - return; - } - - g_signal_connect (child, "plug_removed", - G_CALLBACK (na_tray_manager_plug_removed), manager); - - gtk_socket_add_id (GTK_SOCKET (child), icon_window); - - if (!gtk_socket_get_plug_window (GTK_SOCKET (child))) - { - /* Embedding failed, we won't get a plug-removed signal */ - g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child); - gtk_widget_destroy (child); - return; - } - - g_hash_table_insert (manager->socket_table, - GINT_TO_POINTER (icon_window), child); - gtk_widget_show (child); -} - -static void -pending_message_free (PendingMessage *message) -{ - g_free (message->str); - g_free (message); -} - -static GdkFilterReturn -na_tray_manager_handle_client_message_message_data (GdkXEvent *xev, - GdkEvent *event, - gpointer data) -{ - XClientMessageEvent *xevent; - NaTrayManager *manager; - GList *p; - int len; - - xevent = (XClientMessageEvent *) xev; - manager = data; - - /* Try to see if we can find the pending message in the list */ - for (p = manager->messages; p; p = p->next) - { - PendingMessage *msg = p->data; - - if (xevent->window == msg->window) - { - /* Append the message */ - len = MIN (msg->remaining_len, 20); - - memcpy ((msg->str + msg->len - msg->remaining_len), - &xevent->data, len); - msg->remaining_len -= len; - - if (msg->remaining_len == 0) - { - GtkSocket *socket; - - socket = g_hash_table_lookup (manager->socket_table, - GINT_TO_POINTER (msg->window)); - - if (socket) - g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0, - socket, msg->str, msg->id, msg->timeout); - - pending_message_free (msg); - manager->messages = g_list_remove_link (manager->messages, p); - g_list_free_1 (p); - } - - break; - } - } - - return GDK_FILTER_REMOVE; -} - -static void -na_tray_manager_handle_begin_message (NaTrayManager *manager, - XClientMessageEvent *xevent) -{ - GtkSocket *socket; - GList *p; - PendingMessage *msg; - long timeout; - long len; - long id; - - socket = g_hash_table_lookup (manager->socket_table, - GINT_TO_POINTER (xevent->window)); - /* we don't know about this tray icon, so ignore the message */ - if (!socket) - return; - - /* Check if the same message is already in the queue and remove it if so */ - for (p = manager->messages; p; p = p->next) - { - PendingMessage *pmsg = p->data; - - if (xevent->window == pmsg->window && - xevent->data.l[4] == pmsg->id) - { - /* Hmm, we found it, now remove it */ - pending_message_free (pmsg); - manager->messages = g_list_remove_link (manager->messages, p); - g_list_free_1 (p); - break; - } - } - - timeout = xevent->data.l[2]; - len = xevent->data.l[3]; - id = xevent->data.l[4]; - - if (len == 0) - { - g_signal_emit (manager, manager_signals[MESSAGE_SENT], 0, - socket, "", id, timeout); - } - else - { - /* Now add the new message to the queue */ - msg = g_new0 (PendingMessage, 1); - msg->window = xevent->window; - msg->timeout = timeout; - msg->len = len; - msg->id = id; - msg->remaining_len = msg->len; - msg->str = g_malloc (msg->len + 1); - msg->str[msg->len] = '\0'; - manager->messages = g_list_prepend (manager->messages, msg); - } -} - -static void -na_tray_manager_handle_cancel_message (NaTrayManager *manager, - XClientMessageEvent *xevent) -{ - GList *p; - GtkSocket *socket; - - /* Check if the message is in the queue and remove it if so */ - for (p = manager->messages; p; p = p->next) - { - PendingMessage *msg = p->data; - - if (xevent->window == msg->window && - xevent->data.l[4] == msg->id) - { - pending_message_free (msg); - manager->messages = g_list_remove_link (manager->messages, p); - g_list_free_1 (p); - break; - } - } - - socket = g_hash_table_lookup (manager->socket_table, - GINT_TO_POINTER (xevent->window)); - - if (socket) - { - g_signal_emit (manager, manager_signals[MESSAGE_CANCELLED], 0, - socket, xevent->data.l[2]); - } -} - -static GdkFilterReturn -na_tray_manager_handle_client_message_opcode (GdkXEvent *xev, - GdkEvent *event, - gpointer data) -{ - XClientMessageEvent *xevent; - NaTrayManager *manager; - - xevent = (XClientMessageEvent *) xev; - manager = data; - - switch (xevent->data.l[1]) - { - case SYSTEM_TRAY_REQUEST_DOCK: - /* Ignore this one since we don't know on which window this was received - * and so we can't know for which screen this is. It will be handled - * in na_tray_manager_window_filter() since we also receive it there */ - break; - - case SYSTEM_TRAY_BEGIN_MESSAGE: - na_tray_manager_handle_begin_message (manager, xevent); - return GDK_FILTER_REMOVE; - - case SYSTEM_TRAY_CANCEL_MESSAGE: - na_tray_manager_handle_cancel_message (manager, xevent); - return GDK_FILTER_REMOVE; - default: - break; - } - - return GDK_FILTER_CONTINUE; -} - -static GdkFilterReturn -na_tray_manager_window_filter (GdkXEvent *xev, - GdkEvent *event, - gpointer data) -{ - XEvent *xevent = (GdkXEvent *)xev; - NaTrayManager *manager = data; - - if (xevent->type == ClientMessage) - { - /* We handle this client message here. See comment in - * na_tray_manager_handle_client_message_opcode() for details */ - if (xevent->xclient.message_type == manager->opcode_atom && - xevent->xclient.data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) - { - na_tray_manager_handle_dock_request (manager, - (XClientMessageEvent *) xevent); - return GDK_FILTER_REMOVE; - } - } - else if (xevent->type == SelectionClear) - { - g_signal_emit (manager, manager_signals[LOST_SELECTION], 0); - na_tray_manager_unmanage (manager); - } - - return GDK_FILTER_CONTINUE; -} - -#if 0 -//FIXME investigate why this doesn't work -static gboolean -na_tray_manager_selection_clear_event (GtkWidget *widget, - GdkEventSelection *event, - NaTrayManager *manager) -{ - g_signal_emit (manager, manager_signals[LOST_SELECTION], 0); - na_tray_manager_unmanage (manager); - - return FALSE; -} -#endif -#endif - -static void -na_tray_manager_unmanage (NaTrayManager *manager) -{ -#ifdef GDK_WINDOWING_X11 - GdkDisplay *display; - guint32 timestamp; - GtkWidget *invisible; - - if (manager->invisible == NULL) - return; - - invisible = manager->invisible; - g_assert (GTK_IS_INVISIBLE (invisible)); - g_assert (gtk_widget_get_realized (invisible)); - g_assert (GDK_IS_WINDOW (gtk_widget_get_window (invisible))); - - display = gtk_widget_get_display (invisible); - - if (gdk_selection_owner_get_for_display (display, manager->selection_atom) == - gtk_widget_get_window (invisible)) - { - timestamp = gdk_x11_get_server_time (gtk_widget_get_window (invisible)); - gdk_selection_owner_set_for_display (display, - NULL, - manager->selection_atom, - timestamp, - TRUE); - } - - //FIXME: we should also use gdk_remove_client_message_filter when it's - //available - // See bug #351254 - gdk_window_remove_filter (gtk_widget_get_window (invisible), - na_tray_manager_window_filter, manager); - - manager->invisible = NULL; /* prior to destroy for reentrancy paranoia */ - gtk_widget_destroy (invisible); - g_object_unref (G_OBJECT (invisible)); -#endif -} - -static void -na_tray_manager_set_orientation_property (NaTrayManager *manager) -{ -#ifdef GDK_WINDOWING_X11 - GdkDisplay *display; - Atom orientation_atom; - gulong data[1]; - - if (!manager->invisible || !gtk_widget_get_window (manager->invisible)) - return; - - display = gtk_widget_get_display (manager->invisible); - orientation_atom = gdk_x11_get_xatom_by_name_for_display (display, - "_NET_SYSTEM_TRAY_ORIENTATION"); - - data[0] = manager->orientation == GTK_ORIENTATION_HORIZONTAL ? - SYSTEM_TRAY_ORIENTATION_HORZ : - SYSTEM_TRAY_ORIENTATION_VERT; - - XChangeProperty (GDK_DISPLAY_XDISPLAY (display), - GDK_WINDOW_XWINDOW (gtk_widget_get_window (manager->invisible)), - orientation_atom, - XA_CARDINAL, 32, - PropModeReplace, - (guchar *) &data, 1); -#endif -} - -static void -na_tray_manager_set_visual_property (NaTrayManager *manager) -{ -#ifdef GDK_WINDOWING_X11 - GdkDisplay *display; - Visual *xvisual; - Atom visual_atom; - gulong data[1]; - - if (!manager->invisible || !gtk_widget_get_window (manager->invisible)) - return; - - /* The visual property is a hint to the tray icons as to what visual they - * should use for their windows. If the X server has RGBA colormaps, then - * we tell the tray icons to use a RGBA colormap and we'll composite the - * icon onto its parents with real transparency. Otherwise, we just tell - * the icon to use our colormap, and we'll do some hacks with parent - * relative backgrounds to simulate transparency. - */ - - display = gtk_widget_get_display (manager->invisible); - visual_atom = gdk_x11_get_xatom_by_name_for_display (display, - "_NET_SYSTEM_TRAY_VISUAL"); - - if (gdk_screen_get_rgba_visual (manager->screen) != NULL && - gdk_display_supports_composite (display)) - { - xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (manager->screen)); - } - else - { - /* We actually want the visual of the tray where the icons will - * be embedded. In almost all cases, this will be the same as the visual - * of the screen. - */ - GdkColormap *colormap; - - colormap = gdk_screen_get_default_colormap (manager->screen); - xvisual = GDK_VISUAL_XVISUAL (gdk_colormap_get_visual (colormap)); - } - - data[0] = XVisualIDFromVisual (xvisual); - - XChangeProperty (GDK_DISPLAY_XDISPLAY (display), - GDK_WINDOW_XWINDOW (gtk_widget_get_window (manager->invisible)), - visual_atom, - XA_VISUALID, 32, - PropModeReplace, - (guchar *) &data, 1); -#endif -} - -static void -na_tray_manager_set_padding_property (NaTrayManager *manager) -{ -#ifdef GDK_WINDOWING_X11 - GdkDisplay *display; - Atom orientation_atom; - gulong data[1]; - - if (!manager->invisible || !gtk_widget_get_window (manager->invisible)) - return; - - display = gtk_widget_get_display (manager->invisible); - orientation_atom = gdk_x11_get_xatom_by_name_for_display (display, - "_NET_SYSTEM_TRAY_PADDING"); - - data[0] = manager->padding; - - XChangeProperty (GDK_DISPLAY_XDISPLAY (display), - GDK_WINDOW_XWINDOW (gtk_widget_get_window (manager->invisible)), - orientation_atom, - XA_CARDINAL, 32, - PropModeReplace, - (guchar *) &data, 1); -#endif -} - -#ifdef GDK_WINDOWING_X11 - -static gboolean -na_tray_manager_manage_screen_x11 (NaTrayManager *manager, - GdkScreen *screen) -{ - GdkDisplay *display; - Screen *xscreen; - GtkWidget *invisible; - char *selection_atom_name; - guint32 timestamp; - - g_return_val_if_fail (NA_IS_TRAY_MANAGER (manager), FALSE); - g_return_val_if_fail (manager->screen == NULL, FALSE); - - /* If there's already a manager running on the screen - * we can't create another one. - */ -#if 0 - if (na_tray_manager_check_running_screen_x11 (screen)) - return FALSE; -#endif - - manager->screen = screen; - - display = gdk_screen_get_display (screen); - xscreen = GDK_SCREEN_XSCREEN (screen); - - invisible = gtk_invisible_new_for_screen (screen); - gtk_widget_realize (invisible); - - gtk_widget_add_events (invisible, - GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK); - - selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d", - gdk_screen_get_number (screen)); - manager->selection_atom = gdk_atom_intern (selection_atom_name, FALSE); - g_free (selection_atom_name); - - manager->invisible = invisible; - g_object_ref (G_OBJECT (manager->invisible)); - - na_tray_manager_set_orientation_property (manager); - na_tray_manager_set_visual_property (manager); - na_tray_manager_set_padding_property (manager); - - timestamp = gdk_x11_get_server_time (gtk_widget_get_window(invisible)); - - /* Check if we could set the selection owner successfully */ - if (gdk_selection_owner_set_for_display (display, - gtk_widget_get_window(invisible), - manager->selection_atom, - timestamp, - TRUE)) - { - XClientMessageEvent xev; - GdkAtom opcode_atom; - GdkAtom message_data_atom; - - xev.type = ClientMessage; - xev.window = RootWindowOfScreen (xscreen); - xev.message_type = gdk_x11_get_xatom_by_name_for_display (display, - "MANAGER"); - - xev.format = 32; - xev.data.l[0] = timestamp; - xev.data.l[1] = gdk_x11_atom_to_xatom_for_display (display, - manager->selection_atom); - xev.data.l[2] = GDK_WINDOW_XWINDOW (gtk_widget_get_window(invisible)); - xev.data.l[3] = 0; /* manager specific data */ - xev.data.l[4] = 0; /* manager specific data */ - - XSendEvent (GDK_DISPLAY_XDISPLAY (display), - RootWindowOfScreen (xscreen), - False, StructureNotifyMask, (XEvent *)&xev); - - opcode_atom = gdk_atom_intern ("_NET_SYSTEM_TRAY_OPCODE", FALSE); - manager->opcode_atom = gdk_x11_atom_to_xatom_for_display (display, - opcode_atom); - - message_data_atom = gdk_atom_intern ("_NET_SYSTEM_TRAY_MESSAGE_DATA", - FALSE); - - /* Add a window filter */ -#if 0 - /* This is for when we lose the selection of _NET_SYSTEM_TRAY_Sx */ - g_signal_connect (invisible, "selection-clear-event", - G_CALLBACK (na_tray_manager_selection_clear_event), - manager); -#endif - /* This is for SYSTEM_TRAY_REQUEST_DOCK and SelectionClear */ - gdk_window_add_filter (gtk_widget_get_window(invisible), - na_tray_manager_window_filter, manager); - /* This is for SYSTEM_TRAY_BEGIN_MESSAGE and SYSTEM_TRAY_CANCEL_MESSAGE */ - gdk_display_add_client_message_filter (display, opcode_atom, - na_tray_manager_handle_client_message_opcode, - manager); - /* This is for _NET_SYSTEM_TRAY_MESSAGE_DATA */ - gdk_display_add_client_message_filter (display, message_data_atom, - na_tray_manager_handle_client_message_message_data, - manager); - return TRUE; - } - else - { - gtk_widget_destroy (invisible); - g_object_unref (invisible); - manager->invisible = NULL; - - manager->screen = NULL; - - return FALSE; - } -} - -#endif - -gboolean -na_tray_manager_manage_screen (NaTrayManager *manager, - GdkScreen *screen) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - g_return_val_if_fail (manager->screen == NULL, FALSE); - -#ifdef GDK_WINDOWING_X11 - return na_tray_manager_manage_screen_x11 (manager, screen); -#else - return FALSE; -#endif -} - -#ifdef GDK_WINDOWING_X11 - -static gboolean -na_tray_manager_check_running_screen_x11 (GdkScreen *screen) -{ - GdkDisplay *display; - Atom selection_atom; - char *selection_atom_name; - - display = gdk_screen_get_display (screen); - selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d", - gdk_screen_get_number (screen)); - selection_atom = gdk_x11_get_xatom_by_name_for_display (display, - selection_atom_name); - g_free (selection_atom_name); - - if (XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (display), - selection_atom) != None) - return TRUE; - else - return FALSE; -} - -#endif - -gboolean -na_tray_manager_check_running (GdkScreen *screen) -{ - g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE); - -#ifdef GDK_WINDOWING_X11 - return na_tray_manager_check_running_screen_x11 (screen); -#else - return FALSE; -#endif -} - -void -na_tray_manager_set_orientation (NaTrayManager *manager, - GtkOrientation orientation) -{ - g_return_if_fail (NA_IS_TRAY_MANAGER (manager)); - - if (manager->orientation != orientation) - { - manager->orientation = orientation; - - na_tray_manager_set_orientation_property (manager); - - g_object_notify (G_OBJECT (manager), "orientation"); - } -} - -void -na_tray_manager_set_padding (NaTrayManager *manager, - gint padding) -{ - g_return_if_fail (NA_IS_TRAY_MANAGER (manager)); - - if (manager->padding != padding) - { - manager->padding = padding; - - na_tray_manager_set_padding_property (manager); - } -} - -GtkOrientation -na_tray_manager_get_orientation (NaTrayManager *manager) -{ - g_return_val_if_fail (NA_IS_TRAY_MANAGER (manager), GTK_ORIENTATION_HORIZONTAL); - - return manager->orientation; -} diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-manager.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-manager.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/na-tray-manager.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/na-tray-manager.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* na-tray-manager.h - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Used to be: eggtraymanager.h - */ - -#ifndef __NA_TRAY_MANAGER_H__ -#define __NA_TRAY_MANAGER_H__ - -#ifdef GDK_WINDOWING_X11 -#include -#endif -#include - -#include "na-tray-child.h" - -G_BEGIN_DECLS - -#define NA_TYPE_TRAY_MANAGER (na_tray_manager_get_type ()) -#define NA_TRAY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_TRAY_MANAGER, NaTrayManager)) -#define NA_TRAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_TRAY_MANAGER, NaTrayManagerClass)) -#define NA_IS_TRAY_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_TRAY_MANAGER)) -#define NA_IS_TRAY_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_TRAY_MANAGER)) -#define NA_TRAY_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_TRAY_MANAGER, NaTrayManagerClass)) - -typedef struct _NaTrayManager NaTrayManager; -typedef struct _NaTrayManagerClass NaTrayManagerClass; - -struct _NaTrayManager -{ - GObject parent_instance; - -#ifdef GDK_WINDOWING_X11 - GdkAtom selection_atom; - Atom opcode_atom; -#endif - - GtkWidget *invisible; - GdkScreen *screen; - GtkOrientation orientation; - gint padding; - - GList *messages; - GHashTable *socket_table; -}; - -struct _NaTrayManagerClass -{ - GObjectClass parent_class; - - void (* tray_icon_added) (NaTrayManager *manager, - NaTrayChild *child); - void (* tray_icon_removed) (NaTrayManager *manager, - NaTrayChild *child); - - void (* message_sent) (NaTrayManager *manager, - NaTrayChild *child, - const gchar *message, - glong id, - glong timeout); - - void (* message_cancelled) (NaTrayManager *manager, - NaTrayChild *child, - glong id); - - void (* lost_selection) (NaTrayManager *manager); -}; - -GType na_tray_manager_get_type (void); - -gboolean na_tray_manager_check_running (GdkScreen *screen); -NaTrayManager *na_tray_manager_new (void); -gboolean na_tray_manager_manage_screen (NaTrayManager *manager, - GdkScreen *screen); -void na_tray_manager_set_orientation (NaTrayManager *manager, - GtkOrientation orientation); -GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager); -void na_tray_manager_set_padding (NaTrayManager *manager, - gint padding); - -G_END_DECLS - -#endif /* __NA_TRAY_MANAGER_H__ */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/obox.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/obox.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/obox.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/obox.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -/* OBox Copyright (C) 2002 Red Hat Inc. based on GtkHBox */ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "obox.h" - -#include - -static void na_obox_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void na_obox_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -G_DEFINE_TYPE (NaOBox, na_obox, GTK_TYPE_BOX) - -static void -na_obox_class_init (NaOBoxClass *class) -{ - GtkWidgetClass *widget_class; - - widget_class = (GtkWidgetClass*) class; - - widget_class->size_request = na_obox_size_request; - widget_class->size_allocate = na_obox_size_allocate; -} - -static void -na_obox_init (NaOBox *obox) -{ - obox->orientation = GTK_ORIENTATION_HORIZONTAL; -} - -GtkWidget* -na_obox_new (void) -{ - NaOBox *obox; - - obox = g_object_new (NA_TYPE_OBOX, NULL); - - return GTK_WIDGET (obox); -} - -static GtkWidgetClass* -get_class (NaOBox *obox) -{ - GtkWidgetClass *klass; - - switch (obox->orientation) - { - case GTK_ORIENTATION_HORIZONTAL: - klass = GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_HBOX)); - break; - case GTK_ORIENTATION_VERTICAL: - klass = GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_VBOX)); - break; - default: - g_assert_not_reached (); - klass = NULL; - break; - } - - return klass; -} - -static void -na_obox_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkWidgetClass *klass; - NaOBox *obox; - - obox = NA_OBOX (widget); - - klass = get_class (obox); - - klass->size_request (widget, requisition); -} - -static void -na_obox_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkWidgetClass *klass; - NaOBox *obox; - - obox = NA_OBOX (widget); - - klass = get_class (obox); - - klass->size_allocate (widget, allocation); -} - -void -na_obox_set_orientation (NaOBox *obox, - GtkOrientation orientation) -{ - g_return_if_fail (NA_IS_OBOX (obox)); - - if (obox->orientation == orientation) - return; - - obox->orientation = orientation; - - gtk_widget_queue_resize (GTK_WIDGET (obox)); -} diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/obox.h gdm-3.0.0/gui/simple-greeter/libnotificationarea/obox.h --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/obox.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/obox.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/* OBox Copyright (C) 2002 Red Hat Inc. based on GtkHBox */ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __NA_OBOX_H__ -#define __NA_OBOX_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define NA_TYPE_OBOX (na_obox_get_type ()) -#define NA_OBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NA_TYPE_OBOX, NaOBox)) -#define NA_OBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NA_TYPE_OBOX, NaOBoxClass)) -#define NA_IS_OBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NA_TYPE_OBOX)) -#define NA_IS_OBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NA_TYPE_OBOX)) -#define NA_OBOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NA_TYPE_OBOX, NaOBoxClass)) - - -typedef struct _NaOBox NaOBox; -typedef struct _NaOBoxClass NaOBoxClass; - -struct _NaOBox -{ - GtkBox box; - - GtkOrientation orientation; -}; - -struct _NaOBoxClass -{ - GtkBoxClass parent_class; -}; - - -GType na_obox_get_type (void) G_GNUC_CONST; -GtkWidget* na_obox_new (void); - -void na_obox_set_orientation (NaOBox *obox, - GtkOrientation orientation); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __NA_OBOX_H__ */ diff -Nru gdm-2.32.1/gui/simple-greeter/libnotificationarea/testtray.c gdm-3.0.0/gui/simple-greeter/libnotificationarea/testtray.c --- gdm-2.32.1/gui/simple-greeter/libnotificationarea/testtray.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/libnotificationarea/testtray.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,220 +0,0 @@ -/* - * Copyright (C) 2002 Anders Carlsson - * Copyright (C) 2003-2006 Vincent Untz - * Copyright (C) 2006, 2007 Christian Persch - * - * 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 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include -#include -#include "na-tray-manager.h" -#include "na-tray.h" - -#define NOTIFICATION_AREA_ICON "gnome-panel-notification-area" - -static guint n_windows = 0; - -typedef struct -{ - GdkScreen *screen; - guint screen_num; - GtkWidget *window; - NaTray *tray; - GtkWidget *box; - GtkLabel *count_label; -} TrayData; - -static void -do_add (GtkWidget *child, guint *n_children) -{ - *n_children += 1; -} - -static void -update_child_count (TrayData *data) -{ - guint n_children = 0; - char text[64]; - - if (!gtk_widget_get_realized (GTK_WIDGET (data))) - return; - - gtk_container_foreach (GTK_CONTAINER (data->box), (GtkCallback) do_add, &n_children); - - g_snprintf (text, sizeof (text), "%u icons", n_children); - gtk_label_set_text (data->count_label, text); -} - -static void -tray_added_cb (GtkContainer *box, GtkWidget *icon, TrayData *data) -{ - g_print ("[Screen %u tray %p] Child %p added to tray: \"%s\"\n", - data->screen_num, data->tray, icon, "XXX");//na_tray_child_get_title (icon)); - - update_child_count (data); -} - -static void -tray_removed_cb (GtkContainer *box, GtkWidget *icon, TrayData *data) -{ - g_print ("[Screen %u tray %p] Child %p removed from tray\n", - data->screen_num, data->tray, icon); - - update_child_count (data); -} - -static void orientation_changed_cb (GtkComboBox *combo, TrayData *data) -{ - GtkOrientation orientation = (GtkOrientation) gtk_combo_box_get_active (combo); - - g_print ("[Screen %u tray %p] Setting orientation to \"%s\"\n", - data->screen_num, data->tray, orientation == 0 ? "horizontal" : "vertical"); - - na_tray_set_orientation (data->tray, orientation); -} - -static void -maybe_quit (gpointer data, - GObject *zombie) -{ - if (--n_windows == 0) { - gtk_main_quit (); - } -} - -static TrayData *create_tray_on_screen (GdkScreen *screen, gboolean force); - -static void -warning_dialog_response_cb (GtkWidget *dialog, - gint response, - GdkScreen *screen) -{ - if (response == GTK_RESPONSE_YES) { - create_tray_on_screen (screen, TRUE); - } - - gtk_widget_destroy (dialog); -} - -static void -add_tray_cb (GtkWidget *button, TrayData *data) -{ - create_tray_on_screen (data->screen, TRUE); -} - -static TrayData * -create_tray_on_screen (GdkScreen *screen, - gboolean force) -{ - GtkWidget *window, *hbox, *vbox, *button, *combo, *label; - TrayData *data; - - n_windows++; - - if (!force && na_tray_manager_check_running (screen)) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, - "Override tray manager?"); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "There is already a tray manager running on screen %d.", - gdk_screen_get_number (screen)); - gtk_window_set_screen (GTK_WINDOW (dialog), screen); - g_signal_connect (dialog, "response", G_CALLBACK (warning_dialog_response_cb), screen); - gtk_window_present (GTK_WINDOW (dialog)); - g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) maybe_quit, NULL); - return NULL; - } - - data = g_new0 (TrayData, 1); - data->screen = screen; - data->screen_num = gdk_screen_get_number (screen); - - data->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_weak_ref (G_OBJECT (window), (GWeakNotify) maybe_quit, NULL); - - vbox = gtk_vbox_new (FALSE, 6); - gtk_container_add (GTK_CONTAINER (window), vbox); - - button = gtk_button_new_with_mnemonic ("_Add another tray"); - g_signal_connect (button, "clicked", G_CALLBACK (add_tray_cb), data); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - - hbox = gtk_hbox_new (FALSE, 12); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - label = gtk_label_new_with_mnemonic ("_Orientation:"); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - combo = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Horizontal"); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "Vertical"); - g_signal_connect (combo, "changed", - G_CALLBACK (orientation_changed_cb), data); - gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); - - label = gtk_label_new (NULL); - data->count_label = GTK_LABEL (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); - - data->tray = na_tray_new_for_screen (screen, GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (data->tray), TRUE, TRUE, 0); - - data->box = gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (data->tray)))); - g_signal_connect_after (data->box, "add", G_CALLBACK (tray_added_cb), data); - g_signal_connect_after (data->box, "remove", G_CALLBACK (tray_removed_cb), data); - - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - - gtk_window_set_screen (GTK_WINDOW (window), screen); - gtk_window_set_default_size (GTK_WINDOW (window), -1, 200); - - /* gtk_window_set_resizable (GTK_WINDOW (window), FALSE); */ - - gtk_widget_show_all (window); - - update_child_count (data); - - return data; -} - -int -main (int argc, char *argv[]) -{ - GdkDisplay *display; - GdkScreen *screen; - int n_screens, i; - - gtk_init (&argc, &argv); - - gtk_window_set_default_icon_name (NOTIFICATION_AREA_ICON); - - display = gdk_display_get_default (); - n_screens = gdk_display_get_n_screens (display); - for (i = 0; i < n_screens; ++i) { - screen = gdk_display_get_screen (display, i); - - create_tray_on_screen (screen, FALSE); - } - - gtk_main (); - - return 0; -} diff -Nru gdm-2.32.1/gui/simple-greeter/Makefile.am gdm-3.0.0/gui/simple-greeter/Makefile.am --- gdm-2.32.1/gui/simple-greeter/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/Makefile.am 2011-04-04 14:37:16.000000000 +0000 @@ -1,13 +1,8 @@ NULL = -SUBDIRS = \ - libnotificationarea \ - $(NULL) - AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_builddir)/common \ - -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \ -DDMCONFDIR=\""$(dmconfdir)"\" \ -DGDMCONFDIR=\"$(gdmconfdir)\" \ -DDATADIR=\""$(datadir)"\" \ @@ -31,35 +26,11 @@ schemas_in_files = gdm-simple-greeter.schemas.in schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -noinst_LTLIBRARIES = \ - libgdmuser.la \ - $(null) - -libgdmuser_la_SOURCES = \ - gdm-user.c \ - gdm-user.h \ - gdm-user-private.h \ - gdm-user-manager.c \ - gdm-user-manager.h \ - $(NULL) - -libgdmuser_la_CFLAGS = \ - $(SIMPLE_GREETER_CFLAGS) \ - $(NULL) - -libgdmuser_la_LIBADD = \ - $(NULL) - -libgdmuser_la_LDFLAGS = \ - -export-dynamic \ - $(NULL) - noinst_PROGRAMS = \ test-filesystem-type \ test-greeter-login-window \ test-greeter-panel \ test-language-chooser \ - test-layout-chooser \ test-languages \ test-sessions \ test-remote-login-window \ @@ -81,6 +52,10 @@ gdm-sessions.c \ gdm-cell-renderer-timer.h \ gdm-cell-renderer-timer.c \ + gdm-option-widget.h \ + gdm-option-widget.c \ + gdm-session-option-widget.h \ + gdm-session-option-widget.c \ gdm-user-chooser-widget.h \ gdm-user-chooser-widget.c \ gdm-user-chooser-dialog.h \ @@ -89,7 +64,6 @@ test_greeter_login_window_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - libgdmuser.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ $(RBAC_LIBS) \ @@ -122,14 +96,6 @@ gdm-language-chooser-dialog.c \ gdm-language-option-widget.h \ gdm-language-option-widget.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - gdm-layout-option-widget.h \ - gdm-layout-option-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ gdm-sessions.h \ gdm-sessions.c \ gdm-session-option-widget.h \ @@ -138,7 +104,6 @@ test_greeter_panel_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ $(SIMPLE_GREETER_LIBS) \ $(GTK_LIBS) \ $(GCONF_LIBS) \ @@ -189,30 +154,6 @@ $(GCONF_LIBS) \ $(NULL) -test_layout_chooser_SOURCES = \ - test-layout-chooser.c \ - gdm-cell-renderer-timer.h \ - gdm-cell-renderer-timer.c \ - gdm-timer.h \ - gdm-timer.c \ - gdm-scrollable-widget.h \ - gdm-scrollable-widget.c \ - gdm-chooser-widget.h \ - gdm-chooser-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - $(NULL) - -test_layout_chooser_LDADD = \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(LIBXKLAVIER_LIBS) \ - $(NULL) - test_languages_SOURCES = \ test-languages.c \ gdm-languages.h \ @@ -251,7 +192,6 @@ $(NULL) test_user_chooser_LDADD = \ - libgdmuser.la \ $(top_builddir)/common/libgdmcommon.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ @@ -262,7 +202,6 @@ $(NULL) test_user_manager_LDADD = \ - libgdmuser.la \ $(top_builddir)/common/libgdmcommon.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ @@ -301,14 +240,6 @@ gdm-languages.c \ gdm-language-chooser-widget.h \ gdm-language-chooser-widget.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - gdm-layout-option-widget.h \ - gdm-layout-option-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ locarchive.h \ gdm-language-chooser-dialog.h \ gdm-language-chooser-dialog.c \ @@ -324,8 +255,6 @@ gdm_simple_greeter_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - libgdmuser.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ $(COMMON_LIBS) \ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ diff -Nru gdm-2.32.1/gui/simple-greeter/Makefile.in gdm-3.0.0/gui/simple-greeter/Makefile.in --- gdm-2.32.1/gui/simple-greeter/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/Makefile.in 2011-04-04 14:39:29.000000000 +0000 @@ -16,7 +16,6 @@ @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -38,39 +37,30 @@ host_triplet = @host@ noinst_PROGRAMS = test-filesystem-type$(EXEEXT) \ test-greeter-login-window$(EXEEXT) test-greeter-panel$(EXEEXT) \ - test-language-chooser$(EXEEXT) test-layout-chooser$(EXEEXT) \ - test-languages$(EXEEXT) test-sessions$(EXEEXT) \ - test-remote-login-window$(EXEEXT) test-user-chooser$(EXEEXT) \ - test-user-manager$(EXEEXT) $(am__EXEEXT_1) + test-language-chooser$(EXEEXT) test-languages$(EXEEXT) \ + test-sessions$(EXEEXT) test-remote-login-window$(EXEEXT) \ + test-user-chooser$(EXEEXT) test-user-manager$(EXEEXT) \ + $(am__EXEEXT_1) libexec_PROGRAMS = gdm-simple-greeter$(EXEEXT) subdir = gui/simple-greeter DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgdmuser_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_1 = -am_libgdmuser_la_OBJECTS = libgdmuser_la-gdm-user.lo \ - libgdmuser_la-gdm-user-manager.lo $(am__objects_1) -libgdmuser_la_OBJECTS = $(am_libgdmuser_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -libgdmuser_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgdmuser_la_CFLAGS) \ - $(CFLAGS) $(libgdmuser_la_LDFLAGS) $(LDFLAGS) -o $@ am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(schemasdir)" \ "$(DESTDIR)$(uidir)" am__EXEEXT_1 = PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) +am__objects_1 = am_gdm_simple_greeter_OBJECTS = greeter-main.$(OBJEXT) \ gdm-timer.$(OBJEXT) gdm-cell-renderer-timer.$(OBJEXT) \ gdm-scrollable-widget.$(OBJEXT) gdm-chooser-widget.$(OBJEXT) \ @@ -80,21 +70,20 @@ gdm-clock-widget.$(OBJEXT) gdm-option-widget.$(OBJEXT) \ gdm-recent-option-widget.$(OBJEXT) gdm-languages.$(OBJEXT) \ gdm-language-chooser-widget.$(OBJEXT) \ - gdm-layout-chooser-widget.$(OBJEXT) \ - gdm-layout-chooser-dialog.$(OBJEXT) \ - gdm-layout-option-widget.$(OBJEXT) gdm-layouts.$(OBJEXT) \ gdm-language-chooser-dialog.$(OBJEXT) \ gdm-language-option-widget.$(OBJEXT) gdm-sessions.$(OBJEXT) \ gdm-session-option-widget.$(OBJEXT) \ gdm-user-chooser-widget.$(OBJEXT) $(am__objects_1) gdm_simple_greeter_OBJECTS = $(am_gdm_simple_greeter_OBJECTS) +am__DEPENDENCIES_1 = gdm_simple_greeter_DEPENDENCIES = \ - $(top_builddir)/common/libgdmcommon.la libgdmuser.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent am_test_filesystem_type_OBJECTS = test-filesystem-type.$(OBJEXT) \ $(am__objects_1) test_filesystem_type_OBJECTS = $(am_test_filesystem_type_OBJECTS) @@ -105,14 +94,16 @@ gdm-greeter-login-window.$(OBJEXT) \ gdm-scrollable-widget.$(OBJEXT) gdm-chooser-widget.$(OBJEXT) \ gdm-sessions.$(OBJEXT) gdm-cell-renderer-timer.$(OBJEXT) \ + gdm-option-widget.$(OBJEXT) \ + gdm-session-option-widget.$(OBJEXT) \ gdm-user-chooser-widget.$(OBJEXT) \ gdm-user-chooser-dialog.$(OBJEXT) $(am__objects_1) test_greeter_login_window_OBJECTS = \ $(am_test_greeter_login_window_OBJECTS) test_greeter_login_window_DEPENDENCIES = \ - $(top_builddir)/common/libgdmcommon.la libgdmuser.la \ + $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_test_greeter_panel_OBJECTS = test-greeter-panel.$(OBJEXT) \ gdm-greeter-panel.$(OBJEXT) gdm-clock-widget.$(OBJEXT) \ gdm-option-widget.$(OBJEXT) gdm-recent-option-widget.$(OBJEXT) \ @@ -121,19 +112,14 @@ gdm-chooser-widget.$(OBJEXT) \ gdm-language-chooser-widget.$(OBJEXT) \ gdm-language-chooser-dialog.$(OBJEXT) \ - gdm-language-option-widget.$(OBJEXT) \ - gdm-layout-chooser-widget.$(OBJEXT) \ - gdm-layout-chooser-dialog.$(OBJEXT) \ - gdm-layout-option-widget.$(OBJEXT) gdm-layouts.$(OBJEXT) \ - gdm-sessions.$(OBJEXT) gdm-session-option-widget.$(OBJEXT) \ - $(am__objects_1) + gdm-language-option-widget.$(OBJEXT) gdm-sessions.$(OBJEXT) \ + gdm-session-option-widget.$(OBJEXT) $(am__objects_1) test_greeter_panel_OBJECTS = $(am_test_greeter_panel_OBJECTS) test_greeter_panel_DEPENDENCIES = \ - $(top_builddir)/common/libgdmcommon.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ + $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_test_language_chooser_OBJECTS = test-language-chooser.$(OBJEXT) \ gdm-cell-renderer-timer.$(OBJEXT) gdm-timer.$(OBJEXT) \ gdm-scrollable-widget.$(OBJEXT) gdm-chooser-widget.$(OBJEXT) \ @@ -147,15 +133,6 @@ test_languages_OBJECTS = $(am_test_languages_OBJECTS) test_languages_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_test_layout_chooser_OBJECTS = test-layout-chooser.$(OBJEXT) \ - gdm-cell-renderer-timer.$(OBJEXT) gdm-timer.$(OBJEXT) \ - gdm-scrollable-widget.$(OBJEXT) gdm-chooser-widget.$(OBJEXT) \ - gdm-layouts.$(OBJEXT) gdm-layout-chooser-widget.$(OBJEXT) \ - gdm-layout-chooser-dialog.$(OBJEXT) $(am__objects_1) -test_layout_chooser_OBJECTS = $(am_test_layout_chooser_OBJECTS) -test_layout_chooser_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) am_test_remote_login_window_OBJECTS = \ test-remote-login-window.$(OBJEXT) \ gdm-remote-login-window.$(OBJEXT) $(am__objects_1) @@ -174,13 +151,13 @@ gdm-user-chooser-widget.$(OBJEXT) \ gdm-user-chooser-dialog.$(OBJEXT) $(am__objects_1) test_user_chooser_OBJECTS = $(am_test_user_chooser_OBJECTS) -test_user_chooser_DEPENDENCIES = libgdmuser.la \ +test_user_chooser_DEPENDENCIES = \ $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_user_manager_OBJECTS = test-user-manager.$(OBJEXT) \ $(am__objects_1) test_user_manager_OBJECTS = $(am_test_user_manager_OBJECTS) -test_user_manager_DEPENDENCIES = libgdmuser.la \ +test_user_manager_DEPENDENCIES = \ $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -209,27 +186,20 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libgdmuser_la_SOURCES) $(gdm_simple_greeter_SOURCES) \ +SOURCES = $(gdm_simple_greeter_SOURCES) \ $(test_filesystem_type_SOURCES) \ $(test_greeter_login_window_SOURCES) \ $(test_greeter_panel_SOURCES) $(test_language_chooser_SOURCES) \ - $(test_languages_SOURCES) $(test_layout_chooser_SOURCES) \ - $(test_remote_login_window_SOURCES) $(test_sessions_SOURCES) \ - $(test_user_chooser_SOURCES) $(test_user_manager_SOURCES) -DIST_SOURCES = $(libgdmuser_la_SOURCES) $(gdm_simple_greeter_SOURCES) \ + $(test_languages_SOURCES) $(test_remote_login_window_SOURCES) \ + $(test_sessions_SOURCES) $(test_user_chooser_SOURCES) \ + $(test_user_manager_SOURCES) +DIST_SOURCES = $(gdm_simple_greeter_SOURCES) \ $(test_filesystem_type_SOURCES) \ $(test_greeter_login_window_SOURCES) \ $(test_greeter_panel_SOURCES) $(test_language_chooser_SOURCES) \ - $(test_languages_SOURCES) $(test_layout_chooser_SOURCES) \ - $(test_remote_login_window_SOURCES) $(test_sessions_SOURCES) \ - $(test_user_chooser_SOURCES) $(test_user_manager_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 + $(test_languages_SOURCES) $(test_remote_login_window_SOURCES) \ + $(test_sessions_SOURCES) $(test_user_chooser_SOURCES) \ + $(test_user_manager_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -252,46 +222,13 @@ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' DATA = $(schemas_DATA) $(ui_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir 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@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ @@ -533,14 +470,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -SUBDIRS = \ - libnotificationarea \ - $(NULL) - AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_builddir)/common \ - -I$(top_srcdir)/gui/simple-greeter/libnotificationarea \ -DDMCONFDIR=\""$(dmconfdir)"\" \ -DGDMCONFDIR=\"$(gdmconfdir)\" \ -DDATADIR=\""$(datadir)"\" \ @@ -561,29 +493,6 @@ schemasdir = @GCONF_SCHEMA_FILE_DIR@ schemas_in_files = gdm-simple-greeter.schemas.in schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -noinst_LTLIBRARIES = \ - libgdmuser.la \ - $(null) - -libgdmuser_la_SOURCES = \ - gdm-user.c \ - gdm-user.h \ - gdm-user-private.h \ - gdm-user-manager.c \ - gdm-user-manager.h \ - $(NULL) - -libgdmuser_la_CFLAGS = \ - $(SIMPLE_GREETER_CFLAGS) \ - $(NULL) - -libgdmuser_la_LIBADD = \ - $(NULL) - -libgdmuser_la_LDFLAGS = \ - -export-dynamic \ - $(NULL) - test_greeter_login_window_SOURCES = \ test-greeter-login-window.c \ gdm-timer.h \ @@ -598,6 +507,10 @@ gdm-sessions.c \ gdm-cell-renderer-timer.h \ gdm-cell-renderer-timer.c \ + gdm-option-widget.h \ + gdm-option-widget.c \ + gdm-session-option-widget.h \ + gdm-session-option-widget.c \ gdm-user-chooser-widget.h \ gdm-user-chooser-widget.c \ gdm-user-chooser-dialog.h \ @@ -606,7 +519,6 @@ test_greeter_login_window_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - libgdmuser.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ $(RBAC_LIBS) \ @@ -639,14 +551,6 @@ gdm-language-chooser-dialog.c \ gdm-language-option-widget.h \ gdm-language-option-widget.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - gdm-layout-option-widget.h \ - gdm-layout-option-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ gdm-sessions.h \ gdm-sessions.c \ gdm-session-option-widget.h \ @@ -655,7 +559,6 @@ test_greeter_panel_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ $(SIMPLE_GREETER_LIBS) \ $(GTK_LIBS) \ $(GCONF_LIBS) \ @@ -706,30 +609,6 @@ $(GCONF_LIBS) \ $(NULL) -test_layout_chooser_SOURCES = \ - test-layout-chooser.c \ - gdm-cell-renderer-timer.h \ - gdm-cell-renderer-timer.c \ - gdm-timer.h \ - gdm-timer.c \ - gdm-scrollable-widget.h \ - gdm-scrollable-widget.c \ - gdm-chooser-widget.h \ - gdm-chooser-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - $(NULL) - -test_layout_chooser_LDADD = \ - $(GTK_LIBS) \ - $(GCONF_LIBS) \ - $(LIBXKLAVIER_LIBS) \ - $(NULL) - test_languages_SOURCES = \ test-languages.c \ gdm-languages.h \ @@ -768,7 +647,6 @@ $(NULL) test_user_chooser_LDADD = \ - libgdmuser.la \ $(top_builddir)/common/libgdmcommon.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ @@ -779,7 +657,6 @@ $(NULL) test_user_manager_LDADD = \ - libgdmuser.la \ $(top_builddir)/common/libgdmcommon.la \ $(COMMON_LIBS) \ $(SIMPLE_GREETER_LIBS) \ @@ -815,14 +692,6 @@ gdm-languages.c \ gdm-language-chooser-widget.h \ gdm-language-chooser-widget.c \ - gdm-layout-chooser-widget.h \ - gdm-layout-chooser-widget.c \ - gdm-layout-chooser-dialog.h \ - gdm-layout-chooser-dialog.c \ - gdm-layout-option-widget.h \ - gdm-layout-option-widget.c \ - gdm-layouts.h \ - gdm-layouts.c \ locarchive.h \ gdm-language-chooser-dialog.h \ gdm-language-chooser-dialog.c \ @@ -838,8 +707,6 @@ gdm_simple_greeter_LDADD = \ $(top_builddir)/common/libgdmcommon.la \ - libgdmuser.la \ - $(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la \ $(COMMON_LIBS) \ $(EXTRA_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \ @@ -866,7 +733,7 @@ *~ \ Makefile.in -all: all-recursive +all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -900,17 +767,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_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 -libgdmuser.la: $(libgdmuser_la_OBJECTS) $(libgdmuser_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgdmuser_la_LINK) $(libgdmuser_la_OBJECTS) $(libgdmuser_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @@ -981,9 +837,6 @@ test-languages$(EXEEXT): $(test_languages_OBJECTS) $(test_languages_DEPENDENCIES) @rm -f test-languages$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_languages_OBJECTS) $(test_languages_LDADD) $(LIBS) -test-layout-chooser$(EXEEXT): $(test_layout_chooser_OBJECTS) $(test_layout_chooser_DEPENDENCIES) - @rm -f test-layout-chooser$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_layout_chooser_OBJECTS) $(test_layout_chooser_LDADD) $(LIBS) test-remote-login-window$(EXEEXT): $(test_remote_login_window_OBJECTS) $(test_remote_login_window_DEPENDENCIES) @rm -f test-remote-login-window$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_remote_login_window_OBJECTS) $(test_remote_login_window_LDADD) $(LIBS) @@ -1014,10 +867,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-language-chooser-widget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-language-option-widget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-languages.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-layout-chooser-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-layout-chooser-widget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-layout-option-widget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-layouts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-option-widget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-recent-option-widget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-remote-login-window.Po@am__quote@ @@ -1028,14 +877,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user-chooser-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-user-chooser-widget.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/greeter-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgdmuser_la-gdm-user-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgdmuser_la-gdm-user.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-filesystem-type.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-greeter-login-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-greeter-panel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-language-chooser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-languages.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-layout-chooser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-remote-login-window.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sessions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-user-chooser.Po@am__quote@ @@ -1065,22 +911,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libgdmuser_la-gdm-user.lo: gdm-user.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) $(libgdmuser_la_CFLAGS) $(CFLAGS) -MT libgdmuser_la-gdm-user.lo -MD -MP -MF $(DEPDIR)/libgdmuser_la-gdm-user.Tpo -c -o libgdmuser_la-gdm-user.lo `test -f 'gdm-user.c' || echo '$(srcdir)/'`gdm-user.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgdmuser_la-gdm-user.Tpo $(DEPDIR)/libgdmuser_la-gdm-user.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdm-user.c' object='libgdmuser_la-gdm-user.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) $(libgdmuser_la_CFLAGS) $(CFLAGS) -c -o libgdmuser_la-gdm-user.lo `test -f 'gdm-user.c' || echo '$(srcdir)/'`gdm-user.c - -libgdmuser_la-gdm-user-manager.lo: gdm-user-manager.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) $(libgdmuser_la_CFLAGS) $(CFLAGS) -MT libgdmuser_la-gdm-user-manager.lo -MD -MP -MF $(DEPDIR)/libgdmuser_la-gdm-user-manager.Tpo -c -o libgdmuser_la-gdm-user-manager.lo `test -f 'gdm-user-manager.c' || echo '$(srcdir)/'`gdm-user-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgdmuser_la-gdm-user-manager.Tpo $(DEPDIR)/libgdmuser_la-gdm-user-manager.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gdm-user-manager.c' object='libgdmuser_la-gdm-user-manager.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) $(libgdmuser_la_CFLAGS) $(CFLAGS) -c -o libgdmuser_la-gdm-user-manager.lo `test -f 'gdm-user-manager.c' || echo '$(srcdir)/'`gdm-user-manager.c - mostlyclean-libtool: -rm -f *.lo @@ -1127,76 +957,6 @@ echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(uidir)" && rm -f $$files -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (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; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; 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" - -$(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 \ @@ -1207,23 +967,10 @@ mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) 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; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -1242,7 +989,7 @@ fi; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1292,51 +1039,22 @@ || exit 1; \ fi; \ 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 \ - 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 $(LTLIBRARIES) $(PROGRAMS) $(DATA) -installdirs: installdirs-recursive -installdirs-am: +check: check-am +all-am: Makefile $(PROGRAMS) $(DATA) +installdirs: for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +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-recursive +installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -1355,99 +1073,95 @@ @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-recursive +clean: clean-am clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am html-am: -info: info-recursive +info: info-am info-am: install-data-am: install-data-local install-schemasDATA install-uiDATA -install-dvi: install-dvi-recursive +install-dvi: install-dvi-am install-dvi-am: install-exec-am: install-libexecPROGRAMS -install-html: install-html-recursive +install-html: install-html-am install-html-am: -install-info: install-info-recursive +install-info: install-info-am install-info-am: install-man: -install-pdf: install-pdf-recursive +install-pdf: install-pdf-am install-pdf-am: -install-ps: install-ps-recursive +install-ps: install-ps-am install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: uninstall-am: uninstall-libexecPROGRAMS uninstall-schemasDATA \ uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS 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-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-schemasDATA install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS ctags \ + 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-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-schemasDATA install-strip install-uiDATA \ + installcheck installcheck-am installdirs 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-libexecPROGRAMS uninstall-schemasDATA \ - uninstall-uiDATA + tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + uninstall-schemasDATA uninstall-uiDATA @INTLTOOL_SCHEMAS_RULE@ diff -Nru gdm-2.32.1/gui/simple-greeter/test-greeter-login-window.c gdm-3.0.0/gui/simple-greeter/test-greeter-login-window.c --- gdm-2.32.1/gui/simple-greeter/test-greeter-login-window.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/test-greeter-login-window.c 2011-04-04 14:37:16.000000000 +0000 @@ -71,6 +71,8 @@ g_source_remove (cancel_idle_id); cancel_idle_id = 0; } + + gdm_greeter_login_window_reset (login_window); } int diff -Nru gdm-2.32.1/gui/simple-greeter/test-greeter-panel.c gdm-3.0.0/gui/simple-greeter/test-greeter-panel.c --- gdm-2.32.1/gui/simple-greeter/test-greeter-panel.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/test-greeter-panel.c 2011-04-04 14:37:16.000000000 +0000 @@ -54,7 +54,6 @@ monitor = gdk_screen_get_monitor_at_point (screen, x, y); panel = gdm_greeter_panel_new (screen, monitor, TRUE); - gdm_greeter_panel_show_user_options (GDM_GREETER_PANEL (panel)); gtk_widget_show (panel); diff -Nru gdm-2.32.1/gui/simple-greeter/test-layout-chooser.c gdm-3.0.0/gui/simple-greeter/test-layout-chooser.c --- gdm-2.32.1/gui/simple-greeter/test-layout-chooser.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/test-layout-chooser.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann - * - * 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 - */ - -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "gdm-layout-chooser-dialog.h" - -int -main (int argc, char *argv[]) -{ - GtkWidget *dialog; - - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - setlocale (LC_ALL, ""); - - gtk_init (&argc, &argv); - - dialog = gdm_layout_chooser_dialog_new (); - gtk_widget_set_size_request (dialog, 480, 480); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { - char *name; - - name = gdm_layout_chooser_dialog_get_current_layout_name (GDM_LAYOUT_CHOOSER_DIALOG (dialog)); - g_message ("Layout: %s", name ? name : "(null)"); - g_free (name); - } - gtk_widget_destroy (dialog); - - return 0; -} diff -Nru gdm-2.32.1/gui/simple-greeter/test-user-manager.c gdm-3.0.0/gui/simple-greeter/test-user-manager.c --- gdm-2.32.1/gui/simple-greeter/test-user-manager.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/simple-greeter/test-user-manager.c 2011-04-04 14:37:16.000000000 +0000 @@ -30,10 +30,12 @@ #include #include -#include "gdm-user-manager.h" +#include +#include + #include "gdm-settings-client.h" -static GdmUserManager *manager = NULL; +static ActUserManager *manager = NULL; static GMainLoop *main_loop = NULL; static gboolean do_monitor = FALSE; @@ -45,7 +47,7 @@ }; static void -on_is_loaded_changed (GdmUserManager *manager, +on_is_loaded_changed (ActUserManager *manager, GParamSpec *pspec, gpointer data) { @@ -53,9 +55,9 @@ g_debug ("Users loaded"); - users = gdm_user_manager_list_users (manager); + users = act_user_manager_list_users (manager); while (users != NULL) { - g_print ("User: %s\n", gdm_user_get_user_name (users->data)); + g_print ("User: %s\n", act_user_get_user_name (users->data)); users = g_slist_delete_link (users, users); } @@ -65,19 +67,19 @@ } static void -on_user_added (GdmUserManager *manager, - GdmUser *user, +on_user_added (ActUserManager *manager, + ActUser *user, gpointer data) { - g_debug ("User added: %s", gdm_user_get_user_name (user)); + g_debug ("User added: %s", act_user_get_user_name (user)); } static void -on_user_removed (GdmUserManager *manager, - GdmUser *user, +on_user_removed (ActUserManager *manager, + ActUser *user, gpointer data) { - g_debug ("User removed: %s", gdm_user_get_user_name (user)); + g_debug ("User removed: %s", act_user_get_user_name (user)); } int @@ -123,7 +125,7 @@ exit (1); } - manager = gdm_user_manager_ref_default (); + manager = act_user_manager_get_default (); g_object_set (manager, "include-all", TRUE, NULL); g_signal_connect (manager, "notify::is-loaded", @@ -137,7 +139,6 @@ "user-removed", G_CALLBACK (on_user_removed), NULL); - gdm_user_manager_queue_load (manager); main_loop = g_main_loop_new (NULL, FALSE); diff -Nru gdm-2.32.1/gui/user-switch-applet/applet.c gdm-3.0.0/gui/user-switch-applet/applet.c --- gdm-2.32.1/gui/user-switch-applet/applet.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/applet.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1662 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * Copyright (C) 2008 Red Hat, 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 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 - */ - -#include "config.h" - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#include -#include - -#include -#include - -#include "gdm-user-manager.h" -#include "gdm-entry-menu-item.h" -#include "gdm-settings-client.h" - -#define LOCKDOWN_DIR "/desktop/gnome/lockdown" -#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching" -#define LOCKDOWN_LOCK_SCREEN_KEY LOCKDOWN_DIR "/disable_lock_screen" -#define LOCKDOWN_COMMAND_LINE_KEY LOCKDOWN_DIR "/disable_command_line" - -typedef enum { - GSM_PRESENCE_STATUS_AVAILABLE = 0, - GSM_PRESENCE_STATUS_INVISIBLE, - GSM_PRESENCE_STATUS_BUSY, - GSM_PRESENCE_STATUS_IDLE, -} GsmPresenceStatus; - -typedef struct _GdmAppletData -{ - PanelApplet *applet; - - GConfClient *client; - GdmUserManager *manager; - GdmUser *user; - - GtkWidget *menubar; - GtkWidget *menuitem; - GtkWidget *menu; -#ifdef BUILD_PRESENSE_STUFF - GtkWidget *user_item; -#endif - GtkWidget *control_panel_item; - GtkWidget *account_item; - GtkWidget *lock_screen_item; - GtkWidget *login_screen_item; - GtkWidget *quit_session_item; - - guint client_notify_lockdown_id; - - guint current_status; - guint user_loaded_notify_id; - guint user_changed_notify_id; - gint8 pixel_size; - gint panel_size; - GtkIconSize icon_size; -#ifdef BUILD_PRESENSE_STUFF - DBusGProxy *presence_proxy; -#endif -} GdmAppletData; - -typedef struct _SelectorResponseData -{ - GdmAppletData *adata; - GtkRadioButton *radio; -} SelectorResponseData; - -static void reset_icon (GdmAppletData *adata); -static void update_label (GdmAppletData *adata); - -static gboolean applet_factory (PanelApplet *applet, - const char *iid, - gpointer data); - -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", - PANEL_TYPE_APPLET, - "gdm-user-switch-applet", "0", - (PanelAppletFactoryCallback)applet_factory, - NULL) - -static void -about_me_cb (BonoboUIComponent *ui_container, - gpointer data, - const char *cname) -{ - GError *err; - - err = NULL; - if (! g_spawn_command_line_async ("gnome-about-me", &err)) { - g_critical ("Could not run `gnome-about-me': %s", - err->message); - g_error_free (err); - bonobo_ui_component_set_prop (ui_container, - "/commands/GdmAboutMe", - "hidden", "1", - NULL); - } -} - -/* - * gnome-panel/applets/wncklet/window-menu.c:window_filter_button_press() - * - * Copyright (C) 2005 James M. Cape. - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2001 Free Software Foundation, Inc. - * Copyright (C) 2000 Helix Code, Inc. - */ -static gboolean -menubar_button_press_event_cb (GtkWidget *menubar, - GdkEventButton *event, - GdmAppletData *adata) -{ - if (event->button != 1) { - g_signal_stop_emission_by_name (menubar, "button-press-event"); - /* Reset the login window item */ - } - - return FALSE; -} - -static void -about_cb (BonoboUIComponent *ui_container, - gpointer data, - const char *cname) -{ - static const char *authors[] = { - "James M. Cape ", - "Thomas Thurman ", - "William Jon McCann ", - NULL - }; - static char *license[] = { - N_("The User Switch Applet 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."), - N_("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."), - N_("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 "), - NULL - }; - char *license_i18n; - - license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); - - gtk_show_about_dialog (NULL, - "version", VERSION, - "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n" - "Copyright \xc2\xa9 2006 Thomas Thurman.\n" - "Copyright \xc2\xa9 2008 Red Hat, Inc.", - "comments", _("A menu to quickly switch between users."), - "authors", authors, - "license", license_i18n, - "wrap-license", TRUE, - "translator-credits", _("translator-credits"), - "logo-icon-name", "stock_people", - NULL); - - g_free (license_i18n); -} - - -static void -admin_cb (BonoboUIComponent *ui_container, - gpointer data, - const char *cname) -{ -#ifdef USERS_ADMIN - char **args; - gboolean res; - GError *err; - - err = NULL; - if (!g_shell_parse_argv (USERS_ADMIN, NULL, &args, &err)) { - g_critical ("Could not parse users and groups management command line `%s': %s", - USERS_ADMIN, err->message); - return; - } - - res = g_spawn_async (g_get_home_dir (), - args, - NULL, - (G_SPAWN_STDOUT_TO_DEV_NULL | - G_SPAWN_STDERR_TO_DEV_NULL | - G_SPAWN_SEARCH_PATH), - NULL, - NULL, - NULL, - &err); - if (! res) { - g_critical ("Could not run `%s' to manage users and groups: %s", - USERS_ADMIN, err->message); - g_error_free (err); - } - g_strfreev (args); -#endif /* USERS_ADMIN */ -} - -static void -set_menuitem_icon (BonoboUIComponent *component, - const char *item_path, - GtkIconTheme *theme, - const char *icon_name, - gint icon_size) -{ - GdkPixbuf *pixbuf; - int width; - int height; - - pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL); - if (pixbuf == NULL) { - return; - } - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - if (width > icon_size + 4 || height > icon_size + 4) { - GdkPixbuf *tmp; - if (height > width) { - width *= (gdouble) icon_size / (gdouble) height; - height = icon_size; - } else { - height *= (gdouble) icon_size / (gdouble) width; - width = icon_size; - } - tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - pixbuf = tmp; - } - - bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL); - g_object_unref (pixbuf); -} - -static void -applet_style_set_cb (GtkWidget *widget, - GtkStyle *old_style, - gpointer data) -{ - BonoboUIComponent *component; - GdkScreen *screen; - GtkIconTheme *theme; - int width; - int height; - int icon_size; - - if (gtk_widget_has_screen (widget)) { - screen = gtk_widget_get_screen (widget); - } else { - screen = gdk_screen_get_default (); - } - - if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), - GTK_ICON_SIZE_MENU, &width, &height)) { - icon_size = MAX (width, height); - } else { - icon_size = 16; - } - - theme = gtk_icon_theme_get_for_screen (screen); - component = panel_applet_get_popup_component (PANEL_APPLET (widget)); - - set_menuitem_icon (component, - "/commands/GdmAboutMe", - theme, - "user-info", - icon_size); - set_menuitem_icon (component, - "/commands/GdmUsersGroupsAdmin", - theme, - "stock_people", - icon_size); -} - -static void -applet_change_background_cb (PanelApplet *applet, - PanelAppletBackgroundType type, - GdkColor *color, - GdkPixmap *pixmap, - GdmAppletData *adata) -{ - GtkRcStyle *rc_style; - GtkStyle *style; - - gtk_widget_set_style (adata->menubar, NULL); - rc_style = gtk_rc_style_new (); - gtk_widget_modify_style (GTK_WIDGET (adata->menubar), rc_style); - g_object_unref (rc_style); - - switch (type) { - case PANEL_NO_BACKGROUND: - break; - case PANEL_COLOR_BACKGROUND: - gtk_widget_modify_bg (adata->menubar, GTK_STATE_NORMAL, color); - break; - case PANEL_PIXMAP_BACKGROUND: - style = gtk_style_copy (gtk_widget_get_style (adata->menubar)); - if (style->bg_pixmap[GTK_STATE_NORMAL]) { - g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); - } - - style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); - gtk_widget_set_style (adata->menubar, style); - g_object_unref (style); - break; - } -} - -/* - * gnome-panel/applets/wncklet/window-menu.c:window_menu_key_press_event() - * - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2001 Free Software Foundation, Inc. - * Copyright (C) 2000 Helix Code, Inc. - */ -static gboolean -applet_key_press_event_cb (GtkWidget *widget, - GdkEventKey *event, - GdmAppletData *adata) -{ - GtkMenuShell *menu_shell; - - switch (event->keyval) { - case GDK_KP_Enter: - case GDK_ISO_Enter: - case GDK_3270_Enter: - case GDK_Return: - case GDK_space: - case GDK_KP_Space: - menu_shell = GTK_MENU_SHELL (adata->menubar); - /* - * We need to call _gtk_menu_shell_activate() here as is done in - * window_key_press_handler in gtkmenubar.c which pops up menu - * when F10 is pressed. - * - * As that function is private its code is replicated here. - */ - if (!menu_shell->active) { - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; - } - - gtk_menu_shell_select_first (menu_shell, FALSE); - return TRUE; - default: - break; - } - - return FALSE; -} - -static void -set_item_text_angle_and_alignment (GtkWidget *item, - double text_angle, - float xalign, - float yalign) -{ - GtkWidget *label; - - label = gtk_bin_get_child (GTK_BIN (item)); - - gtk_label_set_angle (GTK_LABEL (label), text_angle); - - gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign); -} - -/* - * gnome-panel/applets/wncklet/window-menu.c:window_menu_size_allocate() - * - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2001 Free Software Foundation, Inc. - * Copyright (C) 2000 Helix Code, Inc. - */ -static void -applet_size_allocate_cb (GtkWidget *widget, - GtkAllocation *allocation, - GdmAppletData *adata) -{ - GList *children; - GtkWidget *top_item; - PanelAppletOrient orient; - gint pixel_size; - gdouble text_angle; - GtkPackDirection pack_direction; - float text_xalign; - float text_yalign; - - pack_direction = GTK_PACK_DIRECTION_LTR; - text_angle = 0.0; - text_xalign = 0.0; - text_yalign = 0.5; - - children = gtk_container_get_children (GTK_CONTAINER (adata->menubar)); - top_item = GTK_WIDGET (children->data); - g_list_free (children); - - orient = panel_applet_get_orient (PANEL_APPLET (widget)); - - switch (orient) { - case PANEL_APPLET_ORIENT_UP: - case PANEL_APPLET_ORIENT_DOWN: - gtk_widget_set_size_request (top_item, -1, allocation->height); - pixel_size = allocation->height - gtk_widget_get_style (top_item)->ythickness * 2; - break; - case PANEL_APPLET_ORIENT_LEFT: - gtk_widget_set_size_request (top_item, allocation->width, -1); - pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; - pack_direction = GTK_PACK_DIRECTION_TTB; - text_angle = 270.0; - text_xalign = 0.5; - text_yalign = 0.0; - break; - case PANEL_APPLET_ORIENT_RIGHT: - gtk_widget_set_size_request (top_item, allocation->width, -1); - pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; - pack_direction = GTK_PACK_DIRECTION_BTT; - text_angle = 90.0; - text_xalign = 0.5; - text_yalign = 0.0; - break; - default: - g_assert_not_reached (); - break; - } - - gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (adata->menubar), - pack_direction); - gtk_menu_bar_set_child_pack_direction (GTK_MENU_BAR (adata->menubar), - pack_direction); - - set_item_text_angle_and_alignment (adata->menuitem, - text_angle, - text_xalign, - text_yalign); - - if (adata->panel_size != pixel_size) { - adata->panel_size = pixel_size; - reset_icon (adata); - } -} - - -static void -gdm_applet_data_free (GdmAppletData *adata) -{ - gconf_client_notify_remove (adata->client, adata->client_notify_lockdown_id); - - if (adata->user_loaded_notify_id != 0) { - g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); - } - - if (adata->user_changed_notify_id != 0) { - g_signal_handler_disconnect (adata->user, adata->user_changed_notify_id); - } - -#ifdef BUILD_PRESENSE_STUFF - if (adata->presence_proxy != NULL) { - g_object_unref (adata->presence_proxy); - } -#endif - - if (adata->user != NULL) { - g_object_unref (adata->user); - } - g_object_unref (adata->client); - g_object_unref (adata->manager); - - g_free (adata); -} - - -/* - * gnome-panel/applets/wncklet/window-menu.c:window_menu_on_expose() - * - * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2001 Free Software Foundation, Inc. - * Copyright (C) 2000 Helix Code, Inc. - */ -static gboolean -menubar_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - GdmAppletData *adata) -{ - if (gtk_widget_has_focus (GTK_WIDGET (adata->applet))) - gtk_paint_focus (gtk_widget_get_style (widget), - gtk_widget_get_window (widget), - gtk_widget_get_state (widget), - NULL, widget, "menu-applet", 0, 0, -1, -1); - - return FALSE; -} - -static void -menu_style_set_cb (GtkWidget *menu, - GtkStyle *old_style, - GdmAppletData *adata) -{ - GtkSettings *settings; - int width; - int height; - - adata->icon_size = gtk_icon_size_from_name ("panel-menu"); - - if (adata->icon_size == GTK_ICON_SIZE_INVALID) { - adata->icon_size = gtk_icon_size_register ("panel-menu", 24, 24); - } - - if (gtk_widget_has_screen (menu)) { - settings = gtk_settings_get_for_screen (gtk_widget_get_screen (menu)); - } else { - settings = gtk_settings_get_default (); - } - - if (!gtk_icon_size_lookup_for_settings (settings, adata->icon_size, - &width, &height)) { - adata->pixel_size = -1; - } else { - adata->pixel_size = MAX (width, height); - } -} - -static void -menuitem_style_set_cb (GtkWidget *menuitem, - GtkStyle *old_style, - GdmAppletData *adata) -{ - GtkWidget *image; - - if (GDM_IS_ENTRY_MENU_ITEM (menuitem)) { - } else { - const char *icon_name; - - if (menuitem == adata->login_screen_item) { - icon_name = "system-users"; - } else if (menuitem == adata->lock_screen_item) { - icon_name = "system-lock-screen"; - } else if (menuitem == adata->quit_session_item) { - icon_name = "system-log-out"; - } else if (menuitem == adata->account_item) { - icon_name = "user-info"; - } else if (menuitem == adata->control_panel_item) { - icon_name = "preferences-desktop"; - } else { - icon_name = GTK_STOCK_MISSING_IMAGE; - } - - image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); - gtk_image_set_pixel_size (GTK_IMAGE (image), adata->pixel_size); - gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, - adata->icon_size); - } -} - -static void -on_user_changed (GdmUser *user, - GdmAppletData *adata) -{ - g_debug ("user changed"); - update_label (adata); - reset_icon (adata); -} - -/* Called every time the menu is displayed (and also for some reason - * immediately it's created, which does no harm). All we have to do - * here is kick off a request to GDM to let us know which users are - * logged in, so we can display check marks next to their names. - */ -static gboolean -menu_expose_cb (GtkWidget *menu, - gpointer data) -{ - char *program; - GdmAppletData *adata = data; - - program = g_find_program_in_path ("gnome-control-center"); - if (program != NULL) { - gtk_widget_show (adata->control_panel_item); - } else { - gtk_widget_hide (adata->control_panel_item); - } - g_free (program); - return FALSE; -} - -static void -maybe_lock_screen (GdmAppletData *adata) -{ - char *args[3]; - GError *err; - GdkScreen *screen; - gboolean use_gscreensaver = TRUE; - gboolean res; - - g_debug ("Attempting to lock screen"); - - args[0] = g_find_program_in_path ("gnome-screensaver-command"); - if (args[0] == NULL) { - args[0] = g_find_program_in_path ("xscreensaver-command"); - use_gscreensaver = FALSE; - } - - if (args[0] == NULL) { - return; - } - - if (use_gscreensaver) { - args[1] = "--lock"; - } else { - args[1] = "-lock"; - } - args[2] = NULL; - - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); - } else { - screen = gdk_screen_get_default (); - } - - err = NULL; - res = gdk_spawn_on_screen (screen, - g_get_home_dir (), - args, - NULL, - 0, - NULL, - NULL, - NULL, - &err); - if (! res) { - g_warning (_("Can't lock screen: %s"), err->message); - g_error_free (err); - } - - if (use_gscreensaver) { - args[1] = "--throttle"; - } else { - args[1] = "-throttle"; - } - - err = NULL; - res = gdk_spawn_on_screen (screen, - g_get_home_dir (), - args, - NULL, - (G_SPAWN_STDERR_TO_DEV_NULL - | G_SPAWN_STDOUT_TO_DEV_NULL), - NULL, - NULL, - NULL, - &err); - if (! res) { - g_warning (_("Can't temporarily set screensaver to blank screen: %s"), - err->message); - g_error_free (err); - } - - g_free (args[0]); -} - -static void -do_switch (GdmAppletData *adata, - GdmUser *user) -{ - guint num_sessions; - - g_debug ("Do user switch"); - - if (user == NULL) { - gdm_user_manager_goto_login_session (adata->manager); - goto out; - } - - num_sessions = gdm_user_get_num_sessions (user); - if (num_sessions > 0) { - gdm_user_manager_activate_user_session (adata->manager, user); - } else { - gdm_user_manager_goto_login_session (adata->manager); - } - out: - maybe_lock_screen (adata); -} - -static void -update_switch_user (GdmAppletData *adata) -{ - gboolean can_switch; - gboolean has_other_users; - - can_switch = gdm_user_manager_can_switch (adata->manager); - g_object_get (adata->manager, - "has-multiple-users", &has_other_users, - NULL); - - if (can_switch && has_other_users) { - gtk_widget_show (adata->login_screen_item); - } else { - - gtk_widget_hide (adata->login_screen_item); - } -} - -static void -on_manager_is_loaded_changed (GdmUserManager *manager, - GParamSpec *pspec, - GdmAppletData *adata) -{ - update_switch_user (adata); -} - -static void -on_manager_has_multiple_users_changed (GdmUserManager *manager, - GParamSpec *pspec, - GdmAppletData *adata) -{ - update_switch_user (adata); -} - -#ifdef BUILD_PRESENSE_STUFF -static void -on_user_item_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - g_signal_stop_emission_by_name (item, "activate"); -} -#endif - -static void -on_control_panel_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - char *args[2]; - GError *error; - GdkScreen *screen; - gboolean res; - - args[0] = g_find_program_in_path ("gnome-control-center"); - if (args[0] == NULL) { - return; - } - args[1] = NULL; - - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); - } else { - screen = gdk_screen_get_default (); - } - - error = NULL; - res = gdk_spawn_on_screen (screen, - g_get_home_dir (), - args, - NULL, - 0, - NULL, - NULL, - NULL, - &error); - if (! res) { - g_warning (_("Can't lock screen: %s"), error->message); - g_error_free (error); - } - - g_free (args[0]); -} - -static void -on_account_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - char *args[2]; - GError *error; - GdkScreen *screen; - gboolean res; - - args[0] = g_find_program_in_path ("accounts-dialog"); - if (args[0] == NULL) { - args[0] = g_find_program_in_path ("gnome-about-me"); - if (args[0] == NULL) { - return; - } - } - args[1] = NULL; - - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); - } else { - screen = gdk_screen_get_default (); - } - - error = NULL; - res = gdk_spawn_on_screen (screen, - g_get_home_dir (), - args, - NULL, - 0, - NULL, - NULL, - NULL, - &error); - if (! res) { - g_warning (_("Can't lock screen: %s"), error->message); - g_error_free (error); - } - - g_free (args[0]); -} - -static void -on_lock_screen_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - maybe_lock_screen (adata); -} - -static void -on_login_screen_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - GdmUser *user; - - user = NULL; - - do_switch (adata, user); -} - -static void -on_quit_session_activate (GtkMenuItem *item, - GdmAppletData *adata) -{ - char *args[3]; - GError *error; - GdkScreen *screen; - gboolean res; - - args[0] = g_find_program_in_path ("gnome-session-save"); - if (args[0] == NULL) { - return; - } - - args[1] = "--logout-dialog"; - args[2] = NULL; - - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); - } else { - screen = gdk_screen_get_default (); - } - - error = NULL; - res = gdk_spawn_on_screen (screen, - g_get_home_dir (), - args, - NULL, - 0, - NULL, - NULL, - NULL, - &error); - if (! res) { - g_warning (_("Can't log out: %s"), error->message); - g_error_free (error); - } - - g_free (args[0]); -} - -#ifdef BUILD_PRESENSE_STUFF -static gboolean -on_menu_key_press_event (GtkWidget *widget, - GdkEventKey *event, - GdmAppletData *adata) -{ - GtkWidget *entry; - - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); - - if (GTK_WIDGET_HAS_FOCUS (entry)) { - gtk_widget_event (entry, (GdkEvent *)event); - return TRUE; - } else { - return FALSE; - } -} - -static void -save_status (GdmAppletData *adata, - guint status) -{ - if (adata->current_status != status) { - GError *error; - - adata->current_status = status; - - g_debug ("Saving status: %u", status); - error = NULL; - dbus_g_proxy_call (adata->presence_proxy, - "SetStatus", - &error, - G_TYPE_UINT, status, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning ("Couldn't save presence status: %s", error->message); - g_error_free (error); - } - } -} - -static void -on_status_available_activate (GtkWidget *widget, - GdmAppletData *adata) -{ - - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { - save_status (adata, GSM_PRESENCE_STATUS_AVAILABLE); - } -} - -static void -on_status_busy_activate (GtkWidget *widget, - GdmAppletData *adata) -{ - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { - save_status (adata, GSM_PRESENCE_STATUS_BUSY); - } -} - -static void -on_status_invisible_activate (GtkWidget *widget, - GdmAppletData *adata) -{ - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { - save_status (adata, GSM_PRESENCE_STATUS_INVISIBLE); - } -} - -static struct { - char *icon_name; - char *display_name; - void *menu_callback; - GtkWidget *widget; -} statuses[] = { - { "user-online", N_("Available"), on_status_available_activate, NULL }, - { "user-invisible", N_("Invisible"), on_status_invisible_activate, NULL }, - { "user-busy", N_("Busy"), on_status_busy_activate, NULL }, - { "user-away", N_("Away"), NULL, NULL }, -}; -#endif - -static void -update_label (GdmAppletData *adata) -{ - GtkWidget *label; - char *markup; - - label = gtk_bin_get_child (GTK_BIN (adata->menuitem)); - -#ifdef BUILD_PRESENSE_STUFF - markup = g_strdup_printf ("%s (%s)", - gdm_user_get_real_name (GDM_USER (adata->user)), - _(statuses[adata->current_status].display_name)); -#else - markup = g_strdup_printf ("%s", - gdm_user_get_real_name (GDM_USER (adata->user))); -#endif - gtk_label_set_markup (GTK_LABEL (label), markup); - g_free (markup); -} - -#ifdef BUILD_PRESENSE_STUFF -static void -save_status_text (GdmAppletData *adata) -{ - GtkWidget *entry; - GtkTextBuffer *buffer; - char *escaped_text; - char *text; - GtkTextIter start, end; - - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); - gtk_text_buffer_get_bounds (buffer, &start, &end); - text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); - escaped_text = g_markup_escape_text (text, -1); - - if (escaped_text != NULL) { - GError *error; - - error = NULL; - dbus_g_proxy_call (adata->presence_proxy, - "SetStatusText", - &error, - G_TYPE_STRING, escaped_text, - G_TYPE_INVALID, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning ("Couldn't set presence status text: %s", error->message); - g_error_free (error); - } - } - - g_free (text); - g_free (escaped_text); -} - -static void -on_user_item_deselect (GtkWidget *item, - GdmAppletData *adata) -{ - save_status_text (adata); -} -#endif - -static void -create_sub_menu (GdmAppletData *adata) -{ - GtkWidget *item; -#ifdef BUILD_PRESENSE_STUFF - int i; - GSList *radio_group; -#endif - - adata->menu = gtk_menu_new (); -#ifdef BUILD_PRESENSE_STUFF - g_signal_connect (adata->menu, - "key-press-event", - G_CALLBACK (on_menu_key_press_event), - adata); -#endif - gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), adata->menu); - g_signal_connect (adata->menu, "style-set", - G_CALLBACK (menu_style_set_cb), adata); - g_signal_connect (adata->menu, "show", - G_CALLBACK (menu_expose_cb), adata); - -#ifdef BUILD_PRESENSE_STUFF - adata->user_item = gdm_entry_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->user_item); - gtk_widget_show (adata->user_item); - g_signal_connect (adata->user_item, "activate", - G_CALLBACK (on_user_item_activate), adata); - g_signal_connect (adata->user_item, - "deselect", - G_CALLBACK (on_user_item_deselect), - adata); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); - gtk_widget_show (item); - - radio_group = NULL; - for (i = 0; i < G_N_ELEMENTS (statuses); i++) { - GtkWidget *hbox; - GtkWidget *label; - GtkWidget *image; - GtkWidget *item; - - if (statuses[i].menu_callback == NULL) { - continue; - } - - item = gtk_radio_menu_item_new (radio_group); - radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); - hbox = gtk_hbox_new (FALSE, 3); - label = gtk_label_new (_(statuses[i].display_name)); - gtk_label_set_justify (GTK_LABEL(label), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - gtk_widget_show (label); - image = gtk_image_new_from_icon_name (statuses[i].icon_name, GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - gtk_widget_show (image); - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (item), hbox); - - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - item); - g_signal_connect (item, "activate", - G_CALLBACK (statuses[i].menu_callback), adata); - gtk_widget_show (item); - - statuses[i].widget = item; - } - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); - gtk_widget_show (item); -#endif - - adata->account_item = gtk_image_menu_item_new_with_label (_("Account Information")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->account_item), - gtk_image_new ()); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->account_item); - g_signal_connect (adata->account_item, "style-set", - G_CALLBACK (menuitem_style_set_cb), adata); - g_signal_connect (adata->account_item, "activate", - G_CALLBACK (on_account_activate), adata); - gtk_widget_show (adata->account_item); - - - adata->control_panel_item = gtk_image_menu_item_new_with_label (_("System Preferences")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->control_panel_item), - gtk_image_new ()); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->control_panel_item); - g_signal_connect (adata->control_panel_item, "style-set", - G_CALLBACK (menuitem_style_set_cb), adata); - g_signal_connect (adata->control_panel_item, "activate", - G_CALLBACK (on_control_panel_activate), adata); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); - gtk_widget_show (item); - - adata->lock_screen_item = gtk_image_menu_item_new_with_label (_("Lock Screen")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->lock_screen_item), - gtk_image_new ()); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->lock_screen_item); - g_signal_connect (adata->lock_screen_item, "style-set", - G_CALLBACK (menuitem_style_set_cb), adata); - g_signal_connect (adata->lock_screen_item, "activate", - G_CALLBACK (on_lock_screen_activate), adata); - /* Only show if not locked down */ - - adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), - gtk_image_new ()); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->login_screen_item); - g_signal_connect (adata->login_screen_item, "style-set", - G_CALLBACK (menuitem_style_set_cb), adata); - g_signal_connect (adata->login_screen_item, "activate", - G_CALLBACK (on_login_screen_activate), adata); - /* Only show switch user if there are other users */ - - adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit…")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), - gtk_image_new ()); - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), - adata->quit_session_item); - g_signal_connect (adata->quit_session_item, "style-set", - G_CALLBACK (menuitem_style_set_cb), adata); - g_signal_connect (adata->quit_session_item, "activate", - G_CALLBACK (on_quit_session_activate), adata); - gtk_widget_show (adata->quit_session_item); - gtk_widget_show (adata->menu); -} - -static void -destroy_sub_menu (GdmAppletData *adata) -{ - gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), NULL); -} - -static void -set_menu_visibility (GdmAppletData *adata, - gboolean visible) -{ - - if (visible) { - create_sub_menu (adata); - } else { - destroy_sub_menu (adata); - } -} - -static void -client_notify_lockdown_func (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - GdmAppletData *adata) -{ - GConfValue *value; - const char *key; - - value = gconf_entry_get_value (entry); - key = gconf_entry_get_key (entry); - - if (value == NULL || key == NULL) { - return; - } - - if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { - if (gconf_value_get_bool (value)) { - set_menu_visibility (adata, FALSE); - } else { - set_menu_visibility (adata, TRUE); - } - } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { - if (gconf_value_get_bool (value)) { - gtk_widget_hide (adata->lock_screen_item); - } else { - gtk_widget_show (adata->lock_screen_item); - } - } -} - -static void -reset_icon (GdmAppletData *adata) -{ - GdkPixbuf *pixbuf; - GtkWidget *image; - - if (adata->user == NULL || !gtk_widget_has_screen (GTK_WIDGET (adata->menuitem))) { - return; - } - -#ifdef BUILD_PRESENSE_STUFF - if (adata->user_item != NULL) { - image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item)); - pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 3); - if (pixbuf == NULL) { - return; - } - - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - g_object_unref (pixbuf); - } -#else - pixbuf = gdm_user_render_icon (adata->user, adata->panel_size); - - if (pixbuf == NULL) { - return; - } - - image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem)); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - g_object_unref (pixbuf); -#endif -} - -static void -setup_current_user_now (GdmAppletData *adata) -{ - g_assert (adata->user != NULL); - - if (adata->user_loaded_notify_id != 0) { - g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); - } - adata->user_loaded_notify_id = 0; - - update_label (adata); - reset_icon (adata); - adata->user_changed_notify_id = - g_signal_connect (adata->user, - "changed", - G_CALLBACK (on_user_changed), - adata); -} - -static void -on_current_user_loaded (GdmUser *user, - GParamSpec *pspec, - GdmAppletData *adata) -{ - if (!gdm_user_is_loaded (user)) { - return; - } - - setup_current_user_now (adata); -} - -static void -setup_current_user (GdmAppletData *adata) -{ - adata->user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ()); - - if (adata->user == NULL) { - g_warning ("Could not setup current user"); - return; - } - - g_object_ref (adata->user); - - adata->menuitem = gtk_image_menu_item_new_with_label (""); -#ifndef BUILD_PRESENSE_STUFF - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem), - gtk_image_new ()); -#endif - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem); - gtk_widget_show (adata->menuitem); - - if (gdm_user_is_loaded (adata->user)) { - setup_current_user_now (adata); - return; - } - - adata->user_loaded_notify_id = g_signal_connect (adata->user, - "notify::is-loaded", - G_CALLBACK (on_current_user_loaded), - adata); -} - -#ifdef BUILD_PRESENSE_STUFF -static void -set_status (GdmAppletData *adata, - guint status) -{ - int i; - - g_debug ("Setting current status: %u", status); - adata->current_status = status; - for (i = 0; i < G_N_ELEMENTS (statuses); i++) { - if (statuses[i].widget == NULL) { - continue; - } - if (i == status) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (statuses[i].widget), - TRUE); - } - } - - update_label (adata); -} - -static void -on_presence_status_changed (DBusGProxy *presence_proxy, - guint status, - GdmAppletData *adata) -{ - g_debug ("Status changed: %u", status); - - set_status (adata, status); -} - -static void -set_status_text (GdmAppletData *adata, - const char *status_text) -{ - GtkWidget *entry; - GtkTextBuffer *buffer; - - g_debug ("Status text changed: %s", status_text); - - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); - gtk_text_buffer_set_text (buffer, status_text, -1); -} - -static void -on_presence_status_text_changed (DBusGProxy *presence_proxy, - const char *status_text, - GdmAppletData *adata) -{ - set_status_text (adata, status_text); -} -#endif - -static gboolean -fill_applet (PanelApplet *applet) -{ - static const BonoboUIVerb menu_verbs[] = { - BONOBO_UI_VERB ("GdmAboutMe", about_me_cb), - BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb), - BONOBO_UI_VERB ("GdmAbout", about_cb), - BONOBO_UI_VERB_END - }; - static gboolean first_time = FALSE; - char *tmp; - BonoboUIComponent *popup_component; - GdmAppletData *adata; - GError *error; - DBusGConnection *bus; - - if (!first_time) { - first_time = TRUE; - - /* Do this here so it's only done once. */ - gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n" - "{\n" - "GtkMenuBar::shadow-type = none\n" - "GtkMenuBar::internal-padding = 0\n" - "}\n" - "style \"gdm-user-switch-applet-style\"\n" - "{\n" - "GtkWidget::focus-line-width = 0\n" - "GtkWidget::focus-padding = 0\n" - "}\n" - "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n" - "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); - gtk_window_set_default_icon_name ("stock_people"); - g_set_application_name (_("User Switch Applet")); - - if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) { - g_critical ("Unable to initialize settings client"); - exit (1); - } - - } - - adata = g_new0 (GdmAppletData, 1); - adata->applet = applet; - adata->panel_size = 24; - - adata->client = gconf_client_get_default (); - - gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status")); - gtk_container_set_border_width (GTK_CONTAINER (applet), 0); - gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet"); - panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); - panel_applet_setup_menu_from_file (applet, NULL, - DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml", - NULL, menu_verbs, adata); - - popup_component = panel_applet_get_popup_component (applet); - - /* Hide the admin context menu items if locked down or no cmd-line */ - if (gconf_client_get_bool (adata->client, - LOCKDOWN_COMMAND_LINE_KEY, - NULL) || - panel_applet_get_locked_down (applet)) { - bonobo_ui_component_set_prop (popup_component, - "/popups/button3/GdmSeparator", - "hidden", "1", NULL); - bonobo_ui_component_set_prop (popup_component, - "/commands/GdmUsersGroupsAdmin", - "hidden", "1", NULL); - } else { -#ifndef USERS_ADMIN -# ifdef GDM_SETUP - bonobo_ui_component_set_prop (popup_component, - "/popups/button3/GdmSeparator", - "hidden", "1", - NULL); -# endif /* !GDM_SETUP */ - bonobo_ui_component_set_prop (popup_component, - "/commands/GdmUsersGroupsAdmin", - "hidden", "1", - NULL); -#endif /* !USERS_ADMIN */ - } - - /* Hide the gdmphotosetup item if it can't be found in the path. */ - tmp = g_find_program_in_path ("gnome-about-me"); - if (!tmp) { - bonobo_ui_component_set_prop (popup_component, - "/commands/GdmAboutMe", - "hidden", "1", - NULL); - } else { - g_free (tmp); - } - - g_signal_connect (adata->applet, - "style-set", - G_CALLBACK (applet_style_set_cb), adata); - g_signal_connect (applet, - "change-background", - G_CALLBACK (applet_change_background_cb), adata); - g_signal_connect (applet, - "size-allocate", - G_CALLBACK (applet_size_allocate_cb), adata); - g_signal_connect (applet, - "key-press-event", - G_CALLBACK (applet_key_press_event_cb), adata); - g_signal_connect_after (applet, - "focus-in-event", - G_CALLBACK (gtk_widget_queue_draw), NULL); - g_signal_connect_after (applet, - "focus-out-event", - G_CALLBACK (gtk_widget_queue_draw), NULL); - g_object_set_data_full (G_OBJECT (applet), - "gdm-applet-data", - adata, - (GDestroyNotify) gdm_applet_data_free); - - adata->menubar = gtk_menu_bar_new (); - gtk_widget_set_name (adata->menubar, "gdm-user-switch-menubar"); - gtk_widget_set_can_focus (adata->menubar, TRUE); - g_signal_connect (adata->menubar, "button-press-event", - G_CALLBACK (menubar_button_press_event_cb), adata); - g_signal_connect_after (adata->menubar, "expose-event", - G_CALLBACK (menubar_expose_event_cb), adata); - gtk_container_add (GTK_CONTAINER (applet), adata->menubar); - gtk_widget_show (adata->menubar); - - adata->manager = gdm_user_manager_ref_default (); - g_object_set (adata->manager, "include-all", TRUE, NULL); - g_signal_connect (adata->manager, - "notify::is-loaded", - G_CALLBACK (on_manager_is_loaded_changed), - adata); - g_signal_connect (adata->manager, - "notify::has-multiple-users", - G_CALLBACK (on_manager_has_multiple_users_changed), - adata); - - gdm_user_manager_queue_load (adata->manager); - setup_current_user (adata); - - gconf_client_add_dir (adata->client, - LOCKDOWN_DIR, - GCONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - - adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client, - LOCKDOWN_DIR, - (GConfClientNotifyFunc)client_notify_lockdown_func, - adata, - NULL, - NULL); - - if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) { - set_menu_visibility (adata, FALSE); - } else { - set_menu_visibility (adata, TRUE); - } - if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { - gtk_widget_hide (adata->lock_screen_item); - } else { - gtk_widget_show (adata->lock_screen_item); - } - - error = NULL; - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); - if (bus == NULL) { - g_warning ("Unable to get session bus: %s", error->message); - g_error_free (error); - goto done; - } - -#ifdef BUILD_PRESENSE_STUFF - adata->presence_proxy = dbus_g_proxy_new_for_name (bus, - "org.gnome.SessionManager", - "/org/gnome/SessionManager/Presence", - "org.gnome.SessionManager.Presence"); - if (adata->presence_proxy != NULL) { - DBusGProxy *proxy; - - dbus_g_proxy_add_signal (adata->presence_proxy, - "StatusChanged", - G_TYPE_UINT, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal (adata->presence_proxy, - "StatusChanged", - G_CALLBACK (on_presence_status_changed), - adata, - NULL); - dbus_g_proxy_add_signal (adata->presence_proxy, - "StatusTextChanged", - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal (adata->presence_proxy, - "StatusTextChanged", - G_CALLBACK (on_presence_status_text_changed), - adata, - NULL); - - - proxy = dbus_g_proxy_new_from_proxy (adata->presence_proxy, - "org.freedesktop.DBus.Properties", - "/org/gnome/SessionManager/Presence"); - if (proxy != NULL) { - guint status; - const char *status_text; - GValue value = { 0, }; - - status = 0; - status_text = NULL; - - error = NULL; - dbus_g_proxy_call (proxy, - "Get", - &error, - G_TYPE_STRING, "org.gnome.SessionManager.Presence", - G_TYPE_STRING, "status", - G_TYPE_INVALID, - G_TYPE_VALUE, &value, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning ("Couldn't get presence status: %s", error->message); - g_error_free (error); - } else { - status = g_value_get_uint (&value); - } - - g_value_unset (&value); - - error = NULL; - dbus_g_proxy_call (proxy, - "Get", - &error, - G_TYPE_STRING, "org.gnome.SessionManager.Presence", - G_TYPE_STRING, "status-text", - G_TYPE_INVALID, - G_TYPE_VALUE, &value, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning ("Couldn't get presence status text: %s", error->message); - g_error_free (error); - } else { - status_text = g_value_get_string (&value); - } - - set_status (adata, status); - set_status_text (adata, status_text); - } - } else { - g_warning ("Failed to get session presence proxy"); - } -#endif - - done: - gtk_widget_show (GTK_WIDGET (adata->applet)); - - return TRUE; -} - -static gboolean -applet_factory (PanelApplet *applet, - const char *iid, - gpointer data) -{ - gboolean ret; - ret = FALSE; - if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) { - ret = fill_applet (applet); - } - return ret; -} diff -Nru gdm-2.32.1/gui/user-switch-applet/gdm-entry-menu-item.c gdm-3.0.0/gui/user-switch-applet/gdm-entry-menu-item.c --- gdm-2.32.1/gui/user-switch-applet/gdm-entry-menu-item.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/gdm-entry-menu-item.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,304 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 Red Hat, 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 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 - */ - -#include "config.h" - -#include -#include - -#include - -#include -#include - -#include "gdm-entry-menu-item.h" - -/* same as twitter */ -#define TEXT_BUFFER_MAX_CHARS 64 - -enum -{ - PROP_0, -}; - -struct _GdmEntryMenuItem -{ - GtkMenuItem parent; - - GtkWidget *hbox; - GtkWidget *image; - GtkWidget *entry; -}; - -struct _GdmEntryMenuItemClass -{ - GtkMenuItemClass parent_class; -}; - -G_DEFINE_TYPE (GdmEntryMenuItem, gdm_entry_menu_item, GTK_TYPE_MENU_ITEM) - -static void -gdm_entry_menu_item_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - GdmEntryMenuItem *item; - - item = GDM_ENTRY_MENU_ITEM (object); - - switch (param_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gdm_entry_menu_item_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - GdmEntryMenuItem *item; - - item = GDM_ENTRY_MENU_ITEM (object); - - switch (param_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gdm_entry_menu_item_dispose (GObject *object) -{ - - (*G_OBJECT_CLASS (gdm_entry_menu_item_parent_class)->dispose) (object); -} - -static gboolean -gdm_entry_menu_item_button_release (GtkWidget *widget, - GdkEventButton *event) -{ - return TRUE; -} - -/* Cut and paste from gtkwindow.c */ -static void -send_focus_change (GtkWidget *widget, - gboolean in) -{ - GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); - - g_object_ref (widget); - - gtk_widget_set_can_focus (widget, in); - - fevent->focus_change.type = GDK_FOCUS_CHANGE; - fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget)); - fevent->focus_change.in = in; - - gtk_widget_event (widget, fevent); - - g_object_notify (G_OBJECT (widget), "has-focus"); - - g_object_unref (widget); - gdk_event_free (fevent); -} - -static gboolean -gdm_entry_menu_item_button_press (GtkWidget *widget, - GdkEventButton *event) -{ - GtkWidget *entry; - - entry = GDM_ENTRY_MENU_ITEM (widget)->entry; - - if (gtk_widget_get_window (entry) != NULL) { - gdk_window_raise (gtk_widget_get_window (entry)); - } - - if (!gtk_widget_has_focus (entry)) { - gtk_widget_grab_focus (entry); - } - - return FALSE; -} - -static void -gdm_entry_menu_item_realize (GtkWidget *widget) -{ - if (GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize) { - GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize (widget); - } -} - -static void -gdm_entry_menu_item_select (GtkItem *item) -{ - g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), TRUE); -} - -static void -gdm_entry_menu_item_deselect (GtkItem *item) -{ - g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); - - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); -} - -static void -gdm_entry_menu_item_class_init (GdmEntryMenuItemClass *klass) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - GtkMenuItemClass *menu_item_class; - GtkItemClass *item_class; - - gobject_class = G_OBJECT_CLASS (klass); - widget_class = GTK_WIDGET_CLASS (klass); - menu_item_class = GTK_MENU_ITEM_CLASS (klass); - item_class = GTK_ITEM_CLASS (klass); - - gobject_class->set_property = gdm_entry_menu_item_set_property; - gobject_class->get_property = gdm_entry_menu_item_get_property; - gobject_class->dispose = gdm_entry_menu_item_dispose; - - widget_class->button_release_event = gdm_entry_menu_item_button_release; - widget_class->button_press_event = gdm_entry_menu_item_button_press; - widget_class->realize = gdm_entry_menu_item_realize; - - item_class->select = gdm_entry_menu_item_select; - item_class->deselect = gdm_entry_menu_item_deselect; - - menu_item_class->hide_on_activate = FALSE; -} - -static void -on_entry_show (GtkWidget *widget, - GdmEntryMenuItem *item) -{ - if (gtk_widget_get_window (widget) != NULL) { - gdk_window_raise (gtk_widget_get_window (widget)); - } - send_focus_change (widget, TRUE); -} - -static void -on_text_buffer_changed (GtkTextBuffer *buffer, - GdmEntryMenuItem *item) -{ - int len; - - len = gtk_text_buffer_get_char_count (buffer); - if (len > TEXT_BUFFER_MAX_CHARS) { - gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (item))); - } -} - -static void -on_entry_move_focus (GtkWidget *widget, - GtkDirectionType direction, - GdmEntryMenuItem *item) -{ - g_debug ("focus move"); - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); - g_signal_emit_by_name (item, - "move-focus", - GTK_DIR_TAB_FORWARD); -} - -static void -gdm_entry_menu_item_init (GdmEntryMenuItem *item) -{ - PangoFontDescription *fontdesc; - PangoFontMetrics *metrics; - PangoContext *context; - PangoLanguage *lang; - int ascent; - GtkTextBuffer *buffer; - - item->hbox = gtk_hbox_new (FALSE, 6); - gtk_container_add (GTK_CONTAINER (item), item->hbox); - - item->image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (item->hbox), item->image, FALSE, FALSE, 0); - - item->entry = gtk_text_view_new (); - gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (item->entry), FALSE); - gtk_text_view_set_editable (GTK_TEXT_VIEW (item->entry), TRUE); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (item->entry), - GTK_WRAP_WORD); - g_signal_connect (item->entry, - "show", - G_CALLBACK (on_entry_show), - item); - g_signal_connect (item->entry, - "move-focus", - G_CALLBACK (on_entry_move_focus), - item); - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (item->entry)); - g_signal_connect (buffer, - "changed", - G_CALLBACK (on_text_buffer_changed), - item); - - /* get the font ascent for the current font and language */ - context = gtk_widget_get_pango_context (item->entry); - fontdesc = pango_context_get_font_description (context); - lang = pango_context_get_language (context); - metrics = pango_context_get_metrics (context, fontdesc, lang); - ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE; - pango_font_metrics_unref (metrics); - - /* size our progress bar to be five ascents long */ - gtk_widget_set_size_request (item->entry, ascent * 5, -1); - - gtk_box_pack_start (GTK_BOX (item->hbox), item->entry, TRUE, TRUE, 0); - - gtk_widget_show (item->hbox); - gtk_widget_show (item->image); - gtk_widget_show (item->entry); -} - -GtkWidget * -gdm_entry_menu_item_new (void) -{ - return g_object_new (GDM_TYPE_ENTRY_MENU_ITEM, NULL); -} - -GtkWidget * -gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item) -{ - g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); - - return item->entry; -} - -GtkWidget * -gdm_entry_menu_item_get_image (GdmEntryMenuItem *item) -{ - g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); - - return item->image; -} diff -Nru gdm-2.32.1/gui/user-switch-applet/gdm-entry-menu-item.h gdm-3.0.0/gui/user-switch-applet/gdm-entry-menu-item.h --- gdm-2.32.1/gui/user-switch-applet/gdm-entry-menu-item.h 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/gdm-entry-menu-item.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2004-2005 James M. Cape . - * - * 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 - */ - -#ifndef __GDM_ENTRY_MENU_ITEM__ -#define __GDM_ENTRY_MENU_ITEM__ - -#include - -G_BEGIN_DECLS - -#define GDM_TYPE_ENTRY_MENU_ITEM \ - (gdm_entry_menu_item_get_type ()) -#define GDM_ENTRY_MENU_ITEM(object) \ - (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItem)) -#define GDM_ENTRY_MENU_ITEM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) -#define GDM_IS_ENTRY_MENU_ITEM(object) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_ENTRY_MENU_ITEM)) -#define GDM_IS_ENTRY_MENU_ITEM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_ENTRY_MENU_ITEM)) -#define GDM_ENTRY_MENU_ITEM_GET_CLASS(object) \ - (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) - -typedef struct _GdmEntryMenuItem GdmEntryMenuItem; -typedef struct _GdmEntryMenuItemClass GdmEntryMenuItemClass; - -GType gdm_entry_menu_item_get_type (void) G_GNUC_CONST; - -GtkWidget *gdm_entry_menu_item_new (void); -GtkWidget *gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item); -GtkWidget *gdm_entry_menu_item_get_image (GdmEntryMenuItem *item); - -G_END_DECLS - -#endif /* __GDM_ENTRY_MENU_ITEM__ */ diff -Nru gdm-2.32.1/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in gdm-3.0.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in --- gdm-2.32.1/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gdm-2.32.1/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml gdm-3.0.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml --- gdm-2.32.1/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ - - - - - - - - - diff -Nru gdm-2.32.1/gui/user-switch-applet/Makefile.am gdm-3.0.0/gui/user-switch-applet/Makefile.am --- gdm-2.32.1/gui/user-switch-applet/Makefile.am 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -NULL = - -AM_CPPFLAGS = \ - -I$(top_srcdir)/gui/simple-greeter \ - -I$(top_srcdir)/common \ - -DPREFIX=\""$(prefix)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGLADEDIR=\""$(pkgdatadir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DSBINDIR=\""$(sbindir)"\" \ - -DGDMCONFDIR=\"$(gdmconfdir)\" \ - $(GTK_CFLAGS) \ - $(APPLET_CFLAGS) \ - $(NULL) - -libexec_PROGRAMS = \ - gdm-user-switch-applet \ - $(NULL) - -gdm_user_switch_applet_SOURCES = \ - applet.c \ - gdm-entry-menu-item.h \ - gdm-entry-menu-item.c \ - $(NULL) - -gdm_user_switch_applet_LDADD = \ - $(top_builddir)/gui/simple-greeter/libgdmuser.la \ - $(top_builddir)/common/libgdmcommon.la \ - $(COMMON_LIBS) \ - $(APPLET_LIBS) \ - $(NULL) - -# Bonobo UI -uidir = $(datadir)/gnome-2.0/ui -ui_DATA = \ - GNOME_FastUserSwitchApplet.xml \ - $(NULL) - -# Bonobo .server -serverdir = $(libdir)/bonobo/servers -server_in_files = \ - GNOME_FastUserSwitchApplet.server.in \ - $(NULL) -server_DATA = $(server_in_files:.server.in=.server) - -$(server_in_files): $(server_in_files:.server.in=.server.in.in) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ - -@INTLTOOL_SERVER_RULE@ - -EXTRA_DIST = \ - $(ui_DATA) \ - GNOME_FastUserSwitchApplet.server.in.in \ - $(NULL) - -DISTCLEANFILES = \ - $(server_in_files) \ - $(server_DATA) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in diff -Nru gdm-2.32.1/gui/user-switch-applet/Makefile.in gdm-3.0.0/gui/user-switch-applet/Makefile.in --- gdm-2.32.1/gui/user-switch-applet/Makefile.in 2011-03-28 16:55:36.000000000 +0000 +++ gdm-3.0.0/gui/user-switch-applet/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,799 +0,0 @@ -# Makefile.in generated by automake 1.11.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. -# 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@ -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@ -libexec_PROGRAMS = gdm-user-switch-applet$(EXEEXT) $(am__EXEEXT_1) -subdir = gui/user-switch-applet -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = -am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" \ - "$(DESTDIR)$(uidir)" -PROGRAMS = $(libexec_PROGRAMS) -am__objects_1 = -am_gdm_user_switch_applet_OBJECTS = applet.$(OBJEXT) \ - gdm-entry-menu-item.$(OBJEXT) $(am__objects_1) -gdm_user_switch_applet_OBJECTS = $(am_gdm_user_switch_applet_OBJECTS) -am__DEPENDENCIES_1 = -gdm_user_switch_applet_DEPENDENCIES = \ - $(top_builddir)/gui/simple-greeter/libgdmuser.la \ - $(top_builddir)/common/libgdmcommon.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -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_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(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 = $(gdm_user_switch_applet_SOURCES) -DIST_SOURCES = $(gdm_user_switch_applet_SOURCES) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -DATA = $(server_DATA) $(ui_DATA) -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@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ -AR = @AR@ -AT_BINDIR = @AT_BINDIR@ -AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BINDIR = @BINDIR@ -CANBERRA_GTK_CFLAGS = @CANBERRA_GTK_CFLAGS@ -CANBERRA_GTK_LIBS = @CANBERRA_GTK_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CHECK_CFLAGS = @CHECK_CFLAGS@ -CHECK_LIBS = @CHECK_LIBS@ -COMMON_CFLAGS = @COMMON_CFLAGS@ -COMMON_LIBS = @COMMON_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DAEMON_CFLAGS = @DAEMON_CFLAGS@ -DAEMON_LIBS = @DAEMON_LIBS@ -DATADIR = @DATADIR@ -DATADIRNAME = @DATADIRNAME@ -DBUS_SYS_DIR = @DBUS_SYS_DIR@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ -EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ -EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ -EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ -EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ -EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ -EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ -EXTRA_TEST_LIBS = @EXTRA_TEST_LIBS@ -EXTRA_XNEST_LIBS = @EXTRA_XNEST_LIBS@ -FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GDMCHOOSER = @GDMCHOOSER@ -GDM_CUSTOM_CONF = @GDM_CUSTOM_CONF@ -GDM_DEFAULTS_CONF = @GDM_DEFAULTS_CONF@ -GDM_GROUPNAME = @GDM_GROUPNAME@ -GDM_OLD_CONF = @GDM_OLD_CONF@ -GDM_PID_FILE = @GDM_PID_FILE@ -GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@ -GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@ -GDM_USERNAME = @GDM_USERNAME@ -GDM_WORKING_DIR = @GDM_WORKING_DIR@ -GDM_XAUTH_DIR = @GDM_XAUTH_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@ -HAVE_PAM = @HAVE_PAM@ -HELP_DIR = @HELP_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@ -LANG_CONFIG_FILE = @LANG_CONFIG_FILE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDIR = @LIBDIR@ -LIBEXECDIR = @LIBEXECDIR@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIBWRAP_LIBS = @LIBWRAP_LIBS@ -LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@ -LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LOCALSTATEDIR = @LOCALSTATEDIR@ -LTLIBOBJS = @LTLIBOBJS@ -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@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -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@ -PAM_LIBS = @PAM_LIBS@ -PAM_PREFIX = @PAM_PREFIX@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -RBAC_LIBS = @RBAC_LIBS@ -SBINDIR = @SBINDIR@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIMPLE_CHOOSER_CFLAGS = @SIMPLE_CHOOSER_CFLAGS@ -SIMPLE_CHOOSER_LIBS = @SIMPLE_CHOOSER_LIBS@ -SIMPLE_GREETER_CFLAGS = @SIMPLE_GREETER_CFLAGS@ -SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LIBS@ -SOUND_PROGRAM = @SOUND_PROGRAM@ -STRIP = @STRIP@ -SYSCONFDIR = @SYSCONFDIR@ -UPOWER = @UPOWER@ -UPOWER_CFLAGS = @UPOWER_CFLAGS@ -UPOWER_LIBS = @UPOWER_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WITH_CONSOLE_KIT = @WITH_CONSOLE_KIT@ -XDMCP_LIBS = @XDMCP_LIBS@ -XEVIE_OPTION = @XEVIE_OPTION@ -XGETTEXT = @XGETTEXT@ -XINERAMA_LIBS = @XINERAMA_LIBS@ -XLIB_CFLAGS = @XLIB_CFLAGS@ -XLIB_LIBS = @XLIB_LIBS@ -XMKMF = @XMKMF@ -XSESSION_SHELL = @XSESSION_SHELL@ -X_CFLAGS = @X_CFLAGS@ -X_CONFIG_OPTIONS = @X_CONFIG_OPTIONS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PATH = @X_PATH@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_SERVER = @X_SERVER@ -X_SERVER_PATH = @X_SERVER_PATH@ -X_XNEST_CMD = @X_XNEST_CMD@ -X_XNEST_CONFIG_OPTIONS = @X_XNEST_CONFIG_OPTIONS@ -X_XNEST_UNSCALED_FONTPATH = @X_XNEST_UNSCALED_FONTPATH@ -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_CXX = @ac_ct_CXX@ -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@ -authdir = @authdir@ -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@ -dmconfdir = @dmconfdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gdmconfdir = @gdmconfdir@ -gdmlocaledir = @gdmlocaledir@ -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@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -logdir = @logdir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pixmapdir = @pixmapdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -sysconfsubdir = @sysconfsubdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -NULL = -AM_CPPFLAGS = \ - -I$(top_srcdir)/gui/simple-greeter \ - -I$(top_srcdir)/common \ - -DPREFIX=\""$(prefix)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGLADEDIR=\""$(pkgdatadir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" \ - -DSBINDIR=\""$(sbindir)"\" \ - -DGDMCONFDIR=\"$(gdmconfdir)\" \ - $(GTK_CFLAGS) \ - $(APPLET_CFLAGS) \ - $(NULL) - -gdm_user_switch_applet_SOURCES = \ - applet.c \ - gdm-entry-menu-item.h \ - gdm-entry-menu-item.c \ - $(NULL) - -gdm_user_switch_applet_LDADD = \ - $(top_builddir)/gui/simple-greeter/libgdmuser.la \ - $(top_builddir)/common/libgdmcommon.la \ - $(COMMON_LIBS) \ - $(APPLET_LIBS) \ - $(NULL) - - -# Bonobo UI -uidir = $(datadir)/gnome-2.0/ui -ui_DATA = \ - GNOME_FastUserSwitchApplet.xml \ - $(NULL) - - -# Bonobo .server -serverdir = $(libdir)/bonobo/servers -server_in_files = \ - GNOME_FastUserSwitchApplet.server.in \ - $(NULL) - -server_DATA = $(server_in_files:.server.in=.server) -EXTRA_DIST = \ - $(ui_DATA) \ - GNOME_FastUserSwitchApplet.server.in.in \ - $(NULL) - -DISTCLEANFILES = \ - $(server_in_files) \ - $(server_DATA) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - *~ \ - Makefile.in - -all: 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 gui/user-switch-applet/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu gui/user-switch-applet/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-libexecPROGRAMS: $(libexec_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - 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)$(libexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || 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)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files - -clean-libexecPROGRAMS: - @list='$(libexec_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 -gdm-user-switch-applet$(EXEEXT): $(gdm_user_switch_applet_OBJECTS) $(gdm_user_switch_applet_DEPENDENCIES) - @rm -f gdm-user-switch-applet$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gdm_user_switch_applet_OBJECTS) $(gdm_user_switch_applet_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-entry-menu-item.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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.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@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) - test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" - @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(serverdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(serverdir)" || exit $$?; \ - done - -uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(serverdir)" && rm -f $$files -install-uiDATA: $(ui_DATA) - @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ - done - -uninstall-uiDATA: - @$(NORMAL_UNINSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files - -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 - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - 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; }; }'`; \ - 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 -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; }; }'`; \ - 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" - -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: check-am -all-am: Makefile $(PROGRAMS) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; 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: - $(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 -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 "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic clean-libexecPROGRAMS 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-serverDATA install-uiDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-libexecPROGRAMS - -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-libexecPROGRAMS uninstall-serverDATA \ - uninstall-uiDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool ctags 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-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-serverDATA install-strip \ - install-uiDATA 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-libexecPROGRAMS uninstall-serverDATA \ - uninstall-uiDATA - - -$(server_in_files): $(server_in_files:.server.in=.server.in.in) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ - -@INTLTOOL_SERVER_RULE@ - -# 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 gdm-2.32.1/m4/gnome-doc-utils.m4 gdm-3.0.0/m4/gnome-doc-utils.m4 --- gdm-2.32.1/m4/gnome-doc-utils.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/gnome-doc-utils.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,56 @@ +dnl Do not call GNOME_DOC_DEFINES directly. It is split out from +dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. +AC_DEFUN([GNOME_DOC_DEFINES], +[ +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, + [with_help_dir='${datadir}/gnome/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_WITH([omf-dir], + AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, + [with_omf_dir='${datadir}/omf']) +OMF_DIR="$with_omf_dir" +AC_SUBST(OMF_DIR) + +AC_ARG_WITH([help-formats], + AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, + [with_help_formats='']) +DOC_USER_FORMATS="$with_help_formats" +AC_SUBST(DOC_USER_FORMATS) + +AC_ARG_ENABLE([scrollkeeper], + [AC_HELP_STRING([--disable-scrollkeeper], + [do not make updates to the scrollkeeper database])],, + enable_scrollkeeper=yes) +AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) + +dnl disable scrollkeeper automatically for distcheck +DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) + +AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) +]) + +# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +AC_DEFUN([GNOME_DOC_INIT], +[AC_REQUIRE([AC_PROG_LN_S])dnl + +ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) + +AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) +PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], + [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) + +if test "$gdu_cv_have_gdu" = "yes"; then + AC_MSG_RESULT([yes]) + ifelse([$2],,[:],[$2]) +else + AC_MSG_RESULT([no]) + ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) +fi + +GNOME_DOC_DEFINES +]) diff -Nru gdm-2.32.1/m4/intltool.m4 gdm-3.0.0/m4/intltool.m4 --- gdm-2.32.1/m4/intltool.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/intltool.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,216 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak +## Kenneth Christiansen +## +## 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 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 + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $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; }'` + ] + 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 + +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 + + 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 $< [$]@' + +_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) + +# 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 + +# 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) + +IT_PO_SUBDIR([po]) + +]) + + +# 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])]) +] +) + +# 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], ...) + diff -Nru gdm-2.32.1/m4/libtool.m4 gdm-3.0.0/m4/libtool.m4 --- gdm-2.32.1/m4/libtool.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/libtool.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,7835 @@ +# 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 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. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010 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. +# +# 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. +]) + +# serial 57 LT_INIT + + +# 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])]) + + +# _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_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 + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# 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], []) + + +# _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-%%"` +]) + + +# _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_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 +]) +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 + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# 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 + +_LT_CC_BASENAME([$compiler]) + +# 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 + ;; +esac + +# 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_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' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# 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' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _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 + + +## ------------------------------------- ## +## Accumulate code for creating libtool. ## +## ------------------------------------- ## + +# 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. + + +# _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 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _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_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _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], [[!?.]$], [], [.]) +)]) + + + +## ------------------------ ## +## FIXME: Eliminate VARNAME ## +## ------------------------ ## + + +# _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])])]) +]) + + +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _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 +]) + + +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# 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)])]) + + +# 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 +]) + + +# _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"`']) + + +# _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_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 +]) + + +# _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 +]) + + +# _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)])])]) + + +# _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])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _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 + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# 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 + +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' + +# 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\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# 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\\\\\\"" + ;; + 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 + +# 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_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]] + + -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 + +Report bugs to ." + +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) 2010 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 + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +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 "$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 + + +# _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 + + 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 +# 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 + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_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 + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # 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) + + _LT_PROG_REPLACE_SHELLFNS + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +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 + + +# 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], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# 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)], + [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 + + +# _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)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +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)])])])])]) + +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 + +# 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_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 + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _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_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_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]) + + 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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; 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 "$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 +]) + + +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- +# 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\"`' + 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_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_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 + +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' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +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_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]) + +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 + + 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.])]) + +# _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 + +# 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* + ;; + +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* + ;; + +*-*-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 + ;; +sparc*-*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*) LD="${LD-ld} -m elf64_sparc" ;; + *) + 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 + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _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]) + +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 + ]) + ]) + +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 + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +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 \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +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" + # 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* +]) + +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_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" +]) + +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_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; + ;; + + 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; + ;; + + 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 + ;; + + 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"`func_fallback_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 +]) +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_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" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#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 + +/* 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; + + 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_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= + + 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= + ;; + + 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 + ]) + ;; + + *) + 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 + + 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\" + + 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) + ]) + + 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 + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + 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 + +# 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 "$_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_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_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 + + # 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)]) + +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_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_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" + 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 + +case $host_os in +aix3*) + version_type=linux + 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 + 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 + ;; + +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 + ;; + +bsdi[[45]]*) + version_type=linux + 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 + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +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[[123]]*) 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 + ;; + +gnu*) + version_type=linux + 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 + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux + 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 + 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 "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + 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 + ;; + +# This must be Linux ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + 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 + + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # 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="$sys_lib_dlsearch_path_spec $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 + 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*) + 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 + ;; + +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 + ;; + +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 + 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 "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + 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 + 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' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux + 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 + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +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_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_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 + +*** 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 + +# 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], []) + + +# _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) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# 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 + +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 &1 /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 + ;; + +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 + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +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)$' + ;; + +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 + ;; + +# This must be Linux 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 + ;; + +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*) + 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 + ;; + +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*` + ;; + 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 + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +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 +fi + +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 + +_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 + 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" +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 +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 + +# 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], []) + +# _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' + +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_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 + + +# 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 + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; 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 + + _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 + + +# _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 + +# 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]]' + +# 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 + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# 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'" + +# 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'" + +# 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 + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # 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};"\ +" /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]" + 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'" + + # 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 + + # 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 + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* 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} +}; + +/* 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 + 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 + 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 "$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 + +# 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_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 + + +# _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)= + +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' + + 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 + ;; + + 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 + ;; + + 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' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + 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 + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + 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 + ;; + + 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 + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + 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']) + ;; + + 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)= + ;; + + 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 + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + 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 + ;; + + *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' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + ;; + 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 "$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 + ;; + + 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' + ;; + + 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' + ;; + + 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' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + # 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\ 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,' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *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' + ;; + + 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' + ;; + + 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' + ;; + + 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' + ;; + + 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 + ;; + + 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' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which 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 + +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) + +# +# 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_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 + + +# _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 + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) ;; + *) + _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_flag_spec_ld, $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 "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # 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_use_gnu_ld_interface=yes + ;; + 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 + ;; + + 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 + ;; + + 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'] + + 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 + ;; + + 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 + ;; + + 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' + ;; + + 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' + + 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)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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 + ;; + + 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. + +_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 + ;; + + 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 + +*** 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 + ;; + + 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 + ;; + + *) + 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 "$_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 + ;; + + 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 + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # 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. + + _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,' + + 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 + + _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 + ;; + + 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 + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + 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(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 + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + 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 + ;; + + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + # 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 + ;; + + # 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 + ;; + + # 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 + ;; + + 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' + 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' + 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' + ;; + + 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_flag_spec_ld, $1)='+b $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 + ;; + + 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)=: + + 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' + + # 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 + ;; + + 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' + 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 + ;; + + 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 + ;; + + *nto* | *qnx*) + ;; + + 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 + fi + ;; + + 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' + ;; + + 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)=: + ;; + + 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' + 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' + ;; + 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??? + ;; + 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 + ;; + + 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' + ;; + 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_flag_spec_ld], [1], + [[If ld is used when linking, 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 + +## 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... +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]) + + 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_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _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 + +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_flag_spec_ld, $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 + +# Source file extension for C++ test sources. +ac_ext=cpp + +# 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 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;" + + # Code to be used in simple link tests + 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 + + # 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_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]) + + 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 + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # 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' + + _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}' + + # 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= + + # 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 + + # 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 + GXX=no + with_gnu_ld=no + wlarc= + fi + + # 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 + + # 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 + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # 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. + + _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,' + + 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 + + _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 + ;; + + 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 + ;; + + 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 + + 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 + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + 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 + ;; + + freebsd[[12]]*) + # 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 + ;; + + 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)=: + + 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 + + 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 + ;; + + 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' + + # 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 + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + 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_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"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # 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 + + _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' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $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. + # + # 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 + + # 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' + + # 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 + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + 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 + ;; + + 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::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + 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 + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + 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_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # 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)=: + + # 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${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 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $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 + ;; + + 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' + + _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' + + # 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' + + # 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' + + # 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' + + # 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_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 + ;; + + 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 + ;; + + 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) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + 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 + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _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 + +# _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)= + +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 +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +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 + + 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 $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # 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= + ;; + + *.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 + + 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 + ;; + + *) ;; # Ignore the rest. + + 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 + +# 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)= + ;; + +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 + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +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 + ;; + 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 +]) + +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_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_flag_spec_ld, $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 + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 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 + + # 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_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]) + + 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)="$G77" + _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_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 "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_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 +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_flag_spec_ld, $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 + +# 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 + +# 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 "$_lt_disable_FC" != 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 + + # 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_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + 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" + + ## 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" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _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 + +# 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 {}" + +# 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 + +# 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]) + +# 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 + +## 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... +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 + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _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 + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# 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 + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# 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 +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _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]) +]) + + +# _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]) +]) + +# _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]) +]) + +# _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 + +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. # +############################################################ + +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 + +# 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_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']) + +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_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_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 + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _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 + ;; + * ) # 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 + +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 diff -Nru gdm-2.32.1/m4/lt~obsolete.m4 gdm-3.0.0/m4/lt~obsolete.m4 --- gdm-2.32.1/m4/lt~obsolete.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/lt~obsolete.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,98 @@ +# 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. + +# serial 5 lt~obsolete.m4 + +# 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. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([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])]) diff -Nru gdm-2.32.1/m4/ltoptions.m4 gdm-3.0.0/m4/ltoptions.m4 --- gdm-2.32.1/m4/ltoptions.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/ltoptions.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,369 @@ +# 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])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _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 +]) + + +# _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_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_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_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# 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 + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +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.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +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 + +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) + + _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]) +]) + +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($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _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) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +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], []) + + + +# _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) + +_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])]) + +# 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.]) +]) + +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.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _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], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# 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.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +## ----------------- ## +## LTDL_INIT Options ## +## ----------------- ## + +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])]) diff -Nru gdm-2.32.1/m4/ltsugar.m4 gdm-3.0.0/m4/ltsugar.m4 --- gdm-2.32.1/m4/ltsugar.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/ltsugar.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,123 @@ +# 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. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# 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($@)))])]) + + +# 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_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])]) + + + +# 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])])])])]) + + +# 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])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# 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)])]))]) + + +# 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_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 +]) diff -Nru gdm-2.32.1/m4/ltversion.m4 gdm-3.0.0/m4/ltversion.m4 --- gdm-2.32.1/m4/ltversion.m4 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.0.0/m4/ltversion.m4 2011-04-04 14:39:22.000000000 +0000 @@ -0,0 +1,23 @@ +# 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. + +# @configure_input@ + +# serial 3293 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4]) +m4_define([LT_PACKAGE_REVISION], [1.3293]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4' +macro_revision='1.3293' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) diff -Nru gdm-2.32.1/Makefile.in gdm-3.0.0/Makefile.in --- gdm-2.32.1/Makefile.in 2011-03-28 16:55:37.000000000 +0000 +++ gdm-3.0.0/Makefile.in 2011-04-04 14:39:29.000000000 +0000 @@ -40,8 +40,11 @@ TODO acconfig.h compile config.guess config.sub depcomp \ install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(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 \ @@ -112,8 +115,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/NEWS gdm-3.0.0/NEWS --- gdm-2.32.1/NEWS 2011-03-28 16:54:50.000000000 +0000 +++ gdm-3.0.0/NEWS 2011-04-04 14:38:31.000000000 +0000 @@ -1,13 +1,88 @@ +============= +Version 3.0.0 +============= + +- Translation updates + +=============== +Version 2.91.94 +=============== + +- Warp pointer to convenient place at start up +- Fix crash with autologin +- Don't show empty names in user list +- Add a gdm session file for gnome-session to use +- Fix fuzzy icon in greeter +- Drop faces images +- Translation updates + +=============== +Version 2.91.93 +=============== + +- Fall back to username in user list if user doesn't have real name configured +- Be more robust against unexpected changes from accounts service +- Move some custom widgets to builder file out of source code +- Load accounts settings before showing session selector +- Fix crash for passwordless login +- other misc fixes +- Translation updates + +=============== +Version 2.91.92 +=============== + +- dconf overrides db generation clean ups +- ensure accounts service account is loaded before login +- slightly change hue of fg color +- maintain worker environment solely in PAM +- Translation updates + +=============== +Version 2.91.91 +=============== + +- Fix bug that some times prevent user list from coming up + +=============== +Version 2.91.90 +=============== + +- Make better use of iso-codes +- Fix g-s-d lockdown +- Set SIGPIPE to default before starting session +- Fix disconnect button for XDMCP connections +- GTK 3 fixes +- Add back session chooser +- Move greeter to accounts service library +- Update dconf defaults to reflect new schema names +- Translation updates + +=============== +Version 2.91.6 +=============== +- Add dconf profile +- Move to gtk3 +- Apply a thick layer of gnome 3 textured paint +- Move from ~/.dmrc to accounts service +- Be more robust against missing icons +- Translation updates + =============== -Version 2.32.1 +Version 2.91.4 =============== -- Reorganize Solaris login device permissions code -- Fix PostSession call in abnormal session exits -- Varouns user manager fixes -- Add support for system-release file to greeter display -- XDMCP ipv6 fixes -- CVE-2011-0727 - change to user before copying user files +- Omit version in login window if unknown +- Fix version display when release file is empty +- User manager async fixes +- Add greeter specific dconf database for lockdown +- XDMCP/ipv6 fix +- Fix to make sure PostSession is always called when appropriate +- Solaris permissions fix +- Only automatically login on boot when autologin is enabled, not after logout +- Enable braille reader support when screenreading is enabled +- Beep when login window is ready +- Make beeps audible by enable event sounds - Translation updates =============== diff -Nru gdm-2.32.1/po/af.po gdm-3.0.0/po/af.po --- gdm-2.32.1/po/af.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/af.po 2011-04-04 14:37:16.000000000 +0000 @@ -2,45 +2,41 @@ # Copyright (C) 2004 Zuza Software Foundation # This file is distributed under the same license as the gdm2 package. # Zuza Software Foundation , 2004 -# F Wolff , 2009 +# F Wolff , 2009, 2011. msgid "" msgstr "" "Project-Id-Version: gdm2 2.6-branch\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 20:00-0300\n" -"PO-Revision-Date: 2009-05-16 21:54+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&ke" +"ywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-04-02 09:52+0200\n" "Last-Translator: F Wolff \n" "Language-Team: translate-discuss-af@lists.sourceforge.net\n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.3.1\n" +"X-Generator: Virtaal 0.7.0-beta4\n" +"X-Project-Style: gnome\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom is nie 'n karaktertoestel nie" -#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516 -#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137 -#: ../daemon/simple-slave-main.c:179 ../daemon/xdmcp-chooser-slave-main.c:179 -msgid "Enable debugging code" -msgstr "Aktiveer ontoutkode" - -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Vertoon-ID" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 -msgid "id" -msgstr "id" +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +msgid "ID" +msgstr "ID" -#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187 -#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:192 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "Slaaf van die GNOME-vertoonbestuurder" @@ -49,85 +45,86 @@ msgid "could not find user \"%s\" on system" msgstr "kon nie die gebruiker \"%s\" op die stelsel kry nie" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:220 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Kan nie die aanmeldstelsel inisialiseer nie" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:256 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 #, fuzzy msgid "Unable to authenticate user" msgstr "Kon nie gebruiker verifieer nie" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:310 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "" -#: ../daemon/gdm-factory-slave.c:281 ../daemon/gdm-simple-slave.c:432 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 #, fuzzy msgid "Unable to establish credentials" msgstr "Kan nie diens %s vestig nie: %s\n" -#: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1111 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 +msgid "Unable to open session" +msgstr "Kan nie sessie open nie" + +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" "Kon nie die X-bediener (die grafiese omgewing) begin nie a.g.v. 'n interne " "fout. Kontak asb. die stelseladministrateur of gaan die syslog na vir " "diagnose. Intussen sal hierdie vertoon gedeaktiveer word. Herbegin GDM " "wanneer die probleem reggestel is." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: kon nie koppel aan ouervertoon '%s' nie" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, fuzzy, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "%s: Bediener sou deur gebruiker-id %d geskep word, maar daardie gebruiker " "bestaan nie" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Kon nie groep-id instel na %d nie" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450 -#, fuzzy, c-format +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 +#, c-format msgid "initgroups () failed for %s" -msgstr "Inisiering van groepe() gefaal vir %s" +msgstr "initgroups () het misluk vir %s" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Kon nie gebruiker-id instel na %d nie" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464 -msgid "Couldn't set groupid to 0" -msgstr "Kon nie groep-id instel na 0 nie" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: Kon nie staaflêer vir vertoon %s open nie!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Fout met stel van %s na %s" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, fuzzy, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Bedienerprioriteit kon nie gestel word na %d nie: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Leë bedieneropdrag vir vertoon %s" @@ -156,303 +153,299 @@ msgid "The display device" msgstr "Die vertoontoestel" -#: ../daemon/gdm-session-worker.c:1293 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1294 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "" -#: ../daemon/gdm-session-worker.c:1295 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "" -#: ../daemon/gdm-session-worker.c:1296 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "" -#: ../daemon/gdm-session-worker.c:1297 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "onbekende fout" -#: ../daemon/gdm-session-worker.c:1304 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Gebruikernaam:" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1324 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1339 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1352 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1367 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" msgstr "" -#: ../daemon/gdm-session-worker.c:1648 ../daemon/gdm-session-worker.c:1666 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "geen gebruikerrekening beskikbaar nie" -#: ../daemon/gdm-session-worker.c:1693 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kan nie na die gebruiker wissel nie" -#: ../daemon/gdm-welcome-session.c:426 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Gebruiker %s bestaan nie" -#: ../daemon/gdm-welcome-session.c:433 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Groep %s bestaan nie" -#: ../daemon/gdm-xdmcp-display-factory.c:595 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Kon nie sok skep nie!" -#: ../daemon/gdm-xdmcp-display-factory.c:862 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "XDMCP-navraag vanaf gasheer %s geweier" -#: ../daemon/gdm-xdmcp-display-factory.c:1019 -#: ../daemon/gdm-xdmcp-display-factory.c:1240 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 #, fuzzy msgid "Could not extract authlist from packet" msgstr "Kon nie outeurslys onttrek uit pakket nie" -#: ../daemon/gdm-xdmcp-display-factory.c:1032 -#: ../daemon/gdm-xdmcp-display-factory.c:1255 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Fout in toetssom" -#: ../daemon/gdm-xdmcp-display-factory.c:1506 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Slegte adres" -#: ../daemon/gdm-xdmcp-display-factory.c:1587 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Kon nie vertoonadres lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:1595 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Kon nie vertoonpoortnommer lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:1604 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, fuzzy, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Kon nie outeurslys onttrek uit pakket nie" -#: ../daemon/gdm-xdmcp-display-factory.c:1624 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: Fout in toetssom" -#: ../daemon/gdm-xdmcp-display-factory.c:2133 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: Het VERSOEK ontvang van verbande gasheer %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2143 -#: ../daemon/gdm-xdmcp-display-factory.c:2498 -#: ../daemon/gdm-xdmcp-display-factory.c:2750 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Kon nie beeldnommer lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2150 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Kon nie konneksietipe lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2157 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: Kon die kliëntadres lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Kon nie verifiërings-name lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2174 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Kon nie verifiërings-data lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2184 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Kon nie magtigingslys lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2203 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Kon nie vervaardiger-ID lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2230 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: Gefaalde toetssom van %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2482 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: Het bestuursopdrag van verbande gasheer %s ontvang" -#: ../daemon/gdm-xdmcp-display-factory.c:2491 -#: ../daemon/gdm-xdmcp-display-factory.c:2757 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Kon nie sessie-ID lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Kon nie beeldklas lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2610 -#: ../daemon/gdm-xdmcp-display-factory.c:2660 -#: ../daemon/gdm-xdmcp-display-factory.c:2666 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Kon nie adres lees nie" -#: ../daemon/gdm-xdmcp-display-factory.c:2740 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: Het KEEPALIVE van verbande gasheer %s ontvang" -#: ../daemon/gdm-xdmcp-display-factory.c:2829 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 #, fuzzy msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "%s: Kon nie XDMCP-kopteks lees nie!" -#: ../daemon/gdm-xdmcp-display-factory.c:2835 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: Verkeerde XDMCP-weergawe!" -#: ../daemon/gdm-xdmcp-display-factory.c:2841 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: Kan nie adres ontleed nie" -#: ../daemon/gdm-xdmcp-display-factory.c:3286 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Kon nie bediener se gasheernaamvind nie: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 -#, fuzzy, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" -msgstr "" -"Kan nie PID-lêer %s skryf nie, moontlik gebrek aan disketspasie. Fout: %s" +#, c-format +msgid "Cannot write PID file %s: possibly out of disk space: %s" +msgstr "Kan nie PID-lêer %s skryf nie: moontlik is skyfspasie op: %s" -#: ../daemon/main.c:270 +#: ../daemon/main.c:271 #, fuzzy, c-format msgid "Logdir %s does not exist or isn't a directory." msgstr "" "%s: Aanmeldgids %s bestaan nie, of is nie 'n gids nie. Gebruik ServAuthDir %" "s." -#: ../daemon/main.c:283 -#, fuzzy, c-format +#: ../daemon/main.c:287 +#, c-format msgid "Authdir %s does not exist. Aborting." -msgstr "%s: Magtigingsgids %s bestaan nie. Staak." +msgstr "Magtigingsgids %s bestaan nie. Staak." -#: ../daemon/main.c:287 -#, fuzzy, c-format +#: ../daemon/main.c:291 +#, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "%s: Magtingsgids %s is nie 'n gids nie. Staak." +msgstr "Magtingsgids %s is nie 'n gids nie. Staak." -#: ../daemon/main.c:361 -#, fuzzy, c-format +#: ../daemon/main.c:365 +#, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "" -"%s: Bemagtigingsgids %s word nie deur gebruiker %s, groep %s besit nie. " -"Staak." +"Bemagtigingsgids %s word nie deur gebruiker %d, groep %d besit nie. Staak." -#: ../daemon/main.c:368 -#, fuzzy, c-format +#: ../daemon/main.c:372 +#, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "" -"%s: Magtingsgids %s het verkeerde toestemmings %o. Behoort %o te wees. Staak." +"Magtingsgids %s het verkeerde toestemming %o. Behoort %o te wees. Staak." -#: ../daemon/main.c:405 -#, fuzzy, c-format +#: ../daemon/main.c:409 +#, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "%s: Kan nie gdm-gebruiker vind nie (%s). Staak!" +msgstr "Kan nie GDM-gebruiker '%s' vind nie. Staak!" -#: ../daemon/main.c:411 -#, fuzzy +#: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "%s: Die gdm-gebruiker moet nie die stam wees nie. Staak!" +msgstr "Die GDM-gebruiker moet nie root wees nie. Staak!" -#: ../daemon/main.c:417 -#, fuzzy, c-format +#: ../daemon/main.c:421 +#, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "%s: Kan nie die gdm-groep (%s) vind nie. Staak!" +msgstr "Kan nie die GDM-groep '%s' vind nie. Staak!" -#: ../daemon/main.c:423 -#, fuzzy +#: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" -msgstr "%s: Die gdm-groep moet nie die stam wees nie. Staak!" +msgstr "Die GDM-groep moet nie root wees nie. Staak!" -#: ../daemon/main.c:517 +#: ../daemon/main.c:533 msgid "Make all warnings fatal" msgstr "" -#: ../daemon/main.c:518 -msgid "Exit after a time - for debugging" +#: ../daemon/main.c:534 +msgid "Exit after a time (for debugging)" msgstr "" -#: ../daemon/main.c:519 +#: ../daemon/main.c:535 msgid "Print GDM version" msgstr "Druk GDM-weergawe" -#: ../daemon/main.c:534 +#: ../daemon/main.c:550 msgid "GNOME Display Manager" msgstr "GNOME-vertoonbestuurder" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:595 -#, fuzzy -msgid "Only root wants to run GDM" -msgstr "Slegs root behoort GDM uit te voer\n" - -#: ../daemon/session-worker-main.c:149 -#, fuzzy +#: ../daemon/main.c:616 +msgid "Only the root user can run GDM" +msgstr "Slegs root behoort GDM uit te voer" + +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" -msgstr "GDM (Die GNOME Display Manager) loop nie." +msgstr "" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" msgstr "" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1767 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Aanmeldvenster" @@ -462,6 +455,10 @@ #: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 msgid "Power management daemon" +msgstr "Agtergrondprogram vir kragbestuur" + +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" msgstr "" #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 @@ -477,11 +474,11 @@ msgstr "Vergroot dele van die skerm" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "GNOME-sleutelbord op die skerm" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" msgstr "Gebruik 'n sleutelbord op die skerm" #: ../data/greeter-autostart/metacity.desktop.in.h:1 @@ -496,206 +493,203 @@ msgid "Present on-screen information as speech or braille" msgstr "Bied inligting op die skerm aan as spraak of braille" -#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.h:1 +#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 #, fuzzy msgid "PolicyKit Authentication Agent" msgstr "Verifiëring het gefaal" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Kies stelsel" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 #, fuzzy msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XMCP: Kon nie XDMCP-buffer skep nie!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Kon nie XDMCP-kopteks lees nie!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:253 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Waarde" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:254 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "persentasie van voltooide tyd" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1325 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Onaktiewe teks" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1326 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Die teks om te gebruik in die etiket as die gebruiker nog nie 'n item gekies " "het nie" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1334 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktiewe teks" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1335 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Die teks om te gebruik in die etiket as die gebruik 'n item gekies het" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1344 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1345 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 #, fuzzy -msgid "Whether or not the chooser list is visible" +msgid "Whether the chooser list is visible" msgstr "Of die tydmeter tans afloop of nie" -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M:%S %p" -msgstr "%k:%M:%S" - -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M %p" -msgstr "%k:%M%p" - -#. translators: replace %e with %d if, when the day of the -#. * month as a decimal number is a single digit, it -#. * should begin with a 0 in your locale (e.g. "May -#. * 01" instead of "May 1"). +#. translators: This is the time format to use when both +#. * the date and time with seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:72 -msgid "%a %b %e" -msgstr "%a %e %b" - -#. translators: reverse the order of these arguments -#. * if the time should come before the -#. * date on a clock in your locale. +#: ../gui/simple-greeter/gdm-clock-widget.c:70 +msgid "%a %b %e, %l:%M:%S %p" +msgstr "%a %e %b %k:%M:%S" + +#. translators: This is the time format to use when both +#. * the date and time without seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:77 -#, c-format -msgid "%1$s, %2$s" -msgstr "%1$s, %2$s" +#: ../gui/simple-greeter/gdm-clock-widget.c:76 +msgid "%a %b %e, %l:%M %p" +msgstr "%a %e %b %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:291 -msgid "Automatically logging in..." -msgstr "Meld outomatiese aan..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time with seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:83 +msgid "%a %l:%M:%S %p" +msgstr "%a %k:%M:%S" -#. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:758 -msgid "Cancelling..." -msgstr "Kanselleer tans..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time without seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:92 +msgid "%a %l:%M %p" +msgstr "%a %k:%M" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" +msgstr "Meld outomatiese aan…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1185 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Kies 'n taal en klik Meld aan" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 -#, fuzzy -msgid "Authentication Dialog" -msgstr "Verifiëring het gefaal" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" +msgstr "Kanselleer tans…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Doelgemaak" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Doelgemaakte sessie" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Kanselleer" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Rekenaarnaam" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +msgid "Login" msgstr "Meld aan" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Ontsluit" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +msgid "Version" +msgstr "Weergawe" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +msgid "Suspend" +msgstr "Sluimer" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Herbegin" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Skakel af" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 -#, fuzzy -msgid "Suspend" -msgstr "_Tydelik stop" - -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 -msgid "Version" -msgstr "Weergawe" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Onbekende tyd oor" -#: ../gui/simple-greeter/gdm-greeter-panel.c:583 +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 msgid "Panel" msgstr "Paneel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Tale" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "Ta_le:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:273 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" -msgstr "_Taal:" +msgstr "Taa_l:" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" -msgid "Other..." -msgstr "Ander..." +msgid "Other…" +msgstr "Ander…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." -msgstr "Kies 'n taal vanaf die volledige lys vanuit beskikbare tale." +msgstr "Kies 'n taal vanuit die volledige lys beskikbare tale." -#: ../gui/simple-greeter/gdm-languages.c:609 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "Tale" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nie gespesifiseer nie" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Sleutelborduitlegte" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "_Sleutelbord:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "Ander..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Kies 'n sleutelborduitleg vanuit die volledige lys van beskikbare uitlegte." - -#: ../gui/simple-greeter/gdm-option-widget.c:521 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Teks vir etiket" -#: ../gui/simple-greeter/gdm-option-widget.c:522 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "Die teks om as 'n etiket te gebruik" -#: ../gui/simple-greeter/gdm-option-widget.c:529 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Ikoonnaam" -#: ../gui/simple-greeter/gdm-option-widget.c:530 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Die ikoon om saam met die etiket te gebruik" -#: ../gui/simple-greeter/gdm-option-widget.c:538 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "Verstekitem" -#: ../gui/simple-greeter/gdm-option-widget.c:539 -msgid "The id of the default item" +#: ../gui/simple-greeter/gdm-option-widget.c:523 +msgid "The ID of the default item" msgstr "Die ID van die verstekitem" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 @@ -708,8 +702,8 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "Afgeleë aanmelding (koppel tans aan %s...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "Afgeleë aanmelding (koppel tans aan %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -721,8 +715,8 @@ msgstr "Afgeleë aanmelding" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Sessies:" +msgid "Session" +msgstr "Sessie" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -742,148 +736,130 @@ msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 -#, fuzzy msgid "Enable accessibility keyboard plugin" -msgstr "Aktiveer _toeganklikheidsmodules" +msgstr "Aktiveer inprop vir toeganklikheidsleutelbord" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 -msgid "Enable debugging" -msgstr "" +msgid "Enable on-screen keyboard" +msgstr "Aktiveer slutelbord op die skerm" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 -msgid "Enable debugging mode for the greeter." -msgstr "" +msgid "Enable screen magnifier" +msgstr "Aktiveer vergrootglas" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 -msgid "Enable on-screen keyboard" -msgstr "" +msgid "Enable screen reader" +msgstr "Aktiveer skermleser" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 -msgid "Enable screen magnifier" +msgid "Enable showing the banner message" msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 -msgid "Enable screen reader" +msgid "Icon name to use for greeter logo" msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Enable showing the banner message" -msgstr "" +msgid "Recently selected languages" +msgstr "Onlangs gekose tale" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 -msgid "Icon name to use for greeter logo" +msgid "Set to a list of languages to be shown by default in the login window." msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Recently selected keyboard layouts" +msgid "Set to the themed icon name to use for the greeter logo." msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#, fuzzy -msgid "Recently selected languages" -msgstr "Kies 'n taal" +msgid "Set to true to disable showing known users in the login window." +msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." +msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr "" +#, fuzzy +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "Gebruik 'n sleutelbord op die skerm" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 -msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -msgid "Set to true to disable showing known users in the login window." -msgstr "" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 -msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "Set to true to enable the background settings manager plugin." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 #, fuzzy msgid "Set to true to enable the on-screen keyboard." msgstr "Gebruik 'n sleutelbord op die skerm" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +msgid "Set to true to use Compiz as the window manager." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 -msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +msgid "Text banner message to show in the login window." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:37 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:38 -msgid "Use compiz as the window manager" -msgstr "" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" +msgstr "Gebruik Compiz as vensterbestuurder" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -906,228 +882,223 @@ msgstr "Loop dit?" #: ../gui/simple-greeter/gdm-timer.c:166 -msgid "Whether or not the timer is currently ticking" -msgstr "Of die tydmeter tans afloop of nie" - -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "Bestuurder" +msgid "Whether the timer is currently ticking" +msgstr "Of die tydmeter tans afloop" -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "Meld aan as %s" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:164 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" -msgid "Other..." -msgstr "Ander..." +msgid "Other…" +msgstr "Ander…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:165 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Kies 'n ander rekening" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:177 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gas" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:178 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" msgstr "Meld aan as 'n tydelike gas" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:191 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Outomatiese aanmelding" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192 -msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" msgstr "Meld outomaties aan by die stelsel nadat opsies gekies is" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:383 -#, c-format -msgid "Log in as %s" -msgstr "Meld aan as %s" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:737 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Tans aangemeld" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Die Gebruikerwisselaar is Vry Sagteware; u kan dit herversprei en/of wysig " -"onderhewig aan die voorwaardes van die GNU Algemene Publieke Lisensie soos " -"gepubliseer deur die Stigting vir Vry Sagteware; óf weergawe 2 van die " -"Lisensie, óf (indien u verkies) enige latere weergawe." +#: ../utils/gdmflexiserver.c:61 +msgid "Only the VERSION command is supported" +msgstr "" -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar " -"SONDER ENIGE WAARBORG; sonder selfs die geïmpliseerde waarborg van " -"VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU " -"Algemene Publieke Lisensie vir meer detail." +#: ../utils/gdmflexiserver.c:61 +msgid "COMMAND" +msgstr "OPDRAG" -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"U moes 'n kopie van die GNU Algemene Publieke Lisensie ontvang het saam met " -"hierdie program; indien nie, skryf aan Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +msgid "Ignored — retained for compatibility" +msgstr "Geïgnoreer — behou vir versoenbaarheid" -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "'n Kieslys om vinnig tussen gebruikers te wissel." +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +msgid "Debugging output" +msgstr "Afvoer vir ontfouting" -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Friedel Wolff" +#: ../utils/gdmflexiserver.c:68 +msgid "Version of this application" +msgstr "Weergawe van hierdie toepassing" -#: ../gui/user-switch-applet/applet.c:647 -#: ../gui/user-switch-applet/applet.c:784 -#: ../gui/user-switch-applet/applet.c:823 +#: ../utils/gdmflexiserver.c:675 #, c-format -msgid "Can't lock screen: %s" -msgstr "Kan nie skerm sluit nie: %s" +msgid "Could not identify the current session." +msgstr "Kon nie die huidige sessie identifiseer nie." -#: ../gui/user-switch-applet/applet.c:669 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" +#. Option parsing +#: ../utils/gdmflexiserver.c:711 +msgid "- New GDM login" +msgstr "- Nuwe GDM-aanmelding" -#: ../gui/user-switch-applet/applet.c:882 -#, c-format -msgid "Can't logout: %s" -msgstr "Kan nie afmeld nie: %s" +#: ../utils/gdmflexiserver.c:767 +msgid "Unable to start new display" +msgstr "Kan nie nuwe vertoon begin nie" -#: ../gui/user-switch-applet/applet.c:966 -msgid "Available" -msgstr "Beskikbaar" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "Skermskoot geneem" -#: ../gui/user-switch-applet/applet.c:967 -msgid "Invisible" -msgstr "Onsigbaar" +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "Neem 'n skermskoot" -#: ../gui/user-switch-applet/applet.c:968 -msgid "Busy" -msgstr "Besig" +#~ msgid "Enable debugging code" +#~ msgstr "Aktiveer ontoutkode" -#: ../gui/user-switch-applet/applet.c:969 -msgid "Away" -msgstr "Weg" +#~ msgid "id" +#~ msgstr "id" -#: ../gui/user-switch-applet/applet.c:1129 -msgid "Account Information..." -msgstr "Rekeninginligting..." +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "Kon nie groep-id instel na 0 nie" -#: ../gui/user-switch-applet/applet.c:1141 -msgid "System Preferences..." -msgstr "Stelselvoorkeure..." +#~ msgid "%a %b %e" +#~ msgstr "%a %e %b" -#: ../gui/user-switch-applet/applet.c:1157 -msgid "Lock Screen" -msgstr "Sluit skerm" +#~ msgid "%1$s, %2$s" +#~ msgstr "%1$s, %2$s" -#: ../gui/user-switch-applet/applet.c:1168 -msgid "Switch User" -msgstr "Wissel gebruiker" +#, fuzzy +#~ msgid "Authentication Dialog" +#~ msgstr "Verifiëring het gefaal" -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1179 -msgid "Quit..." -msgstr "Sluit af..." +#~ msgid "Keyboard layouts" +#~ msgstr "Sleutelborduitlegte" -#: ../gui/user-switch-applet/applet.c:1294 -msgid "Unknown" -msgstr "Onbekend" +#~ msgid "_Keyboard:" +#~ msgstr "_Sleutelbord:" -#: ../gui/user-switch-applet/applet.c:1412 -msgid "User Switch Applet" -msgstr "Gebruikerwisselaar" +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Ander..." -#: ../gui/user-switch-applet/applet.c:1421 -msgid "Change account settings and status" -msgstr "Verander rekeningopstelling en status" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Kies 'n sleutelborduitleg vanuit die volledige lys van beskikbare " +#~ "uitlegte." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "'n Kieslys om vinnig tussen gebruikers te wissel" +#~ msgid "Manager" +#~ msgstr "Bestuurder" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Gebruikerwisselaar" +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Die Gebruikerwisselaar is Vry Sagteware; u kan dit herversprei en/of " +#~ "wysig onderhewig aan die voorwaardes van die GNU Algemene Publieke " +#~ "Lisensie soos gepubliseer deur die Stigting vir Vry Sagteware; óf " +#~ "weergawe 2 van die Lisensie, óf (indien u verkies) enige latere weergawe." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar " +#~ "SONDER ENIGE WAARBORG; sonder selfs die geïmpliseerde waarborg van " +#~ "VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU " +#~ "Algemene Publieke Lisensie vir meer detail." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Wysig persoonlike _inligting" +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "U moes 'n kopie van die GNU Algemene Publieke Lisensie ontvang het saam " +#~ "met hierdie program; indien nie, skryf aan Free Software Foundation, " +#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Aangaande" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "'n Kieslys om vinnig tussen gebruikers te wissel." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "R_edigeer gebruikers en groepe" +#~ msgid "translator-credits" +#~ msgstr "Friedel Wolff" -#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62 -#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65 -#: ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "Geïgnoreer - behou vir versoenbaarheid" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Kan nie skerm sluit nie: %s" -#: ../utils/gdmflexiserver.c:61 -msgid "COMMAND" -msgstr "OPDRAG" +#~ msgid "Can't logout: %s" +#~ msgstr "Kan nie afmeld nie: %s" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -msgid "Debugging output" -msgstr "Afvoer vir ontfouting" +#~ msgid "Available" +#~ msgstr "Beskikbaar" -#: ../utils/gdmflexiserver.c:68 -msgid "Version of this application" -msgstr "Weergawe van hierdie toepassing" +#~ msgid "Invisible" +#~ msgstr "Onsigbaar" -#: ../utils/gdmflexiserver.c:675 -#, c-format -msgid "Could not identify the current session." -msgstr "Kon nie die huidige sessie identifiseer nie." +#~ msgid "Busy" +#~ msgstr "Besig" -#. Option parsing -#: ../utils/gdmflexiserver.c:711 -msgid "- New GDM login" -msgstr "- Nuwe GDM-aanmelding" +#~ msgid "Away" +#~ msgstr "Weg" -#: ../utils/gdmflexiserver.c:767 -msgid "Unable to start new display" -msgstr "Kan nie nuwe vertoon begin nie" +#~ msgid "Account Information..." +#~ msgstr "Rekeninginligting..." -#: ../utils/gdm-screenshot.c:219 -msgid "Screenshot taken" -msgstr "" +#~ msgid "System Preferences..." +#~ msgstr "Stelselvoorkeure..." -#. Option parsing -#: ../utils/gdm-screenshot.c:284 -msgid "Take a picture of the screen" -msgstr "Neem 'n skermskoot" +#~ msgid "Lock Screen" +#~ msgstr "Sluit skerm" + +#~ msgid "Switch User" +#~ msgstr "Wissel gebruiker" + +#~ msgid "Quit..." +#~ msgstr "Sluit af..." + +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgid "User Switch Applet" +#~ msgstr "Gebruikerwisselaar" + +#~ msgid "Change account settings and status" +#~ msgstr "Verander rekeningopstelling en status" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "'n Kieslys om vinnig tussen gebruikers te wissel" + +#~ msgid "User Switcher" +#~ msgstr "Gebruikerwisselaar" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Wysig persoonlike _inligting" + +#~ msgid "_About" +#~ msgstr "_Aangaande" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "R_edigeer gebruikers en groepe" #~ msgid "worker exited with status %d" #~ msgstr "werker het afgesluit met status %d" @@ -2844,9 +2815,6 @@ #~ "Jy het %s gekies vir hierdie sessie, maar die verstekstelling is %s.\n" #~ "Wil jy %s die verstek maak vir toekomstige sessies?" -#~ msgid "Just For _This Session" -#~ msgstr "Slegs Vir _Hierdie Sessie" - #~ msgid "" #~ "You have chosen %s for this session.\n" #~ "If you wish to make %s the default for future sessions,\n" @@ -3514,9 +3482,6 @@ #~ msgid "Run _XDMCP chooser" #~ msgstr "Laat _XDMCP-kieser loop" -#~ msgid "_Configure the login manager" -#~ msgstr "_Konfigureer die aanmeldbestuurder" - #~ msgid "(c) 2002 Bond, James Bond" #~ msgstr "(c) 2002 Bond, James Bond" diff -Nru gdm-2.32.1/po/ar.po gdm-3.0.0/po/ar.po --- gdm-2.32.1/po/ar.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ar.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,19 +1,18 @@ -# translation of gdm.HEAD.po to Arabic +# translation of gdm.po to Arabic # Copyright (C) 2002,2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. -# Arafat Medini , 2002,2004. +# Arafat Medini , 2002, 2004. # Isam Bayazidi , 2002. # Nuriddin Aminagha , 2002. -# , 2004. # Abdulaziz Al-Arfaj , 2004. # Djihed Afifi , 2006, 2007. -# Khaled Hosny , 2006, 2007, 2008, 2009, 2010. +# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2011. # Usama Akkad , 2008. msgid "" msgstr "" -"Project-Id-Version: gdm.HEAD\n" +"Project-Id-Version: gdm master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-19 20:50+0200\n" -"PO-Revision-Date: 2010-08-19 20:50+0300\n" +"POT-Creation-Date: 2011-03-19 03:03+0200\n" +"PO-Revision-Date: 2011-03-19 03:03+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" @@ -49,28 +48,28 @@ msgid "could not find user \"%s\" on system" msgstr "تعذّر إيجاد المستخدم \"%s\" على هذا النّظام" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "تعذّر بدأ نظام الولوج" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "تعذّر التحقق من المستخدم" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "تعذّر الترخيص للمستخدم" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "تعذّر تنصيب الاعتمادات" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "تعذّر فتح الجلسة" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -92,17 +91,17 @@ msgstr "كان الخادوم سيُوّلد من قبل المستخدم %s لكن ذلك المستخدم غير موجود" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "تعذّر ضبط معرّف المجموعة لـ %Id" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "فشل initgroups () لِـ %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "تعذّر ضبط معرّف المستخدم لِـ %Id" @@ -152,71 +151,71 @@ msgid "The display device" msgstr "جهاز العرض" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "خطأ أثناء بدء الحوار مع نظام التوثيق: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "خطأ أثناء بدء الحوار مع نظام التوثيق - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "فشل عام" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "نفذت الذّاكرة" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "خطأ مُبرمج التّطبيق" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "خطأ مجهول" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "اسم المستخدم:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "خطأ في إخبار نظام التوثيق عن مُحِث اسم المستخدم المفضل: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "خطأ في إخبار نظام التوثيق عن اسم مستضيف المستخدم: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "خطأ في إخبار نظام التوثيق عن معراض المستخدم: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "خطأ في إعلام نظام الاستيثاق بمقطع العرض: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "خطأ في إعلام نظام الاستيثاق باعتمادات xauth للعرض: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "لا يُوجد حساب مستخدِم " -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "تعذّر الانتقال للمستخدم" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "المستخدم %s غير موجود" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "المجموعة %s غير موجودة" @@ -438,7 +437,7 @@ msgstr "غلاف تسجيل AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "نافذة الولوج" @@ -450,6 +449,10 @@ msgid "Power management daemon" msgstr "عفريت إدارة الطاقة" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "فاحص تسريع جلسة جنوم" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "عفريت إعدادات جنوم" @@ -486,7 +489,7 @@ msgid "PolicyKit Authentication Agent" msgstr "عميل استيثاق PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "اختر نظاما" @@ -498,35 +501,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "تعذّر قراءة ترويسة XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "القيمة" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "نسبة اكتمال الوقت" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "النص الخامل" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "النص الذي سيستخدم في اللصيقة إذا ما لم يختر المستخدم عنصرا بعد" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "النص النشط" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "النص الذي سيستخدم في اللصيقة إذا ما اختار المستخدم عنصرا " -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "القائمة ظاهرة" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "ما إذا كانت قائمة المخير ظاهرة" @@ -558,65 +561,69 @@ msgid "%a %l:%M %p" msgstr "%A %Ol:%OM %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "يلج تلقائيا…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "اختر اللغة ثم انقر \"لُج\"" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "يلغي…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "مخصصة" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "جلسة مخصّصة" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "ألغِ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "اسم الحاسوب" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "لُج" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "فك القفل" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "الإصدار" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "اللوحة" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "خيارات الإطفاء…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "علّق" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "أعِد التشغيل" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "أطفئ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "مخصصة" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "لا يُعرف كم بقي" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "جلسة مخصّصة" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "اللوحة" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "اللغات" @@ -644,35 +651,10 @@ msgid "Language" msgstr "اللّغة" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "غير محدد" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "تخطيط لوحة المفاتيح" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "لو_حة المفاتيح:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "أخرى…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "اختر تخطيط لوحة مفاتيح من قائمة التخطيطات المتوفرة." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "لوحة المفاتيح" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "نص اللصيقة" @@ -764,123 +746,106 @@ msgstr "اسم الأيقونة التي ستستخدم لشعار المُرحّب" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "أنساق لوحة المفاتيح المنتقاة مؤخرا" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "اللغات المنتقاة مؤخرا" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#, fuzzy -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "عيّن لقائمة من أنساق لوحة المفاتيح لتعرض افتراضيا عند نافذة الولوج." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." -msgstr "عيّن لقائمة من اللغات لتعرض افتراضيا عند نافذة الولوج." +msgstr "عيّن لقائمة من اللغات لتعرض افتراضيا في نافذة الولوج." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "اضبطه إلى اسم أيقونة السمة التي ستستخدم لشعار المُرحّب." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "اجعله صحيح لتعطيل عرض المستخدمين المعروفين في نافذة الولوج." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "اجعله صحيح لتعطيل عرض أزرار إعادة التشغيل في نافذة الولوج." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." -msgstr "اجعله صحيح لتفعيل ملحق مدير إعدادات xrandr." +msgstr "اجعله صحيح لتفعيل ملحق مدير إعدادات XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "اجعله صحيح حتى يُمَكِّن ملحق مدير إعدادات الخلفية." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "اجعله صحيح لتفعيل ملحق مدير إعداد مفاتيح الوسائط." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "اجعله صحيح حتى يُمَكِّن لوحة المفاتيح الموجودة على الشاشة." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "اجعله صحيح حتى يُفَعل الملحق إدارة تهيئة لوحة مفاتيح الإتاحة." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "اجعله صحيح حتى يُفَعل مكبر الشاشة." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "اجعله صحيح حتى يُفَعل قارئ الشاشة." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "اجعله صحيح لتفعيل ملحق مدير إعداد الأصوات." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "اجعله صحيح حتى يُفَعل ملحق مدير إعدادات xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "اجعله صحيح ليعرض نص رسالة الملصق." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." -msgstr "اجعله صحيح ليستخدم كومبيز كمدير نوافذ" +msgstr "اجعله صحيح ليستخدم كُمْبِز كمدير نوافذ" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -"ملصق الرسائل النصي المعروض في نافذة الولوج عندما يكون المخير خاليا، بدلا من " +"ملصق الرسائل النصي المعروض في نافذة الولوج عندما يكون المخيِّر خاليا، بدلا من " "banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "ملصق الرسائل النصي المعروض في نافذة الولوج." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." -msgstr "صحيح إذا كان ملحق مدير إعدادات xrandr مفعل." +msgstr "صحيح إذا كان ملحق مدير إعدادات XRandR مفعل." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "صحيح إذا كان ملحق مدير التهيئة في الخلفية مُفَعلا." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "صحيح إذا كان ملحق مدير إعدادات مفاتيح الوسائط مفعل." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "صحيح إذا كان ملحق مدير إعدادات الصوت مفعل." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "صحيح إذا كان ملحق مدير تهيئة xsettings مُفَعلا." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" -msgstr "استخدم كُمْبِز كمدير نوافذ" +msgstr "استخدم كُمْبِز مديرا للنوافذ" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -906,8 +871,8 @@ msgid "Whether the timer is currently ticking" msgstr "ما إذا كان المُؤقِّت يعمل أم لا" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "لُج باسم %s" @@ -917,170 +882,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "أخرى…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "اختر حسابا مختلفا" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "ضيف" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "لُج كضيف مؤقت" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "ولوج تلقائي" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "لُج تلقائيا إلى النظام بعد اختيار الخيارات" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "والِج حاليا" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"بريمج مبدّل المستخدم السريع برمجية حرة؛ بامكانك إعادة توزيعه و/أو تعديله تحت " -"شروط الرخصة العمومية العامة لجنو والتي نشرتها منظمة البرمجيات الحرة؛ سواء " -"الإصدارة 2 من الرخصة أو أي إصدارة بعدها (حسب رغبتك)." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"يوزّع البرنامج على أمل أن يكون مفيدًا لمن يستخدمه دون أدنى مسؤولية؛ ولا حتى أي " -"ضمان يضمن صلاحية العرض في السوق أو توافقه مع أي استخدام محدد. يمكنك مراجعة " -"الرخصة العمومية العامة لجنو لمزيد من التفاصيل." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"من المفترض أن تكون قد استلمت نسخة من رخصة جنو العامة مع هذا البرنامج؛ في حال " -"عدم استلامك لذلك، يمكنك مكاتبة:\n" -"Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-" -"1301 USA" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "قائمة للتبديل السريع بين المستخدين" - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"فريق عربآيز للترجمة http://www.arabeyes.org :\n" -"جهاد عفيفي\t\n" -"خالد حسني\t" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "تعذّر إقفال الشاشة: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "تعذّر الضبط المؤقت لحافظة الشاشة إلى فراغ: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "تعذّر الخروج: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "متاح" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "خفي" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "مشغول" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "بعيد" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "معلومات الحساب" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "تفضيلات النظام" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "أوصِد الشاشة" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "بدّل المستخدم" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "اخرج…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "مجهول" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "بريمج مبدّل المستخدم " - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "غيّر إعدادات وحالة الحساب" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "قائمة للتبديل السريع بين المستخدمين" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "مبدّل المستخدم" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "معمل بريمج مبدّل المستخدم" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "حرِّر ال_معلومات الشخصية" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_عنْ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_حرِّر المستخدمين والمجموعات" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "لا يدعم إلا أمر VERSION" @@ -1116,105 +946,138 @@ msgid "Unable to start new display" msgstr "تعذّر بدأ تشغيل العرض الجديد" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "أُخِذت لقطة الشاشة" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "خذ صورة للشاشة" -#~ msgid "Couldn't set groupid to 0" -#~ msgstr "تعذّر ضبط معرّف المجموعة لِـ0 " +#~ msgid "Shutdown Options…" +#~ msgstr "خيارات الإطفاء…" + +#~ msgid "Keyboard layouts" +#~ msgstr "تخطيط لوحة المفاتيح" + +#~ msgid "_Keyboard:" +#~ msgstr "لو_حة المفاتيح:" -#~ msgid "%x" -#~ msgstr "%e %B، %Y" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "أخرى…" -#~ msgid "Manager" -#~ msgstr "المدير" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "اختر تخطيط لوحة مفاتيح من قائمة التخطيطات المتوفرة." -#~ msgid "The user manager object this user is controlled by." -#~ msgstr "مدير المستخدم يشير إلى أن هذا المستخدم مُتحكم به." +#~ msgid "Keyboard" +#~ msgstr "لوحة المفاتيح" -#~ msgid "Quit..." -#~ msgstr "أغلق..." +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "أنساق لوحة المفاتيح المنتقاة مؤخرا" -#~ msgid "Enable debugging code" -#~ msgstr "فعّل التنقيح" +#, fuzzy +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "عيّن لقائمة من أنساق لوحة المفاتيح لتعرض افتراضيا عند نافذة الولوج." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "بريمج مبدّل المستخدم السريع برمجية حرة؛ بامكانك إعادة توزيعه و/أو تعديله " +#~ "تحت شروط الرخصة العمومية العامة لجنو والتي نشرتها منظمة البرمجيات الحرة؛ " +#~ "سواء الإصدارة 2 من الرخصة أو أي إصدارة بعدها (حسب رغبتك)." -#~ msgid "id" -#~ msgstr "المعرّف" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "يوزّع البرنامج على أمل أن يكون مفيدًا لمن يستخدمه دون أدنى مسؤولية؛ ولا حتى " +#~ "أي ضمان يضمن صلاحية العرض في السوق أو توافقه مع أي استخدام محدد. يمكنك " +#~ "مراجعة الرخصة العمومية العامة لجنو لمزيد من التفاصيل." -#~ msgid "%a %b %e" -#~ msgstr "%a %b %Oe" +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "من المفترض أن تكون قد استلمت نسخة من رخصة جنو العامة مع هذا البرنامج؛ في " +#~ "حال عدم استلامك لذلك، يمكنك مكاتبة:\n" +#~ "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA " +#~ "02110-1301 USA" -#~ msgid "%1$s, %2$s" -#~ msgstr "%1$s، %2$s" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "قائمة للتبديل السريع بين المستخدين" -#~ msgid "Authentication Dialog" -#~ msgstr "حوار الاستيثاق" +#~ msgid "translator-credits" +#~ msgstr "" +#~ "فريق عربآيز للترجمة http://www.arabeyes.org :\n" +#~ "جهاد عفيفي\t\n" +#~ "خالد حسني\t" -#~ msgid "Enable debugging" -#~ msgstr "فعّل التنقيح" +#~ msgid "Can't lock screen: %s" +#~ msgstr "تعذّر إقفال الشاشة: %s" -#~ msgid "Enable debugging mode for the greeter." -#~ msgstr "فعّل طور التنقيح للمُرحّب" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "تعذّر الضبط المؤقت لحافظة الشاشة إلى فراغ: %s" -#~ msgid "worker exited with status %d" -#~ msgstr "غادر العامل بالحالة %Id" +#~ msgid "Can't log out: %s" +#~ msgstr "تعذّر الخروج: %s" -#~ msgid "Unable establish credentials" -#~ msgstr "تعذّر تنصيب الاعتمادات " +#~ msgid "Available" +#~ msgstr "متاح" -#~ msgid "Failed to restart computer" -#~ msgstr "فشل إعادة تشغيل الحاسوب" +#~ msgid "Invisible" +#~ msgstr "خفي" -#~ msgid "" -#~ "You are not allowed to restart the computer because multiple users are " -#~ "logged in" -#~ msgstr "ليس مسموحا لك بإعادة تشغيل الحاسوب لولوج عدد من المستخدمين" +#~ msgid "Busy" +#~ msgstr "مشغول" -#~ msgid "Failed to stop computer" -#~ msgstr "فشل إيقاف الحاسوب" +#~ msgid "Away" +#~ msgstr "بعيد" -#~ msgid "" -#~ "You are not allowed to stop the computer because multiple users are " -#~ "logged in" -#~ msgstr "ليس مسموحا لك بإيقاف الحاسوب لولوج عدد من المستخدمين" +#~ msgid "Account Information" +#~ msgstr "معلومات الحساب" -#~ msgid "page 5" -#~ msgstr "صفحة 5" +#~ msgid "System Preferences" +#~ msgstr "تفضيلات النظام" -#~ msgid "You have the Caps Lock key on." -#~ msgstr "مفتاح الحروف الكبيرة مفعل." +#~ msgid "Lock Screen" +#~ msgstr "أوصِد الشاشة" -#~ msgid "User" -#~ msgstr "المستخدم" +#~ msgid "Switch User" +#~ msgstr "بدّل المستخدم" -#~ msgid "The user this menu item represents." -#~ msgstr "المستخدم الذي يمثله عنصر القائمة هذا." +#~ msgid "Quit…" +#~ msgstr "اخرج…" -#~ msgid "Icon Size" -#~ msgstr "حجم الأيقونة" +#~ msgid "User Switch Applet" +#~ msgstr "بريمج مبدّل المستخدم " -#~ msgid "The size of the icon to use." -#~ msgstr "حجم الأيقونة الذي سيُستعمل." +#~ msgid "Change account settings and status" +#~ msgstr "غيّر إعدادات وحالة الحساب" -#~ msgid "Indicator Size" -#~ msgstr "حجم المؤشر" +#~ msgid "A menu to quickly switch between users" +#~ msgstr "قائمة للتبديل السريع بين المستخدمين" -#~ msgid "Size of check indicator" -#~ msgstr "حجم مؤشر التأكيد" +#~ msgid "User Switcher" +#~ msgstr "مبدّل المستخدم" -#~ msgid "Indicator Spacing" -#~ msgstr "مباعدة المؤشر" +#~ msgid "User Switcher Applet Factory" +#~ msgstr "معمل بريمج مبدّل المستخدم" -#~ msgid "Space between the username and the indicator" -#~ msgstr "الفاصل بين اسم المستخدم و المؤشر" +#~ msgid "Edit Personal _Information" +#~ msgstr "حرِّر ال_معلومات الشخصية" -#~ msgid "_Help" -#~ msgstr "_مساعدة" +#~ msgid "_About" +#~ msgstr "_عنْ" -#~ msgid "Main Options" -#~ msgstr "الخيارات الرئيسية" +#~ msgid "_Edit Users and Groups" +#~ msgstr "_حرِّر المستخدمين والمجموعات" diff -Nru gdm-2.32.1/po/as.po gdm-3.0.0/po/as.po --- gdm-2.32.1/po/as.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/as.po 2011-04-04 14:37:16.000000000 +0000 @@ -5,44 +5,39 @@ # Amitakhya Phukan , 2006, 2008. # Amitakhya Phukan , 2008. # Amitakhya Phukan , 2009. +# Nilamdyuti Goswami , 2011. msgid "" msgstr "" "Project-Id-Version: as\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2009-09-12 01:28+0000\n" -"PO-Revision-Date: 2009-09-21 09:58+0530\n" -"Last-Translator: \n" -"Language-Team: American English <>\n" +"cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-22 06:39+0000\n" +"PO-Revision-Date: 2011-03-24 13:00+0000\n" +"Last-Translator: Nilamdyuti Goswami \n" +"Language-Team: American English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1)\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 1.0\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom এটা কেৰেক্টাৰ যন্ত্ৰ নহয়" -#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516 -#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137 -#: ../daemon/simple-slave-main.c:179 ../daemon/xdmcp-chooser-slave-main.c:179 -msgid "Enable debugging code" -msgstr "debugging কোড সক্ৰিয় কৰক" - -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "প্ৰদৰ্শনৰ ID" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 -msgid "id" -msgstr "id" +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +msgid "ID" +msgstr "ID" -#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187 -#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:192 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Display Manager Slave" @@ -51,81 +46,82 @@ msgid "could not find user \"%s\" on system" msgstr "ব্যৱস্থাপ্ৰণালীত \"%s\" ব্যৱহাৰকৰোঁতাক পোৱা নাযায়" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:220 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "প্ৰৱেশ প্ৰণালী আৰম্ভ কৰিব পৰা নাই" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:256 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "ব্যৱহাৰকৰোঁতাৰ পৰিচয় পৰীক্ষা কৰা নাযায়" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:310 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "ব্যৱহাৰকৰোঁতাক প্ৰৱেশাধিকাৰ দিব পৰা নাযায়" -#: ../daemon/gdm-factory-slave.c:281 ../daemon/gdm-simple-slave.c:432 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "বিশ্বাসযোগ্য তথ্য প্ৰতিষ্ঠা কৰিব পৰা ন'গ'ল" -#: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1111 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 +msgid "Unable to open session" +msgstr "অভিবৰ্তন খুলিবলে অক্ষম" + +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" "ভিতৰুৱা ভুলৰ বাবে X সেৱক (আপোনাৰ চিত্ৰাঙ্কিত পৰিবেশ) আৰম্ভ কৰিব পৰা ন'গ'ল । " "আপোনাৰ ব্যৱস্থাপ্ৰণালীৰ প্ৰশাসকক যোগাযোগ কৰক বা আপোনাৰ syslog চাওক ভুল জানিবৰ " "বাবে । তেতিয়ালৈকে এই প্ৰদৰ্শন নিষ্ক্ৰীয় কৰা হ'ব । সমস্যা সমাধান কৰাৰ পিছত অনুগ্ৰহ " "কৰি GDM পুনৰাৰম্ভ কৰিব ।" -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: মূল প্ৰদৰ্শন '%s' লৈ সংযোগ কৰাত বিফল" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "ব্যৱহাৰকৰোঁতা %s এ সেৱকক আৰম্ভ কৰিব লাগিছিল কিন্তু সেই ব্যৱহাৰকৰোঁতা নাই" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid ক %d লৈ নিৰ্ধাৰিত কৰিব নোৱাৰি" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s ৰ বাবে initgroups () বিফল হ'ল" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "%d লৈ userid নিৰ্ধাৰিত কৰিব নোৱাৰি" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464 -msgid "Couldn't set groupid to 0" -msgstr "groupid ক ০ লৈ নিৰ্ধাৰিত কৰিব নোৱাৰি" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: প্ৰদৰ্শন %s ৰ বাবে logfile খোলা ন'গ'ল !" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: %s ক %s লৈ নিৰ্ধাৰণ কৰোঁতে ভুল" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: সেৱকৰ অগ্ৰাধিকাৰৰ মাত্ৰা %d ৰূপে নিৰ্ধাৰণ কৰোঁতে ব্যৰ্থ: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: প্ৰদৰ্শন %s ৰ বাবে ৰিক্ত সেৱক আদেশ" @@ -154,291 +150,294 @@ msgid "The display device" msgstr "প্ৰদৰ্শনৰ যন্ত্ৰ" -#: ../daemon/gdm-session-worker.c:1293 +#: ../daemon/gdm-session-worker.c:1066 #, c-format +#| msgid "error initiating conversation with authentication system: %s" msgid "error initiating conversation with authentication system - %s" -msgstr "প্ৰমাণীকৰণ প্ৰণালীৰ সৈতে যোগাযোগ আৰম্ভ কৰাত ভুল - %s" +msgstr "প্ৰমাণীকৰণ প্ৰণালীৰ সৈতে কথোপকথন আৰম্ভ কৰাত ত্ৰুটি - %s" -#: ../daemon/gdm-session-worker.c:1294 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "সাধাৰণ বিজুতি" -#: ../daemon/gdm-session-worker.c:1295 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "স্মৃতিশক্তিৰ বাহিৰৰ" -#: ../daemon/gdm-session-worker.c:1296 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "অনুপ্ৰয়োগ বনোৱাজনৰ ভুল" -#: ../daemon/gdm-session-worker.c:1297 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "অজ্ঞাত ভুল" -#: ../daemon/gdm-session-worker.c:1304 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "ব্যৱহাৰকৰোঁতাৰ নাম:" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "পছন্দৰ ব্যৱহাৰকৰোঁতাৰ প্ৰমপ্টৰ বিষয়ে প্ৰমাণীকৰণ প্ৰণালীক জনোৱাত ভুল - %s" -#: ../daemon/gdm-session-worker.c:1324 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" msgstr "ব্যৱহাৰকৰোঁতাৰ গৃহস্থৰনামৰ বিষয়ে প্ৰমাণীকৰণ প্ৰণালীক জনোৱাত ভুল - %s" -#: ../daemon/gdm-session-worker.c:1339 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" msgstr "ব্যৱহাৰকৰোঁতাৰ ক'ন্সোলৰ বিষয়ে প্ৰমাণীকৰণ প্ৰণালীক জনোৱাত ভুল - %s" -#: ../daemon/gdm-session-worker.c:1352 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" msgstr "প্ৰমাণীকৰণ ব্যৱস্থাপ্ৰণালীক প্ৰদৰ্শনৰ শব্দ তথ্য জনাওঁতে ভুল - %s" -#: ../daemon/gdm-session-worker.c:1367 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" msgstr "প্ৰমাণীকৰণ ব্যৱস্থাপ্ৰণনালীক display xauth credentials ৰ বিষয়ে জনাওঁতে ভুল - %s" -#: ../daemon/gdm-session-worker.c:1648 ../daemon/gdm-session-worker.c:1666 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "কোনো ব্যৱহাৰকৰোঁতাৰ হিচাপ নাই" -#: ../daemon/gdm-session-worker.c:1693 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "ব্যৱহাৰকৰোঁতালৈ সলনি কৰিব পৰা নাযায়" -#: ../daemon/gdm-welcome-session.c:426 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s ব্যৱহাৰকৰোঁতা নাই" -#: ../daemon/gdm-welcome-session.c:433 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s সমষ্টি নাই" -#: ../daemon/gdm-xdmcp-display-factory.c:595 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "ছ'কেট সৃষ্টি কৰিব পৰা ন'গ'ল!" -#: ../daemon/gdm-xdmcp-display-factory.c:862 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "গৃহস্থ %s ৰ পৰা XDMCP জিজ্ঞাসা অগ্ৰহিত" -#: ../daemon/gdm-xdmcp-display-factory.c:1019 -#: ../daemon/gdm-xdmcp-display-factory.c:1240 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "পেকেটৰ পৰা authlist উদ্ধাৰ নহয়" -#: ../daemon/gdm-xdmcp-display-factory.c:1032 -#: ../daemon/gdm-xdmcp-display-factory.c:1255 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "checksum ত ভুল" -#: ../daemon/gdm-xdmcp-display-factory.c:1506 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "বেয়া ঠিকনা" -#: ../daemon/gdm-xdmcp-display-factory.c:1587 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: প্ৰদৰ্শনৰ ঠিকনা পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:1595 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: প্ৰদৰ্শনৰ পোৰ্টৰ নম্বৰ পঢ়িব পৰা ন'গ'ল" -#: ../daemon/gdm-xdmcp-display-factory.c:1604 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: পেকেটৰ পৰা authlist উদ্ধাৰ কৰিব পৰা নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:1624 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: checksum ত ভুল" -#: ../daemon/gdm-xdmcp-display-factory.c:2133 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: নিষিদ্ধ গৃহস্থ %s ৰ পৰা REQUEST পোৱা গৈছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2143 -#: ../daemon/gdm-xdmcp-display-factory.c:2498 -#: ../daemon/gdm-xdmcp-display-factory.c:2750 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Display Number পঢ়িব পৰা ন'গ'ল" -#: ../daemon/gdm-xdmcp-display-factory.c:2150 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: সংযোগৰ ধৰণ পঢ়িব পৰা ন'গ'ল" -#: ../daemon/gdm-xdmcp-display-factory.c:2157 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: গ্ৰাহকৰ ঠিকনা পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: পৰিচয় প্ৰমাণকৰ্তা নাম পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2174 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: পৰিচয় প্ৰমাণকৰ্তা তথ্য পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2184 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: পৰিচয় প্ৰমাণকৰ্তা তালিকা পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2203 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: প্ৰস্তুতকাৰক ID পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2230 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: %s ত checksum বিফল" -#: ../daemon/gdm-xdmcp-display-factory.c:2482 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: নিষিদ্ধ ঘোষিত গৃহস্থ %sৰ পৰা MANAGE পোৱা গ'ল" -#: ../daemon/gdm-xdmcp-display-factory.c:2491 -#: ../daemon/gdm-xdmcp-display-factory.c:2757 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: অধিবেশন ID পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Display Class পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2610 -#: ../daemon/gdm-xdmcp-display-factory.c:2660 -#: ../daemon/gdm-xdmcp-display-factory.c:2666 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: ঠিকনা পঢ়া নাযায়" -#: ../daemon/gdm-xdmcp-display-factory.c:2740 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: নিষিদ্ধ ঘোষিত গৃহস্থ %s ৰ পৰা KEEPALIVE পোৱা গৈছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2829 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: XDMCP হেডাৰ পঢ়িব পৰা ন'গ'ল!" -#: ../daemon/gdm-xdmcp-display-factory.c:2835 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: ভুল XDMCP সংস্কৰণ!" -#: ../daemon/gdm-xdmcp-display-factory.c:2841 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: ঠিকনা বিশ্লেষণ কৰিব নোৱাৰি" -#: ../daemon/gdm-xdmcp-display-factory.c:3286 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "সেৱকৰ গৃহস্থৰ নাম পোৱা ন'গ'ল: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "PID নথিপত্ৰ %s লিখা ন'গ'ল: সম্ভৱতঃ ডিস্কত আৰু স্থান নাই: %s" -#: ../daemon/main.c:270 +#: ../daemon/main.c:271 #, c-format msgid "Logdir %s does not exist or isn't a directory." msgstr "Logdir %s অনুপস্থিত বা পঞ্জিকা নহয় ।" -#: ../daemon/main.c:283 +#: ../daemon/main.c:287 #, c-format msgid "Authdir %s does not exist. Aborting." msgstr "%s নামৰ কোনো Authdir নাই । বাতিল কৰা হৈছে ।" -#: ../daemon/main.c:287 +#: ../daemon/main.c:291 #, c-format msgid "Authdir %s is not a directory. Aborting." msgstr "%s Authdir পঞ্জিকা নহয় । চেষ্টা বাতিল কৰা হ'ল ।" -#: ../daemon/main.c:361 +#: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "Authdir %s ক ব্যৱহাৰকৰোঁতা %d, সমস্তি %d ৰ নহয় । চেষ্টা বাতিল কৰা হৈছে।" -#: ../daemon/main.c:368 +#: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "Authdir %s ৰ ভুল অনুমতি %o আছে। এইটো %o হ'ব লাগে । চেষ্টা বাতিল কৰা হৈছে ।" -#: ../daemon/main.c:405 +#: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" msgstr "'%s' GDM ব্যৱহাৰকৰোঁতা নাই । চেষ্টা বাতিল কৰা হৈছে !" -#: ../daemon/main.c:411 +#: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" msgstr "GDM ৰ ব্যৱহাৰকৰোঁতা root হ'ব নোৱাৰে । চেষ্টা বাতিল কৰা হৈছে!" -#: ../daemon/main.c:417 +#: ../daemon/main.c:421 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" msgstr "'%s' GDM সমস্তি নাই । চেষ্টা বাতিল কৰা হৈছে!" -#: ../daemon/main.c:423 +#: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" msgstr "GDM ৰ সমস্তি root হ'ব নোৱাৰে । চেষ্টা বাতিল কৰা হ'ল!" -#: ../daemon/main.c:517 +#: ../daemon/main.c:533 msgid "Make all warnings fatal" msgstr "সকলো সকিয়নিক ধ্বংসাত্মক ৰূপ দিয়ক" -#: ../daemon/main.c:518 -msgid "Exit after a time - for debugging" +#: ../daemon/main.c:534 +msgid "Exit after a time (for debugging)" msgstr "এটা সময়ৰ পিছত বাহিৰ হ'ব - debugging ৰ বাবে" -#: ../daemon/main.c:519 +#: ../daemon/main.c:535 msgid "Print GDM version" msgstr "GDM ৰ সংস্কৰণ মূদ্ৰণ কৰক" -#: ../daemon/main.c:534 +#: ../daemon/main.c:550 msgid "GNOME Display Manager" msgstr "GNOME Display Manager" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:595 -msgid "Only root wants to run GDM" -msgstr "অকল root এ GDM চলাব খোজে" - -#: ../daemon/session-worker-main.c:149 +#: ../daemon/main.c:616 +msgid "Only the root user can run GDM" +msgstr "অকল root এ GDM চলাব পাৰিব" + +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME Display Manager Session Worker" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" +msgstr "AT SPI ৰেজিস্ট্ৰি ৰেপাৰ" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1767 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "প্ৰৱেশ পৰ্দ্দা" @@ -450,6 +449,10 @@ msgid "Power management daemon" msgstr "শক্তি পৰিচালনাৰ ডেমন" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME অভিবৰ্তন গতিবৃদ্ধি নিৰিক্ষক" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME পছন্দৰ ডেমন" @@ -463,12 +466,12 @@ msgstr "পৰ্দ্দাৰ কিছু অংশ বিবৰ্দ্ধন কৰক" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" -msgstr "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" +msgstr "GNOME অনস্ক্ৰিন কিবৰ্ড" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" -msgstr "এটা পৰ্দ্দাত দেখা চাবিৰ ফলক ব্যৱহাৰ কৰক" +msgid "Use an on-screen keyboard" +msgstr "এটা অনস্ক্ৰিন কিবৰ্ড ব্যৱহাৰ কৰক" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -482,204 +485,201 @@ msgid "Present on-screen information as speech or braille" msgstr "পৰ্দ্দাৰ তথ্যক বানী বা ব্ৰেইলি আখৰ হিচাপে প্ৰস্তুত কৰক" -#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.h:1 -#| msgid "Authentication Dialog" +#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 msgid "PolicyKit Authentication Agent" msgstr "প্ৰমাণীকৰণৰ সম্বাদ" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "ব্যৱস্থাপ্ৰণালী নিৰ্ব্বাচন কৰক" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 -#| msgid "XMCP: Could not create XDMCP buffer!" +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XMCP: XDMCP প্ৰশমক সৃষ্টি কৰিব নোৱাৰি!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP হেডাৰ পঢ়িব পৰা ন'গ'ল!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:253 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "মান" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:254 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "সম্পূৰ্ণ হোৱা সময়ৰ শতাংশ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1321 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "নিষ্ক্ৰীয় লিপি" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1322 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "ব্যৱহাৰকৰোঁতাই যদি কোনো বস্তু এতিয়াও লোৱা নাই তেনেহ'লে লেবেলত ব্যৱহাৰ কৰিব লগা " "লিপি" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1330 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "সক্ৰিয় লিপি" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1331 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ব্যৱহাৰকৰোঁতাই যদি কোনো বস্তু লৈছে তেনেহ'লে লেবেলত ব্যৱহাৰ কৰিব লগা লিপি" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1340 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "দৃশ্যমান তালিকা" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1341 -#| msgid "Whether or not the timer is currently ticking" -msgid "Whether or not the chooser list is visible" -msgstr "টাইমাৰ সক্ৰিয় হয় নে নহয়" +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 +msgid "Whether the chooser list is visible" +msgstr "বাচনি তালিকা দৃশ্যমান হয় নে" -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M:%S %p" -msgstr "%l:%M:%S %p" - -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M %p" -msgstr "%l:%M %p" - -#. translators: replace %e with %d if, when the day of the -#. * month as a decimal number is a single digit, it -#. * should begin with a 0 in your locale (e.g. "May -#. * 01" instead of "May 1"). +#. translators: This is the time format to use when both +#. * the date and time with seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:72 -msgid "%a %b %e" -msgstr "%a %b %e" - -#. translators: reverse the order of these arguments -#. * if the time should come before the -#. * date on a clock in your locale. +#: ../gui/simple-greeter/gdm-clock-widget.c:70 +msgid "%a %b %e, %l:%M:%S %p" +msgstr "%a %b %e, %l:%M:%S %p" + +#. translators: This is the time format to use when both +#. * the date and time without seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:77 -#, c-format -msgid "%1$s, %2$s" -msgstr "%1$s, %2$s" +#: ../gui/simple-greeter/gdm-clock-widget.c:76 +msgid "%a %b %e, %l:%M %p" +msgstr "%a %b %e, %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:291 -msgid "Automatically logging in..." -msgstr "স্বয়ংক্ৰিয়ভাবে প্ৰৱেশ কৰা হৈছে..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time with seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:83 +msgid "%a %l:%M:%S %p" +msgstr "%a %l:%M:%S %p" -#. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:758 -msgid "Cancelling..." -msgstr "বাতিল কৰা হৈছে..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time without seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:92 +msgid "%a %l:%M %p" +msgstr "%a %l:%M %p" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" +msgstr "স্বয়ংক্ৰিয়ভাবে প্ৰৱেশ কৰা হৈছে..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1185 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "ভাষা নিৰ্ব্বাচন কৰক আৰু প্ৰৱেশ কৰক" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 -msgid "Authentication Dialog" -msgstr "প্ৰমাণীকৰণৰ সম্বাদ" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" +msgstr "বাতিল কৰা হৈছে..." + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "ৰীতি" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "ৰীতি অভিবৰ্তন" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "বাতিল" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "কম্পিউটাৰৰ নাম" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +msgid "Login" msgstr "প্ৰৱেশ" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "আনলক" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +msgid "Version" +msgstr "সংস্কৰণ" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +msgid "Suspend" +msgstr "স্থগিত" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "পুনৰায় আৰম্ভ" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "বন্ধ কৰক" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 -msgid "Suspend" -msgstr "স্থগিত" - -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 -msgid "Version" -msgstr "সংস্কৰণ" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "অজ্ঞাত অৱশিষ্ট সময়" -#: ../gui/simple-greeter/gdm-greeter-panel.c:583 +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 msgid "Panel" msgstr "পেনেল" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ভাষাসমূহ" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "ভাষাসমূহ (_L):" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:273 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "ভাষা (_L):" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" -msgid "Other..." +msgid "Other…" msgstr "অন্য..." -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "ভাষাৰ সম্পূৰ্ণ তালিকাৰ পৰা এটা ভাষা নিৰ্ব্বাচন কৰক ।" -#: ../gui/simple-greeter/gdm-languages.c:609 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "ভাষা" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "নিৰ্ধাৰিত কৰা হোৱা নাই" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "চাবি ফলকৰ বিন্যাস" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "চাবিৰ ফলক (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "অন্য..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "পৰিকল্পনাৰ সম্পূৰ্ণ তালিকাৰ পৰা চাবি ফলকৰ পৰিকল্পনা নিৰ্ব্বাচন কৰক ।" - -#: ../gui/simple-greeter/gdm-option-widget.c:521 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "লেবেল লিপি" -#: ../gui/simple-greeter/gdm-option-widget.c:522 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "লেবেল হিচাপে ব্যৱহাৰ কৰিব লগা আখৰ" -#: ../gui/simple-greeter/gdm-option-widget.c:529 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "আইকণৰ নাম" -#: ../gui/simple-greeter/gdm-option-widget.c:530 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "লেবেলৰ সৈতে ব্যৱহাৰ কৰিব লগা আইকণ" -#: ../gui/simple-greeter/gdm-option-widget.c:538 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "অবিকল্পিত বস্তু" -#: ../gui/simple-greeter/gdm-option-widget.c:539 -msgid "The id of the default item" -msgstr "অবিকল্পিত বস্তুৰ id" +#: ../gui/simple-greeter/gdm-option-widget.c:523 +msgid "The ID of the default item" +msgstr "অবিকল্পিত বস্তুৰ ID" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" @@ -691,7 +691,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" msgstr "দূৰৰ পৰা প্ৰৱেশ (%s লৈ সংযোগ কৰা হৈছে...)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 @@ -704,15 +704,14 @@ msgstr "দূৰৰ পৰা প্ৰৱেশ" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "অধিবেশনসমূহ (_S):" +msgid "Session" +msgstr "অভিবৰ্তন" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" msgstr "পতাকাৰ সম্বাদৰ লিপি" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 -#| msgid "Banner message text" msgid "Banner message text when chooser is empty" msgstr "নিৰ্বাচন ব্যৱস্থা ৰিক্ত হ'লে বেনাৰৰ বাৰ্তাৰ টেক্সট" @@ -729,84 +728,63 @@ msgstr "অভিগমৰ চাবি ফলকৰ প্লাগ-ইন্‌ সক্ৰিয় কৰক" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 -msgid "Enable debugging" -msgstr "debugging সক্ৰিয় কৰক" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 -msgid "Enable debugging mode for the greeter." -msgstr "অভিবাদন কৰোঁতাৰ বাবে debugging সক্ৰিয় কৰক ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 msgid "Enable on-screen keyboard" msgstr "পৰ্দ্দাত দেখা চাবিৰ ফলক সক।ৰিয় কৰক" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 msgid "Enable screen magnifier" msgstr "পৰ্দ্দা বিবৰ্দ্ধক সক্ৰিয় কৰক" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 msgid "Enable screen reader" msgstr "পৰ্দ্দা পঢ়োঁতাক সক্ৰিয় কৰক" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 msgid "Enable showing the banner message" msgstr "পতাকাৰ সম্বাদ দেখুৱা সক্ৰিয় কৰক" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 msgid "Icon name to use for greeter logo" msgstr "অভিবাদন কৰোঁতাৰ বাবে ব্যৱহাৰ কৰিব লগা আইকণৰ নাম" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Recently selected keyboard layouts" -msgstr "অলপতে নিৰ্ব্বাচন কৰা চাবিৰ ফলকৰ পৰিকল্পনা" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 msgid "Recently selected languages" msgstr "অলপতে নিৰ্ব্বাচিত ভাষা" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "প্ৰৱেশ পৰ্দ্দাত অবিকল্পপিত ভাবে দেখুৱাব লগা চাবিৰ ফলকৰ তালিকা নিৰ্ধাৰণ কৰক ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr "প্ৰৱেশ পৰ্দ্দাত দেখুৱাব লগা ভাষাৰ তালিকা নিৰ্ধাৰণ কৰক ।" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +msgid "Set to a list of languages to be shown by default in the login window." +msgstr "প্ৰৱেশ পৰ্দ্দাত দেখুৱাব লগা ভাষাৰ তালিকা নিৰ্ধাৰণ কৰক।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "অভিনন্দনৰ ল'গ'ৰ বাবে ব্যৱহাৰ কৰিব লগা থিম থকা আইকণৰ নামলৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to TRUE to disable showing known users in the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "প্ৰৱেশ পৰ্দ্দাত জ্ঞাত ব্যৱহাৰকৰোঁতাসকলক দেখুৱা নিষ্ক্ৰীয় কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 -#| msgid "" -#| "Set to TRUE to disable showing the restart buttons in the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "প্ৰৱেশ পৰ্দ্দাত পুনৰাৰম্ভৰ বুটাম দেখুৱা নিষ্ক্ৰীয় কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 -#| msgid "Set to True to enable the background settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "xrandr পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "পৃষ্ঠভুমিৰ পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 -#| msgid "Set to True to enable the media-keys settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "media-keys পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -#| msgid "Set to True to enable the on-screen keyboard." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "পৰ্দ্দাত দেখা দিয়া চাবিৰ ফলক সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 -#| msgid "" -#| "Set to True to enable the plugin to manage the accessibility keyboard " -#| "settings." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -814,74 +792,64 @@ "অভিগম কৰিব পৰা চাবিৰ ফলকৰ পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিব'লৈ true লৈ " "নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 -#| msgid "Set to True to enable the screen magnifier." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "পৰ্দ্দা বিবৰ্দ্ধকক সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -#| msgid "Set to True to enable the screen reader." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "পৰ্দ্দা পঢ়োঁতাক সক্ৰিয় কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 -#| msgid "Set to True to enable the sound settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "পৃষ্ঠভুমিৰ পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -#| msgid "Set to True to enable the xrandr settings manager plugin." -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "xrandr পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to True to enable the xsettings settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰিব'লৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "পতাকাৰ সম্বাদৰ লিপি দেখুৱাবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +msgid "Set to true to use Compiz as the window manager." msgstr "compiz ক পৰ্দ্দাৰ পৰিচালক হিচাপে ব্যৱহাৰ কৰিবলৈ true লৈ নিৰ্ধাৰণ কৰক ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "ব্যৱহাৰকৰ্তা নিৰ্বাচনৰ তালিকা ৰিক্ত হ'লে banner_message_text-ৰ পৰিবৰ্তে প্ৰৱেশ " "উইন্ডোত প্ৰদৰ্শনযোগ্য টেক্সট বেনাৰৰ বাৰ্তা ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 -msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +msgid "Text banner message to show in the login window." msgstr "প্ৰৱেশ পৰ্দ্দাত দেখুৱাব লগা লিখিত পতাকাৰ সম্বাদ ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "true যদি xrandr পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "true যদি পৃষ্ঠভুমিৰ পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "true যদি media-keys পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "true যদি ধ্বনিৰ পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "true যদি xrandr পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:37 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "true যদি xsettings পছন্দৰ পৰিচালকৰ প্লাগ-ইন সক্ৰিয় কৰা হৈছে ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:38 -msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" msgstr "compiz ক পৰ্দ্দাৰ পৰিচালক হিচাপে ব্যৱহাৰ কৰক" #: ../gui/simple-greeter/gdm-timer.c:149 @@ -905,228 +873,247 @@ msgstr "এইটো চলমান হয় নে ?" #: ../gui/simple-greeter/gdm-timer.c:166 -msgid "Whether or not the timer is currently ticking" +msgid "Whether the timer is currently ticking" msgstr "টাইমাৰ সক্ৰিয় হয় নে নহয়" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "পৰিচালক" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "এই ব্যৱহাৰকৰোঁতাক নিয়ন্ত্ৰণ কৰা user manager object ।" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "%s হিচাপে প্ৰৱেশ কৰক" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:164 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" -msgid "Other..." +msgid "Other…" msgstr "অন্য..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:165 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "অন্য এটা হিচাপ নিৰ্ব্বাচন কৰক" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:177 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "অতিথি" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:178 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" msgstr "অস্থায়ী অতিথি হিচাপে প্ৰৱেশ কৰক" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:191 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "স্বয়ংক্ৰিয়ভাবে প্ৰৱেশ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192 -msgid "Automatically login to the system after selecting options" -msgstr "বিকল্প নিৰ্ব্বাচন কৰাৰ পিছত ব্যৱস্থাপ্ৰণালীত স্বয়ংক্ৰিয় ভাবে প্ৰৱেশ কৰক" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" +msgstr "বিকল্পসমূহ নিৰ্ব্বাচন কৰাৰ পিছত ব্যৱস্থাপ্ৰণালীত স্বয়ংক্ৰিয় ভাবে প্ৰৱেশ কৰক" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:383 -#, c-format -msgid "Log in as %s" -msgstr "%s হিচাপে প্ৰৱেশ কৰক" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:737 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "ইতিমধ্যে প্ৰৱেশ কৰা আছে" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." +#: ../utils/gdmflexiserver.c:61 +msgid "Only the VERSION command is supported" +msgstr "কেৱল VERSION কমান্ড সমৰ্থিত" -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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." +#: ../utils/gdmflexiserver.c:61 +msgid "COMMAND" +msgstr "COMMAND" -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"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 " +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +msgid "Ignored — retained for compatibility" +msgstr "আওকাণ কৰা হ'ল - সুসঙ্গতৰ বাবে ৰখা হৈছে" -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "ব্যৱহাৰকৰোঁতাৰ মাজত শীঘ্ৰে সলনি কৰিবলৈ তালিকা ।" +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +msgid "Debugging output" +msgstr "ডিবাগৰ নিৰ্গম" -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)" +#: ../utils/gdmflexiserver.c:68 +msgid "Version of this application" +msgstr "এই অনুপ্ৰয়োগৰ সংস্কৰণ" -#: ../gui/user-switch-applet/applet.c:647 -#: ../gui/user-switch-applet/applet.c:784 -#: ../gui/user-switch-applet/applet.c:823 +#: ../utils/gdmflexiserver.c:675 #, c-format -msgid "Can't lock screen: %s" -msgstr "পৰ্দ্দা বন্ধ কৰিব নোৱাৰি: %s" +msgid "Could not identify the current session." +msgstr "বৰ্ত্তমানৰ অধিবেশন চিনাক্ত কৰিব পৰা ন'গ'ল ।" -#: ../gui/user-switch-applet/applet.c:669 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "পৰ্দ্দা বন্ধ কৰিবলৈ অস্থায়ীভাবে স্ক্ৰিন্‌ছেভাৰক নিৰ্ধাৰণ কৰিব নোৱাৰি: %s" +#. Option parsing +#: ../utils/gdmflexiserver.c:711 +msgid "- New GDM login" +msgstr "- নতুন GDM প্ৰৱেশ" -#: ../gui/user-switch-applet/applet.c:882 -#, c-format -msgid "Can't logout: %s" -msgstr "প্ৰস্থান কৰিব নোৱাৰি: %s" +#: ../utils/gdmflexiserver.c:767 +msgid "Unable to start new display" +msgstr "নতুন প্ৰদৰ্শন আৰম্ভ কৰিব পৰা ন'গ'ল" -#: ../gui/user-switch-applet/applet.c:966 -msgid "Available" -msgstr "মজুত আছে" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "পৰ্দাৰ ছবি গ্ৰহণ কৰা হৈছে" -#: ../gui/user-switch-applet/applet.c:967 -msgid "Invisible" -msgstr "অদৃশ্য" +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "পৰ্দ্দাৰ ছবি তোলক" -#: ../gui/user-switch-applet/applet.c:968 -msgid "Busy" -msgstr "ব্যস্ত" +#~ msgid "Enable debugging code" +#~ msgstr "debugging কোড সক্ৰিয় কৰক" -#: ../gui/user-switch-applet/applet.c:969 -msgid "Away" -msgstr "ইয়াত নাই" +#~ msgid "id" +#~ msgstr "id" -#: ../gui/user-switch-applet/applet.c:1129 -msgid "Account Information..." -msgstr "হিচাপ সংক্ৰান্ত তথ্য..." +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "groupid ক ০ লৈ নিৰ্ধাৰিত কৰিব নোৱাৰি" -#: ../gui/user-switch-applet/applet.c:1141 -msgid "System Preferences..." -msgstr "ব্যৱস্থাপ্ৰণালীৰ পছন্দবোৰ..." +#~ msgid "%a %b %e" +#~ msgstr "%a %b %e" -#: ../gui/user-switch-applet/applet.c:1157 -msgid "Lock Screen" -msgstr "পৰ্দা লক কৰক" +#~ msgid "%1$s, %2$s" +#~ msgstr "%1$s, %2$s" -#: ../gui/user-switch-applet/applet.c:1168 -msgid "Switch User" -msgstr "Switch User" +#~ msgid "Authentication Dialog" +#~ msgstr "প্ৰমাণীকৰণৰ সম্বাদ" -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1179 -msgid "Quit..." -msgstr "প্ৰস্থান..." +#~ msgid "Keyboard layouts" +#~ msgstr "চাবি ফলকৰ বিন্যাস" -#: ../gui/user-switch-applet/applet.c:1294 -msgid "Unknown" -msgstr "অজ্ঞাত" +#~ msgid "_Keyboard:" +#~ msgstr "চাবিৰ ফলক (_K):" -#: ../gui/user-switch-applet/applet.c:1412 -msgid "User Switch Applet" -msgstr "User Switch Applet" +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "অন্য..." -#: ../gui/user-switch-applet/applet.c:1421 -msgid "Change account settings and status" -msgstr "হিচাপৰ পছন্দ আৰু অৱস্থা সলনি কৰক" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "পৰিকল্পনাৰ সম্পূৰ্ণ তালিকাৰ পৰা চাবি ফলকৰ পৰিকল্পনা নিৰ্ব্বাচন কৰক ।" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ব্যৱহাৰকৰোঁতাৰ মাজত শীঘ্ৰে সলনি কৰিবলৈ তালিকা" +#~ msgid "_Sessions:" +#~ msgstr "অধিবেশনসমূহ (_S):" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "User Switcher" +#~ msgid "Enable debugging" +#~ msgstr "debugging সক্ৰিয় কৰক" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "User Switcher Applet Factory" +#~ msgid "Enable debugging mode for the greeter." +#~ msgstr "অভিবাদন কৰোঁতাৰ বাবে debugging সক্ৰিয় কৰক ।" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "ব্যক্তিগত তথ্য সম্পাদন কৰক (_I)" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "অলপতে নিৰ্ব্বাচন কৰা চাবিৰ ফলকৰ পৰিকল্পনা" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "বিষয়ে (_A)" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "প্ৰৱেশ পৰ্দ্দাত অবিকল্পপিত ভাবে দেখুৱাব লগা চাবিৰ ফলকৰ তালিকা নিৰ্ধাৰণ কৰক ।" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ব্যৱহাৰকৰোঁতা আৰু গোটক সম্পাদন কৰক (_E)" +#~ msgid "Manager" +#~ msgstr "পৰিচালক" -#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62 -#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65 -#: ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "আওকাণ কৰা হ'ল - সুসঙ্গতৰ বাবে ৰখা হৈছে" +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "এই ব্যৱহাৰকৰোঁতাক নিয়ন্ত্ৰণ কৰা user manager object ।" -#: ../utils/gdmflexiserver.c:61 -msgid "COMMAND" -msgstr "COMMAND" +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -msgid "Debugging output" -msgstr "ডিবাগৰ নিৰ্গম" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." -#: ../utils/gdmflexiserver.c:68 -msgid "Version of this application" -msgstr "এই অনুপ্ৰয়োগৰ সংস্কৰণ" +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " -#: ../utils/gdmflexiserver.c:675 -#, c-format -msgid "Could not identify the current session." -msgstr "বৰ্ত্তমানৰ অধিবেশন চিনাক্ত কৰিব পৰা ন'গ'ল ।" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ব্যৱহাৰকৰোঁতাৰ মাজত শীঘ্ৰে সলনি কৰিবলৈ তালিকা ।" -#. Option parsing -#: ../utils/gdmflexiserver.c:711 -msgid "- New GDM login" -msgstr "- নতুন GDM প্ৰৱেশ" +#~ msgid "translator-credits" +#~ msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)" -#: ../utils/gdmflexiserver.c:767 -msgid "Unable to start new display" -msgstr "নতুন প্ৰদৰ্শন আৰম্ভ কৰিব পৰা ন'গ'ল" +#~ msgid "Can't lock screen: %s" +#~ msgstr "পৰ্দ্দা বন্ধ কৰিব নোৱাৰি: %s" -#: ../utils/gdm-screenshot.c:219 -msgid "Screenshot taken" -msgstr "পৰ্দাৰ ছবি গ্ৰহণ কৰা হৈছে" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "পৰ্দ্দা বন্ধ কৰিবলৈ অস্থায়ীভাবে স্ক্ৰিন্‌ছেভাৰক নিৰ্ধাৰণ কৰিব নোৱাৰি: %s" -#. Option parsing -#: ../utils/gdm-screenshot.c:284 -msgid "Take a picture of the screen" -msgstr "পৰ্দ্দাৰ ছবি তোলক" +#~ msgid "Can't logout: %s" +#~ msgstr "প্ৰস্থান কৰিব নোৱাৰি: %s" + +#~ msgid "Available" +#~ msgstr "মজুত আছে" + +#~ msgid "Invisible" +#~ msgstr "অদৃশ্য" + +#~ msgid "Busy" +#~ msgstr "ব্যস্ত" + +#~ msgid "Away" +#~ msgstr "ইয়াত নাই" + +#~ msgid "Account Information..." +#~ msgstr "হিচাপ সংক্ৰান্ত তথ্য..." + +#~ msgid "System Preferences..." +#~ msgstr "ব্যৱস্থাপ্ৰণালীৰ পছন্দবোৰ..." + +#~ msgid "Lock Screen" +#~ msgstr "পৰ্দা লক কৰক" + +#~ msgid "Switch User" +#~ msgstr "Switch User" + +#~ msgid "Quit..." +#~ msgstr "প্ৰস্থান..." + +#~ msgid "Unknown" +#~ msgstr "অজ্ঞাত" + +#~ msgid "User Switch Applet" +#~ msgstr "User Switch Applet" + +#~ msgid "Change account settings and status" +#~ msgstr "হিচাপৰ পছন্দ আৰু অৱস্থা সলনি কৰক" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ব্যৱহাৰকৰোঁতাৰ মাজত শীঘ্ৰে সলনি কৰিবলৈ তালিকা" + +#~ msgid "User Switcher" +#~ msgstr "User Switcher" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "User Switcher Applet Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "ব্যক্তিগত তথ্য সম্পাদন কৰক (_I)" + +#~ msgid "_About" +#~ msgstr "বিষয়ে (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ব্যৱহাৰকৰোঁতা আৰু গোটক সম্পাদন কৰক (_E)" #~ msgid "worker exited with status %d" #~ msgstr "%d অৱস্থাৰ সৈতে কৰ্মী বাহিৰ হ'ল" @@ -1194,9 +1181,6 @@ #~ msgstr "" #~ "অধিবেশনৰ ল'গ '%s' সাধাৰণ নথিপত্ৰ নহয়, অধিবেশনক '%s' ত প্ৰৱেশ কৰোৱা হৈছে ।\n" -#~ msgid "unable to log session" -#~ msgstr "অধিবেশনক লগ কৰিব পৰা ন'হ'ব" - #~ msgid "Alternative GDM System Defaults configuration file" #~ msgstr "বৈকল্পিক GDM System Defaults বিন্যাস নথিপত্ৰ" @@ -1245,9 +1229,5 @@ #~ msgid "Login based on preset legacy configuration" #~ msgstr "পূৰ্ব নিৰ্ধাৰিত লিগেচি বিন্যাসৰ মতে কৰা প্ৰৱেশ" -#~ msgid "_Session:" -#~ msgstr "অধিবেশন (_S):" - #~ msgid "_Users:" #~ msgstr "ব্যৱহাৰকৰোঁতাসকল (_U)::" - diff -Nru gdm-2.32.1/po/ast.po gdm-3.0.0/po/ast.po --- gdm-2.32.1/po/ast.po 2011-03-28 16:49:04.000000000 +0000 +++ gdm-3.0.0/po/ast.po 2011-04-04 14:37:16.000000000 +0000 @@ -2,25 +2,23 @@ # Asturian translation for gdm # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007 # This file is distributed under the same license as the gdm package. +# # FIRST AUTHOR , 2007. # Xose S. Puente , 2007. -# Xandru Armesto , 2011. msgid "" msgstr "" "Project-Id-Version: gdm\n" -"Report-Msgid-Bugs-To: " -"http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-12-18 09:45+0000\n" -"PO-Revision-Date: 2011-02-15 18:18+0200\n" -"Last-Translator: Xandru Armesto \n" -"Language-Team: Softastur alministradores@softastur.org\n" -"Language: ast\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" +"POT-Creation-Date: 2011-02-01 16:30+0000\n" +"PO-Revision-Date: 2011-02-14 19:24+0100\n" +"Last-Translator: ivarela \n" +"Language-Team: Asturian \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: Virtaal 0.5.2\n" "X-Launchpad-Export-Date: 2009-02-09 14:28+0000\n" +"X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: Asturian\n" #: ../common/gdm-common.c:456 @@ -28,18 +26,24 @@ msgid "/dev/urandom is not a character device" msgstr "/dev/urandom nun ye un preséu de carauteres" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "ID de pantalla" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 -#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 +#: ../daemon/factory-slave-main.c:190 +#: ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 +#: ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "Esclavu del xestor de pantalles de GNOME" @@ -48,38 +52,42 @@ msgid "could not find user \"%s\" on system" msgstr "nun pudo alcontrase l'usuariu «%s» nel sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 +#: ../daemon/gdm-factory-slave.c:203 +#: ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "Nun pudo anicializase'l sistema d'accesu" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 +#: ../daemon/gdm-factory-slave.c:235 +#: ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "Nun pudo autenticase al usuariu" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 +#: ../daemon/gdm-factory-slave.c:257 +#: ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "Nun pudo autorizase al usuariu" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 +#: ../daemon/gdm-factory-slave.c:279 +#: ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "Nun pudieron afitase les credenciales" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 +#: ../daemon/gdm-factory-slave.c:302 +#: ../daemon/gdm-simple-slave.c:581 +#| msgid "Unable to authorize user" msgid "Unable to open session" msgstr "Nun pudo abrise la sesión" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1267 -msgid "" -"Could not start the X server (your graphical environment) due to an internal " -"error. Please contact your system administrator or check your syslog to " -"diagnose. In the meantime this display will be disabled. Please restart GDM " -"when the problem is corrected." -msgstr "" -"Nun se pudo arrancar el sirvidor X (el so entornu gráficu) por un fallu " -"internu. Contacta col alministrador del to sistema o comprueba'l rexistru " -"del sistema pa obtener un diagnósticu. Mentes tanto, esta pantalla va " -"desactivase. Reanicia GDM en solucionando'l problema." +#: ../daemon/gdm-factory-slave.c:677 +#: ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1238 +#| msgid "" +#| "Could not start the X server (your graphical environment) due to some " +#| "internal error. Please contact your system administrator or check your " +#| "syslog to diagnose. In the meantime this display will be disabled. " +#| "Please restart GDM when the problem is corrected." +msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." +msgstr "Nun se pudo arrancar el sirvidor X (el so entornu gráficu) por un fallu internu. Contacta col alministrador del to sistema o comprueba'l rexistru del sistema pa obtener un diagnósticu. Mentes tanto, esta pantalla va desactivase. Reanicia GDM en solucionando'l problema." #: ../daemon/gdm-server.c:250 #, c-format @@ -89,31 +97,36 @@ #: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "" -"El sirvidor tenía de llanzase pol usuariu %s pero esi usuariu nun esiste" +msgstr "El sirvidor tenía de llanzase pol usuariu %s pero esi usuariu nun esiste" -#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-server.c:376 +#: ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 +#: ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nun pudo afitase'l id de grupu a %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 +#: ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "Falló initgroups() pa %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 +#: ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nun pudo afitase'l id d'usuariu a %d" #: ../daemon/gdm-server.c:435 #, c-format +#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: Nun se pudo abrir el ficheru de rexistru de la pantalla %s." -#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:446 +#: ../daemon/gdm-server.c:452 #: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" @@ -153,80 +166,80 @@ msgid "The display device" msgstr "La pantalla" -#: ../daemon/gdm-session-worker.c:1290 +#: ../daemon/gdm-session-worker.c:1289 #, c-format +#| msgid "error initiating conversation with authentication system - %s" msgid "error initiating conversation with authentication system: %s" msgstr "fallu al aniciar la conversación col sistema d'autenticación: %s" -#: ../daemon/gdm-session-worker.c:1291 +#: ../daemon/gdm-session-worker.c:1290 msgid "general failure" msgstr "fallu xeneral" -#: ../daemon/gdm-session-worker.c:1292 +#: ../daemon/gdm-session-worker.c:1291 msgid "out of memory" msgstr "memoria escosada" -#: ../daemon/gdm-session-worker.c:1293 +#: ../daemon/gdm-session-worker.c:1292 msgid "application programmer error" msgstr "fallu del programador de l'aplicación" -#: ../daemon/gdm-session-worker.c:1294 +#: ../daemon/gdm-session-worker.c:1293 msgid "unknown error" msgstr "fallu desconocíu" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1300 msgid "Username:" msgstr "Usuariu:" -#: ../daemon/gdm-session-worker.c:1307 +#: ../daemon/gdm-session-worker.c:1306 #, c-format +#| msgid "" +#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" -msgstr "" -"fallu al informar al sistema d'autenticación del diálogu del nome d'usuariu " -"preferíu: %s" +msgstr "fallu al informar al sistema d'autenticación del diálogu del nome d'usuariu preferíu: %s" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1320 #, c-format +#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" -msgstr "" -"fallu al informar al sistema d'autenticación del nome del equipu del " -"usuariu: %s" +msgstr "fallu al informar al sistema d'autenticación del nome del equipu del usuariu: %s" -#: ../daemon/gdm-session-worker.c:1336 +#: ../daemon/gdm-session-worker.c:1335 #, c-format +#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" -msgstr "" -"fallu al informar al sistema d'autentificación sobre la consola del usuariu: " -"%s" +msgstr "fallu al informar al sistema d'autentificación sobre la consola del usuariu: %s" -#: ../daemon/gdm-session-worker.c:1349 +#: ../daemon/gdm-session-worker.c:1348 #, c-format +#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" -msgstr "" -"fallu al informar al sistema d'autentificación de la cadena de pantalla: %s" +msgstr "fallu al informar al sistema d'autentificación de la cadena de pantalla: %s" -#: ../daemon/gdm-session-worker.c:1364 +#: ../daemon/gdm-session-worker.c:1363 #, c-format +#| msgid "" +#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" -msgstr "" -"fallu al informar al sistema d'autentificación de les credenciales xauth de " -"la pantalla: %s" +msgstr "fallu al informar al sistema d'autentificación de les credenciales xauth de la pantalla: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1678 +#: ../daemon/gdm-session-worker.c:1660 +#: ../daemon/gdm-session-worker.c:1677 #, c-format msgid "no user account available" msgstr "nun hai cuentes d'usuariu disponibles" -#: ../daemon/gdm-session-worker.c:1705 +#: ../daemon/gdm-session-worker.c:1704 msgid "Unable to change to user" msgstr "Nun pudo camudase l'usuariu" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "L'usuariu %s nun esiste" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "El grupu %s nun esiste" @@ -368,12 +381,12 @@ msgid "Could not get server hostname: %s!" msgstr "Nun pudo obtenese'l nome del equipu: %s!" -#: ../daemon/main.c:237 ../daemon/main.c:250 +#: ../daemon/main.c:237 +#: ../daemon/main.c:250 #, c-format +#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" -msgstr "" -"Nun se puede escribir el ficheru con PID %s: seique nun heba espaciu nel " -"discu: %s" +msgstr "Nun se puede escribir el ficheru con PID %s: seique nun heba espaciu nel discu: %s" #: ../daemon/main.c:271 #, c-format @@ -393,16 +406,12 @@ #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "" -"El direutoriu d'autorización %s nun pertenez al usuariu %d, grupu %d. " -"Albortando." +msgstr "El direutoriu d'autorización %s nun pertenez al usuariu %d, grupu %d. Albortando." #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "" -"El direutoriu d'autorización %s tien los permisos incorreutos %o. Tendría de " -"tener %o. Albortando." +msgstr "El direutoriu d'autorización %s tien los permisos incorreutos %o. Tendría de tener %o. Albortando." #: ../daemon/main.c:409 #, c-format @@ -427,6 +436,7 @@ msgstr "Facer que tolos avisos seyan fatales" #: ../daemon/main.c:534 +#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "Salir dempués d'un tiempu (pa depuración)" @@ -440,6 +450,7 @@ #. make sure the pid file doesn't get wiped #: ../daemon/main.c:616 +#| msgid "Only root wants to run GDM" msgid "Only the root user can run GDM" msgstr "Namái l'alministrador puede executar GDM" @@ -450,11 +461,12 @@ msgstr "Trabayador de sesión de GDM" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 +#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "Endolcu de rexistru AT SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1648 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1688 msgid "Login Window" msgstr "Ventana d'entrada" @@ -479,10 +491,12 @@ msgstr "Magnificar partes de la pantalla" #: ../data/greeter-autostart/gok.desktop.in.h:1 +#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "Tecláu en pantalla de GNOME" #: ../data/greeter-autostart/gok.desktop.in.h:2 +#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "Usar un tecláu en pantalla" @@ -502,7 +516,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Axente d'autenticación PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Esbillar sistema" @@ -514,11 +528,11 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nun pudo lleese la cabecera XDMCP." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "porcentax de tiempu completáu" @@ -528,8 +542,7 @@ #: ../gui/simple-greeter/gdm-chooser-widget.c:1470 msgid "The text to use in the label if the user hasn't picked an item yet" -msgstr "" -"El testu que s'usará na etiqueta si l'usuariu entá nun escoyó un elementu" +msgstr "El testu que s'usará na etiqueta si l'usuariu entá nun escoyó un elementu" #: ../gui/simple-greeter/gdm-chooser-widget.c:1478 msgid "Active Text" @@ -544,6 +557,7 @@ msgstr "Llistar visibles" #: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#| msgid "Whether or not the chooser list is visible" msgid "Whether the chooser list is visible" msgstr "Conseña si la llista del seleutor ye visible" @@ -551,6 +565,7 @@ #. * the date and time with seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 +#| msgid "%l:%M:%S %p" msgid "%a %b %e, %l:%M:%S %p" msgstr "%a, %e de %b, %H:%M:%S" @@ -558,6 +573,7 @@ #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 +#| msgid "%l:%M %p" msgid "%a %b %e, %l:%M %p" msgstr "%a, %e de %b, %H:%M" @@ -565,6 +581,7 @@ #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 +#| msgid "%l:%M:%S %p" msgid "%a %l:%M:%S %p" msgstr "%a %H:%M:%S" @@ -572,10 +589,12 @@ #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 +#| msgid "%l:%M %p" msgid "%a %l:%M %p" msgstr "%a %H:%M" #: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#| msgid "Automatically logging in..." msgid "Automatically logging in…" msgstr "Aniciar sesión automáticamente…" @@ -584,56 +603,54 @@ msgstr "Esbille una llingua y calque Aniciar sesión" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:693 +#| msgid "Cancelling..." msgid "Cancelling…" msgstr "Encaboxando…" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Encaboxar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nome del equipu" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#| msgid "Log In" msgid "Login" msgstr "Coneutase" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desbloquiar" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versión" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opciones d'Apagáu" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:899 msgid "Suspend" msgstr "Suspender" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:904 msgid "Restart" msgstr "Reaniciar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:908 msgid "Shut Down" msgstr "Apagar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizáu" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sesión personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:957 +msgid "Unknown time remaining" +msgstr "Tiempu restante desconocíu" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:979 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Llingües" @@ -649,6 +666,8 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 +#| msgctxt "language" +#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "Otru..." @@ -658,40 +677,14 @@ msgstr "Escueya una llingua de la llista de llingües disponibles." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#| msgid "Languages" msgid "Language" msgstr "Llingua" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Ensin especificar" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Distribuciones de tecláu" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tecláu:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Otru..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Escueya una distribución de tecláu de la llista de distribuciones " -"disponibles." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tecláu" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Testu d'etiqueta" @@ -713,6 +706,7 @@ msgstr "Elementu predetermináu" #: ../gui/simple-greeter/gdm-option-widget.c:523 +#| msgid "The id of the default item" msgid "The ID of the default item" msgstr "El ID del elementu predetermináu" @@ -726,6 +720,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format +#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "Aniciu de sesión remotu (coneutándose a %s…)" @@ -739,6 +734,7 @@ msgstr "Aniciu de sesión remotu" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 +#| msgid "Sessions" msgid "Session" msgstr "Sesión" @@ -783,136 +779,108 @@ msgstr "Nome del iconu qu'usar pal logotipu de la interface d'entrada" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Distribuciones de tecláu esbillaes recientemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Llingües recientemente esbillaes" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login " -"window." -msgstr "" -"Afitar una llista de teclaos p'amosar na ventana d'arranque de sesión de " -"manera predeterminada." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#| msgid "" +#| "Set to a list of languages to be shown by default at the login window." msgid "Set to a list of languages to be shown by default in the login window." -msgstr "" -"Afitar una llista de llingües p'amosar na ventana d'arranque de sesión de " -"manera predeterminada." +msgstr "Afitar una llista de llingües p'amosar na ventana d'arranque de sesión de manera predeterminada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" -"Afitar al nome del tema d'iconos qu'usar pal logotipu de la interface " -"gráfica." +msgstr "Afitar al nome del tema d'iconos qu'usar pal logotipu de la interface gráfica." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." -msgstr "" -"Afitar a braero pa desactivar l'amosáu de los usuarios conocíos na ventana " -"d'aniciu de sesión." +msgstr "Afitar a braero pa desactivar l'amosáu de los usuarios conocíos na ventana d'aniciu de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" -"Afitar a braero pa desactivar l'amosáu de los usuarios conocíos na ventana " -"d'aniciu de sesión." +msgstr "Afitar a braero pa desactivar l'amosáu de los usuarios conocíos na ventana d'aniciu de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#| msgid "Set to true to enable the xrandr settings manager plugin." msgid "Set to true to enable the XRandR settings manager plugin." -msgstr "" -"Afitar a verdaderu p'activar el complementu del xestor d'axustes de XRandR." +msgstr "Afitar a verdaderu p'activar el complementu del xestor d'axustes de XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." -msgstr "" -"Afitar a braero p'activar el complementu del xestor d'axustes del fondu de " -"pantalla." +msgstr "Afitar a braero p'activar el complementu del xestor d'axustes del fondu de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "" -"Afitar a braero p'activar los axustes del complementu del xestor de tecles " -"multimedia." +msgstr "Afitar a braero p'activar los axustes del complementu del xestor de tecles multimedia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Afitar a braero p'activar el tecláu en pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -msgid "" -"Set to true to enable the plugin to manage the accessibility keyboard " -"settings." -msgstr "" -"Afitar a braero p'activar el complementu del xestor d'axustes d'accesibilidá " -"del tecláu." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." +msgstr "Afitar a braero p'activar el complementu del xestor d'axustes d'accesibilidá del tecláu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Afitar a braero p'activar el magnificador de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Afitar a braero p'activar el llector de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Afitar a braero p'activar el complementu del xestor d'axustes de soníu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "" -"Afitar a braero p'activar el complementu del xestor d'axustes xsettings." +msgstr "Afitar a braero p'activar el complementu del xestor d'axustes xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Afitar a braero p'amosar el mensaxe de testu d'entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#| msgid "Set to true to use compiz as the window manager." msgid "Set to true to use Compiz as the window manager." msgstr "Afitar a verdaderu pa usar Compiz como xestor de ventanes." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "" -"Text banner message to show in the login window when the user chooser is " -"empty, instead of banner_message_text." -msgstr "" -"Mensaxe de testu qu'amosar na ventana d'aniciu de sesión cuando'l seleutor " -"ta ermu, n'arróu de banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#| msgid "" +#| "Text banner message to show on the login window when the user chooser is " +#| "empty, instead of banner_message_text." +msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text." +msgstr "Mensaxe de testu qu'amosar na ventana d'aniciu de sesión cuando'l seleutor ta ermu, n'arróu de banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#| msgid "Text banner message to show on the login window." msgid "Text banner message to show in the login window." msgstr "Mensaxe de testu qu'amosar na ventana d'aniciu de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#| msgid "True if the xrandr settings manager plugin is enabled." msgid "True if the XRandR settings manager plugin is enabled." msgstr "Braero si'l complementu del xestor d'axustes de XRandR ta activáu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." -msgstr "" -"Braero si'l complementu del xestor d'axustes del fondu de pantalla ta " -"activáu." +msgstr "Braero si'l complementu del xestor d'axustes del fondu de pantalla ta activáu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." -msgstr "" -"Braero si'l complementu del xestor d'axustes de tecles multimedia ta " -"activáu." +msgstr "Braero si'l complementu del xestor d'axustes de tecles multimedia ta activáu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Braero si'l complementu del xestor d'axustes de soníu ta activáu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Braero si'l complementu del xestor d'axustes xsettings ta activáu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#| msgid "Use compiz as the window manager" msgid "Use Compiz as the window manager" msgstr "Usar Compiz como xestor de ventanes" @@ -937,11 +905,12 @@ msgstr "¿Ta executándose?" #: ../gui/simple-greeter/gdm-timer.c:166 +#| msgid "Whether or not the timer is currently ticking" msgid "Whether the timer is currently ticking" msgstr "Conseña si'l cuntador ta executándose anguaño" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 #, c-format msgid "Log in as %s" msgstr "Aniciar sesión como %s" @@ -952,6 +921,8 @@ #. * a list. #. #: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#| msgctxt "user" +#| msgid "Other..." msgctxt "user" msgid "Other…" msgstr "Otru..." @@ -965,6 +936,7 @@ msgstr "Invitáu" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#| msgid "Login as a temporary guest" msgid "Log in as a temporary guest" msgstr "Aniciar sesión como invitáu temporal" @@ -973,144 +945,14 @@ msgstr "Aniciu de sesión automáticu" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#| msgid "Automatically login to the system after selecting options" msgid "Automatically log into the system after selecting options" msgstr "Aniciar sesión nel sistema dempués d'esbillar les opciones" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 msgid "Currently logged in" msgstr "Sesión aniciada" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"La miniaplicación Seleutor d'usuarios ye software llibre; puede " -"redistribuyila y/o camudala baxo los términos de la Llicencia Pública " -"Xeneral GNU espublizada pola Free Software Foundation; bien na versión 2 de " -"la Llicencia, o (a la so eleición) cualesquier versión postrera." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Un menú pa camudar rápidamente ente usuarios." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "Iñigo Varela https://launchpad.net/~malditoastur" - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nun pudo bloquiase la pantalla: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Nun pudo afitase temporalmente'l curiapantalles como una pantalla en blancu: " -"%s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Nun se pudo desloguear: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Disponible" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Invisible" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Ocupáu" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Ausente" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Información de Cuenta" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Preferencies de Sistema" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Bloquiar pantalla" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Camudar usuariu" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Colar..." - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Miniaplicación del seleutor d'usuarios" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Camudar los axustes de la cuenta y l'estáu" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menú pa camudar rápidamente ente usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Seleutor d'usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fábrica de la miniaplicación del seleutor d'usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editar _Información Personal" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "Tocante _a" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editar Grupos y Usuarios" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Namái se soporta'l comandu VERSION" @@ -1119,12 +961,16 @@ msgid "COMMAND" msgstr "COMANDU" -#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 -#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +#: ../utils/gdmflexiserver.c:62 +#: ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 +#: ../utils/gdmflexiserver.c:66 +#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "Inoráu - reteníu por compatibilidá" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +#: ../utils/gdmflexiserver.c:64 +#: ../utils/gdm-screenshot.c:43 msgid "Debugging output" msgstr "Mensaxes de depuración" @@ -1146,79 +992,132 @@ msgid "Unable to start new display" msgstr "Nun pudo aniciase la pantalla nueva" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Sacóse la semeya de pantalla" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Capturar una imaxe de la pantalla" -#~ msgid "Cancel" -#~ msgstr "Encaboxar" - -#~ msgid "Unknown time remaining" -#~ msgstr "Tiempu restante desconocíu" - #~ msgid "Enable debugging code" #~ msgstr "Activar el códigu de depuración" - #~ msgid "id" #~ msgstr "id" - #~ msgid "Couldn't set groupid to 0" #~ msgstr "Nun pudo afitase'l id de grupu a 0" - #~ msgid "%a %b %e" #~ msgstr "%a, %e de %b" - #~ msgid "%1$s, %2$s" #~ msgstr "%1$s, %2$s" - #~ msgid "Authentication Dialog" #~ msgstr "Diálogu d'autenticación" - +#~ msgid "Keyboard layouts" +#~ msgstr "Distribuciones de tecláu" +#~ msgid "_Keyboard:" +#~ msgstr "_Tecláu:" #~ msgctxt "keyboard" #~ msgid "Other..." #~ msgstr "Otru..." - +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Escueya una distribución de tecláu de la llista de distribuciones " +#~ "disponibles." #~ msgid "_Sessions:" #~ msgstr "_Sesiones:" - #~ msgid "Enable debugging" #~ msgstr "Activar depuración" - #~ msgid "Enable debugging mode for the greeter." #~ msgstr "Activar el mou de depuración pa la interface d'entrada." - +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Distribuciones de tecláu esbillaes recientemente" #~ msgid "" #~ "Set to a list of keyboard layouts to be shown by default at the login " #~ "window." #~ msgstr "" #~ "Afitar una llista de distribuciones de tecláu qu'amosar na ventana " #~ "d'aniciu de sesión de mou predetermináu." - #~ msgid "Manager" #~ msgstr "Alministrador" - #~ msgid "The user manager object this user is controlled by." #~ msgstr "L'oxetu d'alministrador d'usuarios que remana a esti usuariu." - +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "La miniaplicación Seleutor d'usuarios ye software llibre; puede " +#~ "redistribuyila y/o camudala baxo los términos de la Llicencia Pública " +#~ "Xeneral GNU espublizada pola Free Software Foundation; bien na versión 2 " +#~ "de la Llicencia, o (a la so eleición) cualesquier versión postrera." +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Un menú pa camudar rápidamente ente usuarios." +#~ msgid "translator-credits" +#~ msgstr "Iñigo Varela https://launchpad.net/~malditoastur" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Nun pudo bloquiase la pantalla: %s" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Nun pudo afitase temporalmente'l curiapantalles como una pantalla en " +#~ "blancu: %s" #~ msgid "Can't logout: %s" #~ msgstr "Nun se puede colar de la sesión: %s" - +#~ msgid "Available" +#~ msgstr "Disponible" +#~ msgid "Invisible" +#~ msgstr "Invisible" +#~ msgid "Busy" +#~ msgstr "Ocupáu" +#~ msgid "Away" +#~ msgstr "Ausente" #~ msgid "Account Information..." #~ msgstr "Información de la cuenta…" - #~ msgid "System Preferences..." #~ msgstr "Preferencies del sistema…" - +#~ msgid "Lock Screen" +#~ msgstr "Bloquiar pantalla" +#~ msgid "Switch User" +#~ msgstr "Camudar usuariu" #~ msgid "Quit..." #~ msgstr "Colar..." - #~ msgid "Unknown" #~ msgstr "Desconocíu" +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicación del seleutor d'usuarios" +#~ msgid "Change account settings and status" +#~ msgstr "Camudar los axustes de la cuenta y l'estáu" +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Un menú pa camudar rápidamente ente usuarios" +#~ msgid "User Switcher" +#~ msgstr "Seleutor d'usuarios" +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fábrica de la miniaplicación del seleutor d'usuarios" +#~ msgid "Edit Personal _Information" +#~ msgstr "Editar _Información Personal" +#~ msgid "_About" +#~ msgstr "Tocante _a" +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editar Grupos y Usuarios" #, fuzzy #~ msgid "Unable establish credentials" @@ -1231,31 +1130,22 @@ #, fuzzy #~ msgid "Failed to stop computer" #~ msgstr "Falló'l reaniciase" - #~ msgid "Didn't understand `%s' (expected integer)" #~ msgstr "Nun s'entendió `%s' (aguardábase por un enteru)" - #~ msgid "Integer `%s' is too large or small" #~ msgstr "L'enteru «%s» ye abondo grande o enforma pequeñu" - #~ msgid "Didn't understand `%s' (expected true or false)" #~ msgstr "Nun se pue procesar «%s» (aguardábase «true» o «false»)" - #~ msgid "Text contains invalid UTF-8" #~ msgstr "El testu contién UTF-8 inválidu" - #~ msgid "Common Desktop Environment (CDE)" #~ msgstr "Entornu d'escritoriu común (CDE)" - #~ msgid "This session logs you into CDE" #~ msgstr "Esta sesión conécta-y en CDE" - #~ msgid "Run Xclient script" #~ msgstr "Executar script Xclient" - #~ msgid "This session runs the Xclients script" #~ msgstr "Esta sesión executa el script Xclient" - #~ msgid "" #~ "Failed to start the X server (your graphical interface). It is likely " #~ "that it is not set up correctly. You will need to log in on a console " @@ -1264,27 +1154,22 @@ #~ "Error al entamar el servidor X (la so interfaz gráfica). De xuru que nun " #~ "tá configuráu afayadizamente. Tendrá qu'entrar nuna consola y tornar a " #~ "configurar el servidor X. Depués resetee el GDM." - #~ msgid "" #~ "Would you like to try to configure the X server? Note that you will need " #~ "the root password for this." #~ msgstr "" #~ "¿Quier que tente configurar el servidor X? Necesitará la contraseña del " #~ "alministrador pa esto." - #~ msgid "Please type in the root (privileged user) password." #~ msgstr "Por favor, escriba la contraseña de root (usuariu con privilexos)." - #~ msgid "Trying to restart the X server." #~ msgstr "Tentando reaniciar el servidor X." - #~ msgid "" #~ "The X server is now disabled. Restart GDM when it is configured " #~ "correctly." #~ msgstr "" #~ "El servidor X agora ta desactiváu. Reanicie GDM cuando tea configuráu " #~ "correchamente." - #~ msgid "" #~ "Failed to start the X server (your graphical interface). It is likely " #~ "that it is not set up correctly. Would you like to view the X server " @@ -1293,10 +1178,8 @@ #~ "Error al entamar el servidor X (la so interfaz gráfica). De xuru que nun " #~ "tá configuráu afayadizamente. ¿Quier ver la salida del servidor X pa " #~ "diagnosticar el problema?" - #~ msgid "Would you like to view the detailed X server output as well?" #~ msgstr "¿Quier tamién ver la salida detallada del servidor X?" - #~ msgid "" #~ "Failed to start the X server (your graphical interface). It seems that " #~ "the pointer device (your mouse) is not set up correctly. Would you like " @@ -1305,14 +1188,12 @@ #~ "Error al entamar el servidor X (la su interfaz gráfica). Parez qu'el " #~ "preséu apuntador (el so mur) nun tá configuráu afayadizamente. ¿Quier ver " #~ "la salida del servidor X pa diagnosticar el problema?" - #~ msgid "" #~ "Would you like to try to configure the mouse? Note that you will need " #~ "the root password for this." #~ msgstr "" #~ "¿Quier intentar configurar el mur? Tenga en cuenta que pa ello necesitará " #~ "la contraseña de administrador (root)." - #~ msgid "" #~ "System has no Xclients file, so starting a failsafe xterm session. " #~ "Windows will have focus only if the mouse pointer is above them. To get " @@ -1321,7 +1202,6 @@ #~ "El sistema nun tien un archivu Xclients, así qu'entamose una sesión xterm " #~ "a prueba de fallos. Les ventanes namás tendrán el focu cuando alluegue'l " #~ "punteru del mur sobre elles. Pa colar d'esti móu escriba «exit» na ventana." - #~ msgid "" #~ "Failed to start the session, so starting a failsafe xterm session. " #~ "Windows will have focus only if the mouse pointer is above them. To get " @@ -1330,47 +1210,35 @@ #~ "Fallu al entamar la sesión, poro entamóse una sesión xterm a preba de " #~ "fallos. Les ventanes namás tendrán el focu cuando allugue'l punteru del " #~ "mur sobre ellas. Pa colar d'esti móu escriba «exit» na ventana." - #~ msgid "GNOME" #~ msgstr "GNOME" - #~ msgid "This session logs you into GNOME" #~ msgstr "Esta sesión conecta-y en GNOME" - #~ msgid "Secure Remote connection" #~ msgstr "Conexón Remota Segura" - #~ msgid "This session logs you into a remote host using ssh" #~ msgstr "Esta sesión conecta-y a un güéspede remotu emplegando ssh" - #~ msgid "" #~ "%s: Could not write new authorization entry. Possibly out of diskspace" #~ msgstr "" #~ "%s: Nun se pudo escribir un rexistru d'autorización nuevu. Posiblemente " #~ "nun hai espaciu nel discu." - #~ msgid "" #~ "GDM could not write a new authorization entry to disk. Possibly out of " #~ "diskspace.%s%s" #~ msgstr "" #~ "GDM nun foi pa escribir un rexistru d'autorización nuevu nel discu. " #~ "Posiblemente nun hai espaciu nel discu. %s%s" - #~ msgid "%s: Could not make new cookie file in %s" #~ msgstr "%s: Nun se pudo crear un nuevu archivu de cookie en %s" - #~ msgid "%s: Cannot safely open %s" #~ msgstr "%s: Nun se pue abrir con seguridá %s" - #~ msgid "%s: Could not open cookie file %s" #~ msgstr "%s: Nun se pudo abrir l'archivu cookie %s" - #~ msgid "%s: Could not lock cookie file %s" #~ msgstr "%s: Nun se pudo bloquear l'archivu cookie %s" - #~ msgid "%s: Ignoring suspiciously looking cookie file %s" #~ msgstr "%s Ignorando archivu cookie sospechosu %s" - #~ msgid "" #~ "The display server has been shut down about 6 times in the last 90 " #~ "seconds. It is likely that something bad is going on. Waiting for 2 " @@ -1379,41 +1247,30 @@ #~ "El servidor de pantallas foi paráu unas 6 vegaes nos postreros 90 " #~ "segundos. Ye probable que daqué té fallando. Va esperase de mientres 2 " #~ "minutos enantes d'intentalo otra vuelta na pantalla %s." - #~ msgid "%s: Cannot create pipe" #~ msgstr "%s: Nunse pue crear un pipe" - #~ msgid "%s: Failed forking GDM slave process for %s" #~ msgstr "%s: Falló al bifurcar el procesu esclavu de GDM pa %s" - #~ msgid "%s not a regular file!\n" #~ msgstr "%s nun ye un archivu normal.\n" - #~ msgid "" #~ "\n" #~ "... File too long to display ...\n" #~ msgstr "" #~ "\n" #~ "… Archivu demasiado grande p'amosar…\n" - #~ msgid "%s could not be opened" #~ msgstr "%s nun pudo abrise" - #~ msgid "%s: Cannot fork to display error/info box" #~ msgstr "%s: Nun pudo bifurcase p'amosar un diálogu d'error/información" - #~ msgid "Welcome" #~ msgstr "Bienveníu" - #~ msgid "Welcome to %n" #~ msgstr "Bienveníu a %n" - #~ msgid "%s: Priority out of bounds; changed to %d" #~ msgstr "%s: Prioridad fuera de márxenes; camudada a %d" - #~ msgid "%s: Empty server command; using standard command." #~ msgstr "%s: Comandu de servidor vacíu, usando unu habitual." - #~ msgid "" #~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " #~ "does not exist. Please correct GDM configuration and restart GDM." @@ -1421,7 +1278,6 @@ #~ "Estableciose'l direutoriu d'autorización del servidor (daemon/" #~ "ServAuthDir) en %s, pero nun esiste. Corrixa la configuración de GDM y " #~ "reinícielo." - #~ msgid "" #~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " #~ "is not a directory. Please correct GDM configuration and restart GDM." @@ -1429,53 +1285,42 @@ #~ "Estableciose'l direutoriu d'autorización del servidor (daemon/" #~ "ServAuthDir) a %s, pero esto nun ye un direutoriu. Corrixa la " #~ "configuración de GDM y reinícielo." - #~ msgid "%s: BaseXsession empty; using %s" #~ msgstr "%s: BaseXsession tá vacíu, usando %s" - #~ msgid "%s: Standard X server not found; trying alternatives" #~ msgstr "%s: Nun se atopó'l servidor X estándar, intentando alternatives" - #~ msgid "%s: No greeter specified." #~ msgstr "%s: Nun s'especificó la interfaz d'entrada." - #~ msgid "%s: No remote greeter specified." #~ msgstr "%s: Nun s' especificó la interfaz d'entrada remota." - #~ msgid "%s: No sessions directory specified." #~ msgstr "%s: Nun s'especificó'l direutoriu de sesiones." - #~ msgid "" #~ "%s: XDMCP was enabled while there is no XDMCP support; turning it off" #~ msgstr "" #~ "%s: Activóse XDMCP a pesar de nun esistir soporte XDMCP, desactivándolu" - #~ msgid "%s: XDMCP disabled and no static servers defined. Aborting!" #~ msgstr "" #~ "%s: XDMCP tá desactiváu y nun hai definíos servidores estáticos. " #~ "Detendráse." - #~ msgid "" #~ "%s: XDMCP disabled and no static servers defined. Adding %s on :%d to " #~ "allow configuration!" #~ msgstr "" #~ "%s: XDMCP tá desactiváu y nun hai definíos servidores estáticos. Amestase " #~ "%s en :%d pa permitir la configuración." - #~ msgid "" #~ "XDMCP is disabled and GDM cannot find any static server to start. " #~ "Aborting! Please correct the configuration and restart GDM." #~ msgstr "" #~ "XDMCP tá desactiváu y GDM nun pue atopar nengún servidor estáticu " #~ "qu'entamar. Detiense. Corrixa la configuración y reinicie GDM." - #~ msgid "" #~ "The GDM user '%s' does not exist. Please correct GDM configuration and " #~ "restart GDM." #~ msgstr "" #~ "L'usuariu de GDM «%s» nun esiste. Corrixa la configuración de GDM y " #~ "reinicie GDM." - #~ msgid "" #~ "The GDM user is set to be root, but this is not allowed since it can pose " #~ "a security risk. Please correct GDM configuration and restart GDM." @@ -1483,21 +1328,18 @@ #~ "Configuróse l'usuariu de GDM pa que seya root, pero esto nun tá permitíu " #~ "ya que ye un riesgu de seguridá. Corrixa la configuración de GDM y " #~ "reinicie GDM." - #~ msgid "" #~ "The GDM group '%s' does not exist. Please correct GDM configuration and " #~ "restart GDM." #~ msgstr "" #~ "Nun esiste'l grupu «%s» de GDM. Corrixa la configuración de GDM y reinicie " #~ "GDM." - #~ msgid "" #~ "The GDM group is set to be root, but this is not allowed since it can " #~ "pose a security risk. Please correct GDM configuration and restart GDM." #~ msgstr "" #~ "Configurose'l grupu GDM pa que seya root, esto nun tá permitíu ya que ye " #~ "un riesgu de seguridá. Corrixa la configuración de GDM y reinicie GDM." - #~ msgid "" #~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but is " #~ "not owned by user %d and group %d. Please correct the ownership or GDM " @@ -1506,7 +1348,6 @@ #~ "El direutoriu d'autorización de servidor (daemon/ServAuthDir) tá " #~ "establecíu como %s pero nun ye propiedá del usuariu %d y grupu %d. Por " #~ "favor, corrixa el propietariu o la configuración de GDM y reinície GDM." - #~ msgid "" #~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but has " #~ "the wrong permissions: it should have permissions of %o. Please correct " @@ -1515,30 +1356,22 @@ #~ "Establecióse'l direutoru d'autorización del servidor (daemon/ServAuthDir) " #~ "a %s, pero tien los permisos erróneos: debería tener los permisos de %o. " #~ "Corrixa los permisos o la configuración de GDM y reinicie GDM." - #~ msgid "%s: Could not bind socket" #~ msgstr "%s: Nun se pudo vincular al socket" - #~ msgid "%s: Could not open FIFO" #~ msgstr "%s: Nun se pudo abrir FIFO" - #~ msgid "Cannot write PID file %s: possibly out of diskspace. Error: %s\n" #~ msgstr "" #~ "Nun se pue escribir l'archivu del PID %s: posiblemente nun hai espaciu " #~ "nel disci. Error: %s\n" - #~ msgid "%s: fork () failed!" #~ msgstr "%s: ¡Falló fork ()!" - #~ msgid "%s: setsid () failed: %s!" #~ msgstr "%s: ¡Falló setsid(): %s!" - #~ msgid "%s: Trying failsafe X server %s" #~ msgstr "%s: Tentando sirvidor X %s a preba de fallos" - #~ msgid "%s: Running the XKeepsCrashing script" #~ msgstr "%s: Executando'l script XKeepsCrashing" - #~ msgid "" #~ "The X server (your graphical interface) cannot be started. It is likely " #~ "that it is not set up correctly. You will need to log in on a console " @@ -1547,144 +1380,105 @@ #~ "Nun se pue entamar el servidor X (la so interfaz gráfica). Probablemente " #~ "nun tá configuráu correutamente. Debería entrar nuna consola y volver a " #~ "executar el programa de configuración de X. Dempués reinicie GDM." - #~ msgid "" #~ "Failed to start X server several times in a short time period; disabling " #~ "display %s" #~ msgstr "" #~ "Asocedió un error al entamar el servidor X varies vegaes nun corto " #~ "períodu de tiempu; desautívase la pantalla %s" - #~ msgid "Master suspending..." #~ msgstr "Mayestru suspendiendo..." - #~ msgid "Master hibernating..." #~ msgstr "Mayestru ivernando..." - #~ msgid "System is restarting, please wait ..." #~ msgstr "El sistema ta reaniciando, espere por favor..." - #~ msgid "System is shutting down, please wait ..." #~ msgstr "El sistema ta apagándose, espere por favor..." - #~ msgid "Restarting computer..." #~ msgstr "Reaniciando l'ordenador..." - #~ msgid "custom_cmd: Custom command index %ld outside permitted range [0,%d)" #~ msgstr "" #~ "custom_cmd: Índiz personalizáu del comando %ld fuera del rangu permitíu[0," #~ "%d)" - #~ msgid "Executing custom command %ld with restart option..." #~ msgstr "Exjecutando comandu personalizáu %ld con opción de reinicio..." - #~ msgid "%s: Execution of custom command failed: %s" #~ msgstr "%s: La execución del comandu personalizáu falló: %s" - #~ msgid "Executing custom command %ld with no restart option ..." #~ msgstr "Executando comandu personalizáu %ld ensin opción de reinicio..." - #~ msgid "custom_cmd: forking process for custom command %ld failed" #~ msgstr "custom_cmd: falló la bifurcación pal comandu personalizáu %ld" - #~ msgid "custom_cmd: child %d returned %d" #~ msgstr "custom_cmd: el fíu %d devolvió %d" - #~ msgid "" #~ "Restart GDM, Restart machine, Suspend, Hibernate, or Halt request when " #~ "there is no system menu from display %s" #~ msgstr "" #~ "Reinicie GDM, Reinicie l'equipu, Suspender, Hibernar, o pedíu d'Apagáu " #~ "cuando nun hai menú del sistema de pantalla %s" - #~ msgid "" #~ "Restart GDM, Restart machine, Suspend, Hibernate, or Halt request from a " #~ "non-static display %s" #~ msgstr "" #~ "Reinicie GDM, Reinicie l'equipu, Suspender, Hibernar, o pedíu d'Apagáu " #~ "dende una pantalla non estática %s" - #~ msgid "%s: Aborting display %s" #~ msgstr "%s: Albuértase la pantalla %s" - #~ msgid "GDM restarting ..." #~ msgstr "GDM reaniciando..." - #~ msgid "main daemon: Got SIGABRT. Something went very wrong. Going down!" #~ msgstr "" #~ "serviciu principal: Algamóse SIGABRT. Daqué foi permal. ¡Nos caemos!" - #~ msgid "Do not fork into the background" #~ msgstr "Non bifurcar al segundu planu" - #~ msgid "No console (static) servers to be run" #~ msgstr "Nun hai servidores de consola (estáticas) pa executar" - #~ msgid "Alternative GDM System Defaults configuration file" #~ msgstr "" #~ "Archivu alternativu de configuración d'opciones por omisión del sistema " #~ "de GDM" - #~ msgid "CONFIGFILE" #~ msgstr "ARCHIVU-DE-CONFIGURACIÓN" - #~ msgid "Preserve LD_* variables" #~ msgstr "Preservar variables LD_*" - #~ msgid "Start the first X server but then halt until we get a GO in the fifo" #~ msgstr "" #~ "Entamar el primer sirvidor X y parase hasta que tengamos GO nel fifo" - #~ msgid "Can't open %s for writing" #~ msgstr "Nun se pudo abrir %s pa escritura" - #~ msgid "- The GNOME login manager" #~ msgstr "- El xestor d'entrada de GNOME" - #~ msgid "main options" #~ msgstr "opciones principales" - #~ msgid "%s: Error setting up %s signal handler: %s" #~ msgstr "%s: Error al configurar el remanador de la señal %s: %s" - #~ msgid "GDM already running. Aborting!" #~ msgstr "GDM ya tá executándose. ¡Albortando!." - #~ msgid "%s: Error setting up CHLD signal handler" #~ msgstr "%s: Error al configurar el remanador de la señal CHLD" - #~ msgid "DYNAMIC request denied: Not authenticated" #~ msgstr "Solicitú DYNAMIC denegada: Nun se autenticó" - #~ msgid "%s request denied: Not authenticated" #~ msgstr "Solicitú%s denegada: Nun se autenticó" - #~ msgid "Unknown server type requested; using standard server." #~ msgstr "" #~ "Desconócese'l tipu de servidor de la petición; usaráse'l servidor d'avezu." - #~ msgid "" #~ "Requested server %s not allowed to be used for flexible servers; using " #~ "standard server." #~ msgstr "" #~ "Al servidor solicitáu %s nun se-y permite usase pa servidores flexibles; " #~ "usaráse'l servidor d'avezu." - #~ msgid "y = Yes or n = No? >" #~ msgstr "¿y = Sí o n = Non? >" - #~ msgid "Could not setgid %d. Aborting." #~ msgstr "Nun se pudo facer setgid %d. Albortando." - #~ msgid "initgroups () failed for %s. Aborting." #~ msgstr "Falló initgroups() pa %s. Albortando." - #~ msgid "%s: Error setting signal %d to %s" #~ msgstr "%s: Asocedió un error al establecer la señal %d a %s" - #~ msgid "Can not start fallback console" #~ msgstr "Nun se pue entamar la consola alternativa" - #~ msgid "" #~ "There already appears to be an X server running on display %s. Should " #~ "another display number by tried? Answering no will cause GDM to attempt " @@ -1693,7 +1487,6 @@ #~ "Ya esste un servidor X n'execución na pantalla %s. ¿Quier intentar otro " #~ "númberu de pantalla? Si respuende non, GDM volverá a intentar entamar el " #~ "servidor en %s otra vuelta. %s" - #~ msgid "" #~ " (You can change consoles by pressing Ctrl-Alt plus a function key, such " #~ "as Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 " @@ -1702,62 +1495,45 @@ #~ " (Pue intercambiar consoles calcando Ctrl-Alt más una tecla de función, " #~ "asína como Ctrl-Alt-F7 pa dir a la consola 7. D'avezu los servidores X " #~ "execútanse na consola 7 ó superiores)." - #~ msgid "Display '%s' cannot be opened by nested display" #~ msgstr "La pantalla '%s' nun pue abrise pola pantalla añerada" - #~ msgid "Display %s is busy. There is another X server running already." #~ msgstr "La pantalla %s tá ocupada. Yá hai otru servidor X n'execución." - #~ msgid "%s: Cannot find a free display number" #~ msgstr "%s: nun se pue atopar un númberu de pantalla llibre" - #~ msgid "%s: Display %s busy. Trying another display number." #~ msgstr "%s: La pantalla %s tá ocupada. Intentando otru númberu de pantalla." - #~ msgid "Invalid server command '%s'" #~ msgstr "El comandu «%s» del servidor nun ye válidu" - #~ msgid "Server name '%s' not found; using standard server" #~ msgstr "Nun se atopó'l nome de servidor «%s», usaráse'l servidor davezu" - #~ msgid "%s: Xserver not found: %s" #~ msgstr "%s nun se atopó'l servidor X: %s" - #~ msgid "%s: Can't fork Xserver process!" #~ msgstr "%s: Nun ye posible crear un nuevu procesu Xserver." - #~ msgid "Can't set EGID to user GID" #~ msgstr "Nun se pue axustar EGID al GID del usuariu" - #~ msgid "Can't set EUID to user UID" #~ msgstr "Nun se pue axustar EUID al UID del usuariu" - #~ msgid "" #~ "You are already logged in. You can log in anyway, return to your " #~ "previous login session, or abort this login" #~ msgstr "" #~ "Ya entamó una sesión. Pue entrar de toes formes, tornar a la sesión " #~ "anterior, o albortar esti entamu de sesión" - #~ msgid "Return to previous login" #~ msgstr "Tornar a la sesión anterior" - #~ msgid "Abort login" #~ msgstr "Albortar conexón" - #~ msgid "" #~ "You are already logged in. You can log in anyway or abort this login" #~ msgstr "" #~ "Ya entamó sesión. Pue aniciar sesión de toes formes o albortar esti " #~ "entamu de sesión" - #~ msgid "%s: cannot fork" #~ msgstr "%s: nun pue biforcase" - #~ msgid "%s: cannot open display %s" #~ msgstr "%s: nun se pue abrir la pantalla %s" - #~ msgid "" #~ "Could not access configuration file (custom.conf). Make sure that the " #~ "file exists before launching login manager config utility." @@ -1765,7 +1541,6 @@ #~ "Nun se pudo acceder al archivu de configuración (custom.conf). Asegúrese " #~ "de que l'archivu esiste enantes d'exjecutar la utilidad de configuración " #~ "del xestor d'accesu." - #~ msgid "" #~ "Could not execute the configuration application. Make sure its path is " #~ "set correctly in the configuration file. Attempting to start it from the " @@ -1774,28 +1549,23 @@ #~ "Nun se pudo executar el programa de configuración. Asegúrese de que la " #~ "ruta seya correuta nel archivu de configuración. Intentaráse inicialo " #~ "dende'l so allugamientu predetermináu." - #~ msgid "" #~ "Could not execute the configuration application. Make sure its path is " #~ "set correctly in the configuration file." #~ msgstr "" #~ "Nun se pudo executar el programa de configuración. Asegúrese de que la " #~ "ruta seya correuta nel archivu de configuración." - #~ msgid "You must authenticate as root to run configuration." #~ msgstr "" #~ "Tien d'autenticase como alministrador (root) pa editar la configuración." - #~ msgid "" #~ "Login sound requested on non-local display or the play software cannot be " #~ "run or the sound does not exist." #~ msgstr "" #~ "Solicitóse un soníu d'entrada nuna pantalla non local o el software de " #~ "reproducción nun se pue executar o'l soníu nun esiste." - #~ msgid "%s: Can't init pipe to gdmgreeter" #~ msgstr "%s: Ye imposible entamar un tubu a gdmgreeter" - #~ msgid "" #~ "No servers were defined in the configuration file and XDMCP was " #~ "disabled. This can only be a configuration error. GDM has started a " @@ -1806,7 +1576,6 @@ #~ "desactivóse. Ésto namás pue ser un error de configuración. GDM entamó un " #~ "servidor únicu pa usté. Debería poder entrar y arreglar la configuración. " #~ "Recuerde que agora la entrada automática y temporizada tán desactivaes." - #~ msgid "" #~ "Could not start the regular X server (your graphical environment) and so " #~ "this is a failsafe X server. You should log in and properly configure " @@ -1815,31 +1584,26 @@ #~ "Nun se pudo entamar el servidor X habitual (el so entornu gráficu) polo " #~ "qu'esto ye un servidor X a preba de fallos. Deberá entrar y configurar el " #~ "servidor X afayaízamente." - #~ msgid "" #~ "The specified display number was busy, so this server was started on " #~ "display %s." #~ msgstr "" #~ "El númberu de pantalla especificáu taba ocupado, asina qu'esti servidor " #~ "entamóse na pantalla %s." - #~ msgid "" #~ "The greeter application appears to be crashing. Attempting to use a " #~ "different one." #~ msgstr "" #~ "Parez que la interfaz d'entrada se cae. Intentará usase una diferente." - #~ msgid "" #~ "%s: Cannot start greeter with gtk modules: %s. Trying without modules" #~ msgstr "" #~ "%s: nun se pue entamar la interfaz d'entrada con módulos gtk: %s. " #~ "Intentando sin módulos" - #~ msgid "%s: Cannot start greeter trying default: %s" #~ msgstr "" #~ "%s: nun se pue entamar la interfaz d'entrada, intentando col " #~ "predetermináu: %s" - #~ msgid "" #~ "Cannot start the greeter application; you will not be able to log in. " #~ "This display will be disabled. Try logging in by other means and editing " @@ -1848,88 +1612,68 @@ #~ "Nun se pudo entamar la interfaz d'entrada; nun se-y permitirá entamar una " #~ "sesión. Esta pantalla se desactivará. Intente acceder per otros medios y " #~ "editar l'archivu de configuración" - #~ msgid "%s: Error starting greeter on display %s" #~ msgstr "" #~ "%s: Asocedió un error al entamar la interfaz d'entrada na pantalla %s" - #~ msgid "%s: Can't fork gdmgreeter process" #~ msgstr "%s: Nun ye posible biforcar el procesu gdmgreeter" - #~ msgid "%s: Can't open fifo!" #~ msgstr "%s: ¡Nun se pue abrir fifo!" - #~ msgid "%s: Can't init pipe to gdmchooser" #~ msgstr "%s: Ye imposible entamar un tubu a gdmchooser" - #~ msgid "" #~ "Cannot start the chooser application. You will probably not be able to " #~ "log in. Please contact the system administrator." #~ msgstr "" #~ "Nun se pue entamar la aplicación de seleición. Probablemente nun podrá " #~ "acceder. Contacte col so alministrador del sistema." - #~ msgid "%s: Error starting chooser on display %s" #~ msgstr "%s: Asocedió un error al entamar el selector na pantalla %s" - #~ msgid "%s: Can't fork gdmchooser process" #~ msgstr "%s: Nun se pue bifurcar el proceso gdmchooser" - #~ msgid "%s: Could not open ~/.xsession-errors" #~ msgstr "%s: Nun se pudo abrir ~/.xsession-errors" - #~ msgid "%s: Execution of PreSession script returned > 0. Aborting." #~ msgstr "%s: La execución del script PreSessión devolvió > 0. Albortando." - #~ msgid "Language %s does not exist; using %s" #~ msgstr "La llingua %s nun esiste; usando %s" - #~ msgid "System default" #~ msgstr "Del sistema por omisión" - #~ msgid "%s: Could not setup environment for %s. Aborting." #~ msgstr "%s: Nun se pudo establecer l'entornu pa %s. Albortando." - #~ msgid "%s: setusercontext () failed for %s. Aborting." #~ msgstr "%s: Falló setusercontext() pa %s. Albortando." - #~ msgid "%s: Could not become %s. Aborting." #~ msgstr "%s: Nun se pudo convertir en %s. Albortando." - #~ msgid "" #~ "No Exec line in the session file: %s. Running the GNOME failsafe session " #~ "instead" #~ msgstr "" #~ "Nun hai nenguna llínia Exec nel archivu de sesión: %s. Executaráse una " #~ "sesión GNOME a preba de fallos nel so llugar." - #~ msgid "" #~ "%s: Cannot find or run the base Xsession script. Running the GNOME " #~ "failsafe session instead." #~ msgstr "" #~ "%s. Nun se pue atopar o executar el script Xsession básicu de sesión. " #~ "Intentaráse con una sesión a preba de fallos de GNOME nel so llugar." - #~ msgid "" #~ "Cannot find or run the base session script. Running the GNOME failsafe " #~ "session instead." #~ msgstr "" #~ "Nun se pue atopar o executar el script básicu de sesión. Intentaráse con " #~ "una sesión a preba de fallos de GNOME." - #~ msgid "" #~ "%s: gnome-session not found for a failsafe GNOME session, trying xterm" #~ msgstr "" #~ "%s: nun s'atopó gnome-session pa una sesión a preba de fallos de GNOME, " #~ "tentando con xterm" - #~ msgid "" #~ "Could not find the GNOME installation, will try running the \"Failsafe " #~ "xterm\" session." #~ msgstr "" #~ "Nun se pudo atopar la instalación de GNOME, intentaráse executar la " #~ "sesión «Xterm a preba de fallos»." - #~ msgid "" #~ "This is the Failsafe GNOME session. You will be logged into the " #~ "'Default' session of GNOME without the startup scripts being run. This " @@ -1938,12 +1682,10 @@ #~ "Esta ye la sesión GNOME a preba de fallos. Entrará a la sesión " #~ "«Predeterminada» de GNOME ensin executar scripts d'entamu. Esto namás " #~ "permite iguar problemes na so instalación." - #~ msgid "Cannot find \"xterm\" to start a failsafe session." #~ msgstr "" #~ "Nun se pudo atopar el programa «xterm» pa entamar una sesión a preba de " #~ "fallos." - #~ msgid "" #~ "This is the Failsafe xterm session. You will be logged into a terminal " #~ "console so that you may fix your system if you cannot log in any other " @@ -1954,7 +1696,6 @@ #~ "terminal pa que puea iguar el so sistema si nun pue acceder d'otru móu. " #~ "Pa colar de la ventana de terminal, escriba «exit» y calque Intro na " #~ "ventana." - #~ msgid "" #~ "This is the Failsafe xterm session. You will be logged into a terminal " #~ "console and be prompted to enter the password for root so that you may " @@ -1965,7 +1706,6 @@ #~ "terminal y se-y pedirá que meta la contraseña d'alministrador (root) pa " #~ "que puea iguar el so sistema si nun pue acceder d'otru móu. Pa colar del " #~ "emulador de terminal, teclee «exit» y calque Intro na ventana." - #~ msgid "" #~ "The failsafe session is restricted to users who have been assigned the " #~ "root role. If you cannot log in any other way please contact your system " @@ -1974,25 +1714,18 @@ #~ "La sesión a preba de fallos tá restringida a los usuarios que tienen " #~ "asignáu'l papel d'alministrador (root). Si nun pue entrar de cualquier " #~ "otra forma, contaute col so alministrador de sistemes" - #~ msgid "%s: User not allowed to log in" #~ msgstr "%s: L'usuariu nun tien permisu p'acceder" - #~ msgid "The system administrator has disabled your account." #~ msgstr "El administrador del sistema ha desactivado su cuenta." - #~ msgid "Error! Unable to set executable context." #~ msgstr "¡Error!. Nun se pue establecer el contestu executable." - #~ msgid "Cannot start the session due to some internal error." #~ msgstr "Nun se pudo entamar la sesión debíu a dalgunos errores internos." - #~ msgid "%s: User passed auth but getpwnam (%s) failed!" #~ msgstr "%s: L'usuariu pasó l'autenticación pero getpwnam (%s) falló." - #~ msgid "%s: Execution of PostLogin script returned > 0. Aborting." #~ msgstr "%s: La execución del script PostLogin devolvió > 0. Abórtase." - #~ msgid "" #~ "Your home directory is listed as: '%s' but it does not appear to exist. " #~ "Do you want to log in with the / (root) directory as your home directory? " @@ -2002,10 +1735,8 @@ #~ "¿Quier entamar una sesión col directoriu / (raigañu) como'l so directoriu " #~ "personal? Ye probable que nada furrule a nun ser qu'utilice una sesión a " #~ "preba de fallos." - #~ msgid "%s: Home directory for %s: '%s' does not exist!" #~ msgstr "%s: El directoriu personal pa %s: «%s» nun esiste." - #~ msgid "" #~ "User's $HOME/.dmrc file is being ignored. This prevents the default " #~ "session and language from being saved. File should be owned by user and " @@ -2017,7 +1748,6 @@ #~ "pertenecer al usuariu y tener los permisos 644. El directoriu personal " #~ "del usuariu debe pertenecer al usuariu y nun ser escribible pa otros " #~ "usuarios." - #~ msgid "" #~ "GDM could not write to your authorization file. This could mean that you " #~ "are out of disk space or that your home directory could not be opened for " @@ -2028,11 +1758,9 @@ #~ "que nun tien espaciu nel discu o que'l so directoriu personal nun se pudo " #~ "abrir pa escritura. En cualquier caso nun ye posible entamaar la sesión. " #~ "Contaute con l'alministrador del sistema" - #~ msgid "%s: Error forking user session" #~ msgstr "" #~ "%s: Asocedió un error al crear un nuevu procesu pala sesión del usuariu" - #~ msgid "" #~ "Your session only lasted less than 10 seconds. If you have not logged " #~ "out yourself, this could mean that there is some installation problem or " @@ -2043,32 +1771,24 @@ #~ "esto podría significar qu'hai dalgún error na instalación o que nun tien " #~ "espaciu nel discu. Intente entrar con dalguna de les sesiones a preba de " #~ "fallos pa ver si pue iguar esti problema." - #~ msgid "View details (~/.xsession-errors file)" #~ msgstr "Ver detalles (archivu ~/.xsession-errors)" - #~ msgid "GDM detected a halt or restart in progress." #~ msgstr "GDM detectó un apagáu o un reinicio en progresu." - #~ msgid "%s: Fatal X error - Restarting %s" #~ msgstr "%s: Asocedió un error fatal de X - Reiniciando %s" - #~ msgid "" #~ "Login sound requested on non-local display or the play software cannot be " #~ "run or the sound does not exist" #~ msgstr "" #~ "Solicitóse'l soníu d'entrada nuna pantalla non llocal, el software de " #~ "reproducción nun se pue executar o'l soníu nun esiste" - #~ msgid "%s: Failed starting: %s" #~ msgstr "%s: Falló la execución: %s" - #~ msgid "%s: Can't fork script process!" #~ msgstr "%s: nun ye posible biforcar el procesu del script." - #~ msgid "%s: Failed creating pipe" #~ msgstr "%s: Nun se pue crear un pipe" - #~ msgid "" #~ "\n" #~ "Incorrect username or password. Letters must be typed in the correct " @@ -2077,27 +1797,21 @@ #~ "\n" #~ "Nome d'usuariu o contraseña incorreutos. Fíxese nes mayúscules y " #~ "minúscules." - #~ msgid "Caps Lock is on." #~ msgstr "Les mayúscules tan activaes." - #~ msgid "Please enter your username" #~ msgstr "Por favor, introduza'l so nome d'usuariu" - #~ msgid "Password:" #~ msgstr "Contraseña:" - #~ msgid "The system administrator is not allowed to login from this screen" #~ msgstr "" #~ "Nun tá permitíu que l'alministrador del sistema acceda dende esta pantalla" - #~ msgid "" #~ "\n" #~ "The system administrator has disabled your account." #~ msgstr "" #~ "\n" #~ "L'alministrador del sistema desactivó la so cuenta." - #~ msgid "" #~ "\n" #~ "Cannot set your user group; you will not be able to log in. Please " @@ -2106,14 +1820,12 @@ #~ "\n" #~ "Nun se pudo establecer el so grupu d'usuariu, así que nun podrá entamar " #~ "sesión. Contaute col so alministrador del sistema." - #~ msgid "" #~ "You are required to change your password.\n" #~ "Please choose a new one." #~ msgstr "" #~ "Tien que camudar la contraseña. \n" #~ "Por favor, indique la so contraseña nueva." - #~ msgid "" #~ "\n" #~ "Cannot change your password; you will not be able to log in. Please try " @@ -2122,94 +1834,70 @@ #~ "\n" #~ "Nun se pudo camudar la so contraseña, asína que nun podrá entamar sesión. " #~ "Inténtelo más tarde o contaute col so alministrador del sistema." - #~ msgid "" #~ "Your password has been changed but you may have to change it again. " #~ "Please try again later or contact your system administrator." #~ msgstr "" #~ "Camudóse la so contraseña pero pue que la tenga que volver a camudar. " #~ "Inténtelo más tarde o contaute col so alministrador del sistema." - #~ msgid "" #~ "Your password has expired.\n" #~ "Only a system administrator can now change it" #~ msgstr "" #~ "La so contraseña caducó.\n" #~ "Agora sólo pue camudarla un alministrador del sistema" - #~ msgid "" #~ "An internal error occurred. You will not be able to log in.\n" #~ "Please try again later or contact your system administrator." #~ msgstr "" #~ "Asocedió un error internu, nun podrá entamar sesión.\n" #~ "Inténtelo más tarde o contaute col sl alministrador del sistema." - #~ msgid "You are required to change your password immediately (password aged)" #~ msgstr "Tien que camudar la so contraseña nel intre (contraseña caducada)" - #~ msgid "You are required to change your password immediately (root enforced)" #~ msgstr "" #~ "Fuisti requeríu pa camudar la clave inmediatamente (forzáu pol root)" - #~ msgid "Your account has expired; please contact your system administrator" #~ msgstr "" #~ "La to cuenta espiró; por favor, contauta col to alministrador del sistema" - #~ msgid "No password supplied" #~ msgstr "Nun s'especificó contraseña dala" - #~ msgid "Password unchanged" #~ msgstr "Clave non camudada" - #~ msgid "Can not get username" #~ msgstr "Non pudo garrase nome d'usuariu" - #~ msgid "Retype new UNIX password:" #~ msgstr "Reescribe la nueva clave UNIX" - #~ msgid "Enter new UNIX password:" #~ msgstr "Introduza la nueva clave UNIX" - #~ msgid "(current) UNIX password:" #~ msgstr "(actual) Clave UNIX:" - #~ msgid "Error while changing NIS password." #~ msgstr "Error al camudar la contraseñar NIS." - #~ msgid "You must choose a longer password" #~ msgstr "Tienes qu'escoyer una clave llarga" - #~ msgid "Password has been already used. Choose another." #~ msgstr "La clave ta n'usu. Escueya otra." - #~ msgid "You must wait longer to change your password" #~ msgstr "Debes esperar pa camudar la to clave" - #~ msgid "Sorry, passwords do not match" #~ msgstr "Siéntolo, les claves nun coinciden" - #~ msgid "Cannot setup pam handle with null display" #~ msgstr "Nun pue configurase el remanador pam con pantalles nules" - #~ msgid "Can't set PAM_TTY=%s" #~ msgstr "Nun pudo establecese PAM_TTY=%s" - #~ msgid "Can't set PAM_RHOST=%s" #~ msgstr "Nun pudo establecese PAM_RHOST=%s" - #~ msgid "Root login disallowed on display '%s'" #~ msgstr "Nun se permite entrar como alministrador en la pantalla «%s»" - #~ msgid "" #~ "\n" #~ "The system administrator is not allowed to login from this screen" #~ msgstr "" #~ "\n" #~ "Nun tá permitíu que l'alministrador del sistema acceda dende esta pantalla" - #~ msgid "Authentication token change failed for user %s" #~ msgstr "Camudó l'indicador d'autenticación pa l'usuariu %s" - #~ msgid "" #~ "\n" #~ "The change of the authentication token failed. Please try again later or " @@ -2218,13 +1906,10 @@ #~ "\n" #~ "Falló'l cambiuu del indicador d'autenticación. Inténtelo más tarde o " #~ "contaute col so alministrador del sistema." - #~ msgid "User %s no longer permitted to access the system" #~ msgstr "Ya nun se permite la entrada al sistema del usuariu %s" - #~ msgid "User %s not permitted to gain access at this time" #~ msgstr "Nésti momentu nun se permite acceder al usuariu %s" - #~ msgid "" #~ "\n" #~ "The system administrator has disabled access to the system temporarily." @@ -2232,114 +1917,84 @@ #~ "\n" #~ "L'alministrador del sistema desactivó temporalmente l'iniciu de sesión al " #~ "sistema." - #~ msgid "Couldn't set acct. mgmt for %s" #~ msgstr "Nun pude configurar la gestión de cuentes pa %s" - #~ msgid "Cannot set user group for %s" #~ msgstr "Nun se pudo establecer el grupo d'usuariu pa %s" - #~ msgid "Couldn't set credentials for %s" #~ msgstr "Nun se pudieron establecer les credenciales pa %s" - #~ msgid "Couldn't open session for %s" #~ msgstr "Nun se pudo abrir una sesión pa %s" - #~ msgid "" #~ "\n" #~ "Authentication failed. Letters must be typed in the correct case." #~ msgstr "" #~ "\n" #~ "Falló l'autentificación. Compruebe les lletres mayúscules y minúscules." - #~ msgid "" #~ "The system administrator has disabled your access to the system " #~ "temporarily." #~ msgstr "" #~ "L'alministrador del sistema desactivó temporalmente'l so accesu al " #~ "sistema." - #~ msgid "" #~ "Cannot set your user group; you will not be able to log in. Please " #~ "contact your system administrator." #~ msgstr "" #~ "Nun se pudo establecer el so grupu d'usuariu, asína que nun podrá entamar " #~ "sesión. Contaute col so alministrador del sistema." - #~ msgid "" #~ "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-" #~ "authfile %s': %s" #~ msgstr "" #~ "%s: Error al executar '%s --display %s --display-authfile %s --to %s --to-" #~ "authfile %s': %s" - #~ msgid "%s: No XDMCP support" #~ msgstr "%s: nun hai soporte pa XDMCP" - #~ msgid "Xnest command line" #~ msgstr "Llínia de comandos Xnest" - #~ msgid "STRING" #~ msgstr "CADENA" - #~ msgid "Extra options for Xnest" #~ msgstr "Opciones estra pa Xnest" - #~ msgid "OPTIONS" #~ msgstr "OPCIONES" - #~ msgid "Run in background" #~ msgstr "Executar en Segundu Planu" - #~ msgid "Just run Xnest, no query (no chooser)" #~ msgstr "Simplemente executar Xnest, ensin consulta (sin selector)" - #~ msgid "Do direct query instead of indirect (chooser)" #~ msgstr "Facer consulta direuta en vez d'indireuta (selector)" - #~ msgid "Run broadcast instead of indirect (chooser)" #~ msgstr "Executar difusión en vez d'indireuta (selector)" - #~ msgid "Don't check for running GDM" #~ msgstr "Nun comprobar si ya s'executa GDM" - #~ msgid "- Nested gdm login chooser" #~ msgstr "- Selector d'entrada gdm añeráu" - #~ msgid "Indirect XDMCP is not enabled" #~ msgstr "Nun tá activáu'l XDMCP indireutu" - #~ msgid "Please ask your system administrator to enable this feature." #~ msgstr "Pida al so alministrador de sistema qu'active esta carauterística." - #~ msgid "XDMCP is not enabled" #~ msgstr "XDMCP nun tá activáu" - #~ msgid "Please ask your system administrator to start it." #~ msgstr "Pida al so alministrador que lu entame." - #~ msgid "Please ask your system administrator to install it." #~ msgstr "Pida al so alministrador de sistema que lu instale." - #~ msgid "Please wait: scanning local network..." #~ msgstr "Espere un momentin: guetando na rede llocal…" - #~ msgid "No serving hosts were found." #~ msgstr "Nun s'atoparon equipos sirvidores." - #~ msgid "Choose a ho_st to connect to:" #~ msgstr "Escueya un _equipu pa coneutase:" - #~ msgid "" #~ "The host \"%s\" is not willing to support a login session right now. " #~ "Please try again later." #~ msgstr "" #~ "El equipo \"%s\" nun quier soportar una sesión d'entrada agora mesmo. " #~ "Inténtelo más tarde." - #~ msgid "Cannot connect to remote server" #~ msgstr "Nun foi a coneutase al servidor remotu" - #~ msgid "" #~ "Did not receive any response from host \"%s\" in %d seconds. Perhaps the " #~ "host is not turned on, or is not willing to support a login session right " @@ -2348,16 +2003,12 @@ #~ "Nun se recibió nenguna rempuesta dende l'equipu \"%s\" en %d segundos. " #~ "Quiciabes l'equipu nun tá prendíu, o nun quier soportar una sesión " #~ "d'entrada agora mesmo. Inténtelo más tarde." - #~ msgid "Did not receive response from server" #~ msgstr "Nun se recibió rempuesta del servidor" - #~ msgid "Cannot find the host \"%s\". Perhaps you have mistyped it." #~ msgstr "Nun se pue atopar l'anfitrión \"%s\". Quiciabes lo escrió mal." - #~ msgid "Cannot find host" #~ msgstr "Nun se pue atopar l'equipu" - #~ msgid "" #~ "The main area of this application shows the hosts on the local network " #~ "that have \"XDMCP\" enabled. This allows users to login remotely to other " @@ -2374,28 +2025,20 @@ #~ "Pue esplorar la red guetando equipos nuevos calcando \"Actualizar\". " #~ "Cuando seleicione un equipu calque \"Coneutar\" pa abrir una sesión nese " #~ "equipu." - #~ msgid "Socket for xdm communication" #~ msgstr "Socket pa comunicación xdm" - #~ msgid "SOCKET" #~ msgstr "SOCKET" - #~ msgid "Client address to return in response to xdm" #~ msgstr "Direición de cliente a devolver en rempuesta a xdm" - #~ msgid "ADDRESS" #~ msgstr "SEÑES" - #~ msgid "Connection type to return in response to xdm" #~ msgstr "Tipu de conexón a devolver en rempuesta a xdm" - #~ msgid "TYPE" #~ msgstr "TIPU" - #~ msgid "- gdm login chooser" #~ msgstr "- selector d'entrada gdm" - #~ msgid "" #~ "The chooser version (%s) does not match the daemon version (%s). You " #~ "have probably just upgraded GDM. Please restart the GDM daemon or the " @@ -2403,37 +2046,26 @@ #~ msgstr "" #~ "La versión del selector (%s) nun cuadra cola versión del demoniu (%s). " #~ "Probablemente acaba d'actualizar GDM. Reinicie'l demoniu GDM o l'equipu." - #~ msgid "Cannot run chooser" #~ msgstr "Nujn se pue executar el selector" - #~ msgid "A_dd host: " #~ msgstr "Ames_tar equipu: " - #~ msgid "C_onnect" #~ msgstr "C_oneutase" - #~ msgid "Exit the application" #~ msgstr "Colar de l'aplicación" - #~ msgid "Login Host Chooser" #~ msgstr "Selector del equipu d'entrada" - #~ msgid "Open a session to the selected host" #~ msgstr "Abrir una sesión nel equipu seleccionáu" - #~ msgid "Probe the network" #~ msgstr "Esplorar la red" - #~ msgid "Query and add this host to the above list" #~ msgstr "Consultar y amestar esti equipu a la lista d'enriba" - #~ msgid "Status" #~ msgstr "Estáu" - #~ msgid "_Add" #~ msgstr "_Amestar" - #~ msgid "" #~ "You might be using a different display manager, such as KDM (KDE Display " #~ "Manager), CDE login (dtlogin), or xdm. If you wish to use this feature, " @@ -2442,48 +2074,37 @@ #~ "Pue usar un xestor de pantalla distintu, como KDM (xestor de pantalla de " #~ "KDE), entamu de sesión CDE (dtlogin), o xdm. Si quier usar esta " #~ "carauterística, tien de configurar el so sistema pa usar GDM." - #~ msgid "Cannot communicate with GDM (The GNOME Display Manager)" #~ msgstr "Nun se pue comunicar con GDM (El xestor de pantalles de GNOME)" - #~ msgid "Perhaps you have an old version of GDM running." #~ msgstr "Quiciabes té executando una versión antigua de GDM." - #~ msgid "" #~ "Cannot communicate with GDM. Perhaps you have an old version running." #~ msgstr "" #~ "Nun se pue comunicar con GDM. Quiciabes té executando una versión antigua." - #~ msgid "The allowed limit of flexible X servers reached." #~ msgstr "Alcanzadóse'l llímite de servidores X flexibles permitidos." - #~ msgid "There were errors trying to start the X server." #~ msgstr "Asocedieron errores al intentar entamar el servidor X." - #~ msgid "The X server failed. Perhaps it is not configured well." #~ msgstr "El servidor X falló. Quiciabes nun tea bien configuráu." - #~ msgid "Too many X sessions running." #~ msgstr "Tán executándose demasiaes sesiones X." - #~ msgid "" #~ "The nested X server cannot connect to your current X server. You may be " #~ "missing an X authorization file." #~ msgstr "" #~ "El servidor X que se necesita nun coneuta col servidor d'anguaño X. Pudo " #~ "perder l'archivu d'autorización X." - #~ msgid "" #~ "The nested X server is not available, or GDM is badly configured.\n" #~ "Please install the Xnest package in order to use the nested login." #~ msgstr "" #~ "El servidor añeráu (Xnest) nun tá disponible, o GDM tá mal configuráu.\n" #~ "Instale'l paquete Xnest pa usar la entrada añerada." - #~ msgid "The X server is not available. GDM may be misconfigured." #~ msgstr "" #~ "El servidor X nun tá disponible. Probablemente GDM té mal configuráu." - #~ msgid "" #~ "Trying to set an unknown logout action, or trying to set a logout action " #~ "which is not available." @@ -2491,603 +2112,409 @@ #~ "Tá intentando establecese una acción de pieslle de sesión desconocida, o " #~ "intentóse establecer una acción de pieslle de sesión que nun tá " #~ "disponible." - #~ msgid "Virtual terminals not supported." #~ msgstr "Terminales virtuales non soportaes." - #~ msgid "Trying to change to an invalid virtual terminal number." #~ msgstr "Intentando camudar a un númberu de terminal virtual non válidu." - #~ msgid "Trying to update an unsupported configuration key." #~ msgstr "Tratando d'actualizar una clave de configuración non soportada." - #~ msgid "" #~ "You do not seem to have the authentication needed for this operation. " #~ "Perhaps your .Xauthority file is not set up correctly." #~ msgstr "" #~ "Al paecer nun tien l'autenticación necesaria pa esta operación. Quiciabes " #~ "el so archivu .Xauthority nun tá configuráu afayaizamente." - #~ msgid "Too many messages were sent to GDM and it hung up on us." #~ msgstr "Unviáronse demasiados mensaxes a GDM y colgóse." - #~ msgid "The accessibility registry was not found." #~ msgstr "Nun se atopó'l rexistru d'accesibilidá." - #~ msgid "The accessibility registry could not be started." #~ msgstr "Nun se pudo entamar el rexistru d'accesibilidá." - #~ msgid "%d second" #~ msgid_plural "%d seconds" #~ msgstr[0] "%d segundu" #~ msgstr[1] "%d segundos" - #~ msgid "Usage: %s [-b][-v] and one of the following:\n" #~ msgstr "Usu: %s [-b][-v] y unu de los siguientes:\n" - #~ msgid "\t-a display\n" #~ msgstr "\t-a pantalla\n" - #~ msgid "\t-r display\n" #~ msgstr "\t-r pantalla\n" - #~ msgid "\t-d display\n" #~ msgstr "\t-d pantalla\n" - #~ msgid "\t-l [server_name]\n" #~ msgstr "\t-l [nome_servidor]\n" - #~ msgid "\t-t maximum tries to connect (default 15)\n" #~ msgstr "\t-t másimos intentos pa coneutar (predetermináu 15)\n" - #~ msgid "\t-s sleep value (default 8)\n" #~ msgstr "\t-s valor d'espera (predetermináu 8)\n" - #~ msgid "Server busy, will sleep.\n" #~ msgstr "Servidor ocupáu, dormiráse.\n" - #~ msgid "" #~ "Connection to daemon failed, sleeping for %d seconds. Retry %d of %d\n" #~ msgstr "" #~ "Falló la conexón al demoniu, durmiendo durante %d segundos. Reintento %d " #~ "de %d\n" - #~ msgid "Failed to connect to server after %d retries\n" #~ msgstr "Falló al coneutar col servidor tres %d reintentos\n" - #~ msgid "New Login in a Window" #~ msgstr "Nuevu entamu de sesión en ventana" - #~ msgid "Send the specified protocol command to GDM" #~ msgstr "Unviar el comandu de protocolu especificáu a GDM" - #~ msgid "Xnest mode" #~ msgstr "Mou Xnest" - #~ msgid "Do not lock current screen" #~ msgstr "Nun bloquiar la pantalla d'anguañu" - #~ msgid "Authenticate before running --command" #~ msgstr "Autenticar enantes d'executar --comandu" - #~ msgid "Start new flexible session; do not show popup" #~ msgstr "Entamar una nueva sesión flexible, non amosar ventana emerxente" - #~ msgid "Cannot change display" #~ msgstr "Nun se pue camudar la pantalla" - #~ msgid "Nobody" #~ msgstr "Naide" - #~ msgid "Display %s on virtual terminal %d" #~ msgstr "Pantalla %s en terminal virtual %d" - #~ msgid "Nested display %s on virtual terminal %d" #~ msgstr "Pantalla añerada %s en terminal virtual %d" - #~ msgid "Open Displays" #~ msgstr "Abrir pantalles" - #~ msgid "_Open New Display" #~ msgstr "_Abrir una pantalla nueva" - #~ msgid "Change to _Existing Display" #~ msgstr "Camudar a una pantalla _esistente" - #~ msgid "" #~ "There are some displays already open. You can select one from the list " #~ "below or open a new one." #~ msgstr "" #~ "Ya hai dalgunes pantalles abiertes. Pue seleicionar una de la llista " #~ "inferior o abrir una nueva." - #~ msgid "Choose server" #~ msgstr "Escueya'l servidor" - #~ msgid "Choose the X server to start" #~ msgstr "Escueya'l servidor X que quier entamar" - #~ msgid "Standard server" #~ msgstr "Servidor estándar" - #~ msgid "Error: GDM (GNOME Display Manager) is not running." #~ msgstr "Error: GDM (xestor de pantalla de GNOME) nun tá n'execución." - #~ msgid "You might be using a different display manager." #~ msgstr "Pue usar un xestor de pantalla distintu." - #~ msgid "You do not seem to have the authentication needed for this operation" #~ msgstr "Al paecer nun tien l'autenticación necesaria pa esta operación" - #~ msgid "Perhaps your .Xauthority file is not set up correctly." #~ msgstr "" #~ "Quiciabes el so archivu .Xauthority nun té configuráu afayaizamente." - #~ msgid "You do not seem to be logged in on the console" #~ msgstr "Al paecer nun accedió a la consola" - #~ msgid "Starting a new login only works correctly on the console." #~ msgstr "" #~ "Entamar con un nuevu inicio de sesión sólo furrula afayaizamente na " #~ "consola." - #~ msgid "Log in as another user without logging out" #~ msgstr "Entrar como otru usuariu sin salir" - #~ msgid "New Login" #~ msgstr "Entamu de sesión nuevu" - #~ msgid "A-M|Afrikaans" #~ msgstr "A-M|Afrikaans" - #~ msgid "A-M|Albanian" #~ msgstr "A-M|Albanés" - #~ msgid "A-M|Amharic" #~ msgstr "A-M|Amhárico" - #~ msgid "A-M|Arabic (Egypt)" #~ msgstr "A-M|Árabe (Exiptu)" - #~ msgid "A-M|Arabic (Lebanon)" #~ msgstr "A-M|Árabe (Líbanu)" - #~ msgid "A-M|Arabic (Saudi Arabia)" #~ msgstr "A-M|Árabe (Arabia Saudí)" - #~ msgid "A-M|Armenian" #~ msgstr "A-M|Armeniu" - #~ msgid "A-M|Azerbaijani" #~ msgstr "A-M|Azerbaijanu" - #~ msgid "A-M|Basque" #~ msgstr "N-Z|Vascu" - #~ msgid "A-M|Belarusian" #~ msgstr "A-M|Bielorrusu" - #~ msgid "A-M|Bengali" #~ msgstr "A-M|Bengalí" - #~ msgid "A-M|Bengali (India)" #~ msgstr "A-M|Bengalí (India)" - #~ msgid "A-M|Bulgarian" #~ msgstr "A-M|Búlgaru" - #~ msgid "A-M|Bosnian" #~ msgstr "A-M|Bosniu" - #~ msgid "A-M|Catalan" #~ msgstr "A-M|Catalán" - #~ msgid "A-M|Chinese (China Mainland)" #~ msgstr "A-M|Chinu (China continental)" - #~ msgid "A-M|Chinese (Hong Kong)" #~ msgstr "A-M|Chinu (Hong Kong)" - #~ msgid "A-M|Chinese (Singapore)" #~ msgstr "A-M|Chinu (Singapur)" - #~ msgid "A-M|Chinese (Taiwan)" #~ msgstr "A-M|Chinu (Taiwan)" - #~ msgid "A-M|Croatian" #~ msgstr "A-M|Croata" - #~ msgid "A-M|Czech" #~ msgstr "A-M|Checu" - #~ msgid "A-M|Danish" #~ msgstr "A-M|Danés" - #~ msgid "A-M|Dutch" #~ msgstr "A-M|Holandés" - #~ msgid "A-M|Dutch (Belgium)" #~ msgstr "A-M|Holandés (Bélxica)" - #~ msgid "A-M|English (USA)" #~ msgstr "A-M|Inglés (EE. UU.)" - #~ msgid "A-M|English (Australia)" #~ msgstr "A-M|Inglés (Australia)" - #~ msgid "A-M|English (UK)" #~ msgstr "A-M|Inglés (Reinu Uníu)" - #~ msgid "A-M|English (Canada)" #~ msgstr "A-M|Inglés (Canadá)" - #~ msgid "A-M|English (Ireland)" #~ msgstr "A-M|Inglés (Irlanda)" - #~ msgid "A-M|English (Denmark)" #~ msgstr "A-M|Inglés (Dinamarca)" - #~ msgid "A-M|English (South Africa)" #~ msgstr "A-M|Inglés (Sudáfrica)" - #~ msgid "A-M|English (Malta)" #~ msgstr "A-M|Inglés (Malta)" - #~ msgid "A-M|English (New Zealand)" #~ msgstr "A-M|Inglés (Nueva Zelanda)" - #~ msgid "A-M|Estonian" #~ msgstr "A-M|Estoniu" - #~ msgid "A-M|Finnish" #~ msgstr "A-M|Finés" - #~ msgid "A-M|French" #~ msgstr "A-M|Francés" - #~ msgid "A-M|French (Belgium)" #~ msgstr "A-M|Francés (Bélxica)" - #~ msgid "A-M|French (Canada)" #~ msgstr "A-M|Francés (Canadá)" - #~ msgid "A-M|French (Luxembourg)" #~ msgstr "A-M|Francés (Luxemburgu)" - #~ msgid "A-M|French (Switzerland)" #~ msgstr "A-M|Francés (Suiza)" - #~ msgid "A-M|Galician" #~ msgstr "A-M|Gallegu" - #~ msgid "A-M|German" #~ msgstr "A-M|Alemán" - #~ msgid "A-M|German (Austria)" #~ msgstr "A-M|Alemán (Austria)" - #~ msgid "A-M|German (Luxembourg)" #~ msgstr "A-M|Alemán (Luxemburgu)" - #~ msgid "A-M|German (Switzerland)" #~ msgstr "A-M|Alemán (Suiza)" - #~ msgid "A-M|Greek" #~ msgstr "A-M|Griegu" - #~ msgid "A-M|Greek (Cyprus)" #~ msgstr "A-M|Griegu (Chipre)" - #~ msgid "A-M|Gujarati" #~ msgstr "A-M|Gujarati" - #~ msgid "A-M|Hebrew" #~ msgstr "A-M|Hebréu" - #~ msgid "A-M|Hindi" #~ msgstr "A-M|Hindi" - #~ msgid "A-M|Hungarian" #~ msgstr "A-M|Húngaru" - #~ msgid "A-M|Icelandic" #~ msgstr "A-M|Islandés" - #~ msgid "A-M|Indonesian" #~ msgstr "A-M|Indonesiu" - #~ msgid "A-M|Interlingua" #~ msgstr "A-M|Interllingua" - #~ msgid "A-M|Irish" #~ msgstr "A-M|Irlandés" - #~ msgid "A-M|Italian" #~ msgstr "A-M|Italianu" - #~ msgid "A-M|Japanese" #~ msgstr "A-M|Xaponés" - #~ msgid "A-M|Kannada" #~ msgstr "A-M|Kannada" - #~ msgid "A-M|Kinyarwanda" #~ msgstr "A-M|Kinyarwanda" - #~ msgid "A-M|Korean" #~ msgstr "A-M|Coreanu" - #~ msgid "A-M|Latvian" #~ msgstr "A-M|Letón" - #~ msgid "A-M|Lithuanian" #~ msgstr "A-M|Lituanu" - #~ msgid "A-M|Macedonian" #~ msgstr "A-M|Macedoniu" - #~ msgid "A-M|Malay" #~ msgstr "A-M|Malayu" - #~ msgid "A-M|Malayalam" #~ msgstr "A-M|Malayalam" - #~ msgid "A-M|Maltese" #~ msgstr "A-M|Maltés" - #~ msgid "A-M|Marathi" #~ msgstr "A-M|Marathí" - #~ msgid "A-M|Mongolian" #~ msgstr "A-M|Mongol" - #~ msgid "N-Z|Northern Sotho" #~ msgstr "N-Z|Sotho del norte" - #~ msgid "N-Z|Norwegian (bokmal)" #~ msgstr "N-Z|Noruegu (Bokmaal)" - #~ msgid "N-Z|Norwegian (nynorsk)" #~ msgstr "N-Z|Noruegu (Nynorsk)" - #~ msgid "N-Z|Oriya" #~ msgstr "N-Z|Oriya" - #~ msgid "N-Z|Punjabi" #~ msgstr "N-Z|Punjabi" - #~ msgid "N-Z|Persian" #~ msgstr "N-Z|Persa" - #~ msgid "N-Z|Polish" #~ msgstr "N-Z|Polacu" - #~ msgid "N-Z|Portuguese" #~ msgstr "N-Z|Portugués" - #~ msgid "N-Z|Portuguese (Brazilian)" #~ msgstr "N-Z|Portugués (Brasileñu)" - #~ msgid "N-Z|Romanian" #~ msgstr "N-Z|Rumanu" - #~ msgid "N-Z|Russian" #~ msgstr "N-Z|Rusu" - #~ msgid "N-Z|Serbian" #~ msgstr "N-Z|Serbiu" - #~ msgid "N-Z|Serbian (Serbia & Montenegro)" #~ msgstr "N-Z|Serbiu (Serbia y Montenegru)" - #~ msgid "N-Z|Serbian (Montenegro)" #~ msgstr "N-Z|Serbiu (Montenegru)" - #~ msgid "N-Z|Serbian (Serbia)" #~ msgstr "N-Z|Serbiu (Serbia)" - #~ msgid "N-Z|Serbian (Latin)" #~ msgstr "N-Z|Serbiu (Latinu)" - #~ msgid "N-Z|Serbian (Jekavian)" #~ msgstr "N-Z|Serbiu (Xekovinu)" - #~ msgid "N-Z|Serbian (Bosnia)" #~ msgstr "N-Z|Serbiu (Bosnia)" - #~ msgid "N-Z|Slovak" #~ msgstr "A-M|Eslovacu" - #~ msgid "N-Z|Slovenian" #~ msgstr "A-M|Eslovenu" - #~ msgid "N-Z|Spanish" #~ msgstr "A-M|Español" - #~ msgid "N-Z|Spanish (Argentina)" #~ msgstr "A-M|Español (Arxentina)" - #~ msgid "N-Z|Spanish (Bolivia)" #~ msgstr "A-M|Español (Bolivia)" - #~ msgid "N-Z|Spanish (Chile)" #~ msgstr "A-M|Español (Chile)" - #~ msgid "N-Z|Spanish (Colombia)" #~ msgstr "A-M|Español (Colombia)" - #~ msgid "N-Z|Spanish (Costa Rica)" #~ msgstr "A-M|Español (Costa Rica)" - #~ msgid "N-Z|Spanish (Ecuador)" #~ msgstr "A-M|Español (Ecuador)" - #~ msgid "N-Z|Spanish (Guatemala)" #~ msgstr "A-M|Español (Guatemala)" - #~ msgid "N-Z|Spanish (Mexico)" #~ msgstr "A-M|Español (Méxicu)" - #~ msgid "N-Z|Spanish (Nicaragua)" #~ msgstr "A-M|Español (Nicaragua)" - #~ msgid "N-Z|Spanish (Panama)" #~ msgstr "A-M|Español (Panamá)" - #~ msgid "N-Z|Spanish (Peru)" #~ msgstr "A-M|Español (Perú)" - #~ msgid "N-Z|Spanish (Paraguay)" #~ msgstr "A-M|Español (Paraguay)" - #~ msgid "N-Z|Spanish (El Salvador)" #~ msgstr "A-M|Español (El Salvador)" - #~ msgid "N-Z|Spanish (Uruguay)" #~ msgstr "A-M|Español (Uruguay)" - #~ msgid "N-Z|Spanish (Venezuela)" #~ msgstr "A-M|Español (Venezuela)" - #~ msgid "N-Z|Swedish" #~ msgstr "N-Z|Suecu" - #~ msgid "N-Z|Swedish (Finland)" #~ msgstr "N-Z|Suecu (Finlandia)" - #~ msgid "N-Z|Tamil" #~ msgstr "N-Z|Tamil" - #~ msgid "N-Z|Telugu" #~ msgstr "N-Z|Telugu" - #~ msgid "N-Z|Thai" #~ msgstr "N-Z|Tailandés" - #~ msgid "N-Z|Turkish" #~ msgstr "N-Z|Turcu" - #~ msgid "N-Z|Ukrainian" #~ msgstr "N-Z|Ucranianu" - #~ msgid "N-Z|Vietnamese" #~ msgstr "N-Z|Vietnamita" - #~ msgid "N-Z|Walloon" #~ msgstr "N-Z|Valón" - #~ msgid "N-Z|Welsh" #~ msgstr "A-M|Galés" - #~ msgid "N-Z|Xhosa" #~ msgstr "N-Z|Xhosa" - #~ msgid "N-Z|Yiddish" #~ msgstr "N-Z|Yidish" - #~ msgid "N-Z|Zulu" #~ msgstr "N-Z|Zulú" - #~ msgid "Other|POSIX/C English" #~ msgstr "Otros|Inglés POSIX/C" - #~ msgid "A-M" #~ msgstr "A-M" - #~ msgid "N-Z" #~ msgstr "N-Z" - #~ msgid "Last language" #~ msgstr "Cabera Llingua" - #~ msgid "System Default" #~ msgstr "Predetermináu del Sistema" - #~ msgid "Do you wish to make %s the default for future sessions?" #~ msgstr "¿Quier facer que %s seya predetermináu pa sesiones futures?" - #~ msgid "You have chosen %s for this session, but your default setting is %s." #~ msgstr "" #~ "Escoyó %s pa esta sesión, pero la so configuración predeterminada ye %s." - #~ msgid "Make _Default" #~ msgstr "Facela pre_determinada" - #~ msgid "Just For _This Session" #~ msgstr "Namás por es_ta sesión" - #~ msgid "Select a Language" #~ msgstr "Escoyeta de Llingua" - #~ msgid "Change _Language" #~ msgstr "Camudar _Llingua" - #~ msgid "_Select the language for your session to use:" #~ msgstr "E_scueya la llingua pa usar na so sesión:" - #~ msgid "the login screen" #~ msgstr "pantalla d'entrada" - #~ msgid "Do you wish to restart %s with the chosen language?" #~ msgstr "¿Quier reaniciar %s cola llingua escoyía?" - #~ msgid "You will restart %s with the %s locale." #~ msgstr "Reaniciará %s cola configuración rexonal %s." - #~ msgid "_Yes" #~ msgstr "_Sí" - #~ msgid "_No" #~ msgstr "_Non" - #~ msgid "Cannot run command '%s': %s." #~ msgstr "Nun se pue executar el comand '%s': %s." - #~ msgid "Cannot start background application" #~ msgstr "Nun se pue entamar el programa en segundu planu" - #~ msgid "User %u will login in %t" #~ msgstr "L'usuariu %u entamará una sesión en %t" - #~ msgid "Are you sure you want to restart the computer?" #~ msgstr "¿De xuru que quier reaniciar l'equipu?" - #~ msgid "_Restart" #~ msgstr "_Reaniciar" - #~ msgid "Are you sure you want to Shut Down the computer?" #~ msgstr "¿De xuru que quier apagar l'equipu?" - #~ msgid "Are you sure you want to suspend the computer?" #~ msgstr "¿De xuru que quier suspender l'equipu?" - #~ msgid "Are you sure you want to hibernate the computer?" #~ msgstr "¿De xuru que quier hibernar l'equipu?" - #~ msgid "_Hibernate" #~ msgstr "_Ivernar" - #~ msgid "_Username:" #~ msgstr "_Usuariu:" - #~ msgid "%s session selected" #~ msgstr "Sesión %s seleicionada" - #~ msgid "_Last" #~ msgstr "_Caberu" - #~ msgid "Select _Language..." #~ msgstr "Escoyeta de _Llingua..." - #~ msgid "_Password:" #~ msgstr "_Contraseña:" - #~ msgid "Your preferred session type %s is not installed on this computer." #~ msgstr "El so tipu de sesión preferida, %s, nun tá instaláu nesti equipu." - #~ msgid "You have chosen %s for this session" #~ msgstr "Escoyó %s pa esta sesión" - #~ msgid "" #~ "If you wish to make %s the default for future sessions, run the " #~ "'switchdesk' utility (System->Desktop Switching Tool from the panel menu)." @@ -3095,28 +2522,20 @@ #~ "Si quier que %s sea la sesión predeterminada dende d'agora,execute la " #~ "utilidad «switchdesk»(Sistema⇨Ferramienta de camudar d'Escritoriu del menú " #~ "del panel)." - #~ msgid "Please insert 25 cents to log in." #~ msgstr "Inserte 25 céntimos pa entrar." - #~ msgid "Finger" #~ msgstr "Déu" - #~ msgid "GDM Login" #~ msgstr "Aniciu de sesión GDM" - #~ msgid "_Configure Login Manager..." #~ msgstr "_Configurar el xestor d'entrada…" - #~ msgid "_Actions" #~ msgstr "A_iciones" - #~ msgid "_Theme" #~ msgstr "_Tema" - #~ msgid "D_isconnect" #~ msgstr "D_esconeutar" - #~ msgid "" #~ "The greeter version (%s) does not match the daemon version. You have " #~ "probably just upgraded GDM. Please restart the GDM daemon or the computer." @@ -3124,10 +2543,8 @@ #~ "La versión de la interfaz d'entrada (%s) nun cuadra cola versión del " #~ "servicio. Probablemente acaba d'actualizar GDM. Reinicie'l serviciu GDM o " #~ "l'equipu." - #~ msgid "Cannot start the greeter" #~ msgstr "Nun se pue entamar la interfaz d'entrada" - #~ msgid "" #~ "The greeter version (%s) does not match the daemon version (%s). You " #~ "have probably just upgraded GDM. Please restart the GDM daemon or the " @@ -3136,16 +2553,12 @@ #~ "La versión de la interfaz d'entrada (%s) nun cuadracon la versión del " #~ "serviciu (%s). Probablemente acaba d'actualizar GDM. Reinicie'l serviciu " #~ "GDM o l'equipu." - #~ msgid "Restart GDM" #~ msgstr "Reaniciar GDM" - #~ msgid "Restart computer" #~ msgstr "Reaniciar l'equipu" - #~ msgid "Session directory is missing" #~ msgstr "Falta'l directoriu de sesiones" - #~ msgid "" #~ "Your session directory is missing or empty! There are two available " #~ "sessions you can use, but you should log in and correct the GDM " @@ -3154,10 +2567,8 @@ #~ "El to directoriu de sesiones falta o tá vacíu. Hai dos sesiones " #~ "disponibles que pue usar, pero debería entrar ya iguar la configuración " #~ "de GDM." - #~ msgid "Configuration is not correct" #~ msgstr "La configuración nun ye afayaíza" - #~ msgid "" #~ "The configuration file contains an invalid command line for the login " #~ "dialog, so running the default command. Please fix your configuration." @@ -3165,40 +2576,29 @@ #~ "L'archivu de configuración contien una llínia de comandi non válida pa'l " #~ "diálogu d'entrada, executaráse'l comandu predetermináu. Igue la so " #~ "configuración." - #~ msgid "File %s cannot be opened for writing." #~ msgstr "L'archivu %s nun se pue abrir pa escritura." - #~ msgid "Cannot open file" #~ msgstr "Nun se pue abrir l'archivu" - #~ msgid "Images" #~ msgstr "Imaxes" - #~ msgid "All Files" #~ msgstr "Tolos Ficheros" - #~ msgid "" #~ "Change the picture that will show in the GDM (login manager) face browser" #~ msgstr "" #~ "Camudar la imaxe qu'amosarase nel visor de rostros de GDM (xestor " #~ "d'entrada)" - #~ msgid "Login Photo" #~ msgstr "Foto d'entrada" - #~ msgid "User Image" #~ msgstr "Imaxe del usuariu" - #~ msgid "Login Photo Preferences" #~ msgstr "Preferencies de la foto d'entrada" - #~ msgid "Failsafe _GNOME" #~ msgstr "_GNOME a preba de fallos" - #~ msgid "Failsafe GNOME" #~ msgstr "GNOME a preba de fallos" - #~ msgid "" #~ "This is a failsafe session that will log you into GNOME. No startup " #~ "scripts will be read and it is only to be used when you can't log in " @@ -3207,13 +2607,10 @@ #~ "Esto ye una sesión a preba de fallos que-y permitirá entrar a Gnome. Nun " #~ "se lleerán scripts d'entamu y namás tien d'usase cuando nun pue entrar de " #~ "nengún otru móu. Gnome utilizará la sesión «Predeterminada»." - #~ msgid "Failsafe _Terminal" #~ msgstr "_Terminal a preba de fallos" - #~ msgid "Failsafe Terminal" #~ msgstr "Terminal a preba de fallos" - #~ msgid "" #~ "This is a failsafe session that will log you into a terminal. No startup " #~ "scripts will be read and it is only to be used when you can't log in " @@ -3223,56 +2620,42 @@ #~ "de terminal. Nun se lleerán scripts d'entamu y namás tien d'usase si nun " #~ "pue acceder d'otru móu. Pa salir de la ventana de terminal, escriba «exit» " #~ "y calque Intro na ventana." - #~ msgid "" #~ "An error occurred while trying to contact the login screens. Not all " #~ "updates may have taken effect." #~ msgstr "" #~ "Asocedió un error al contactar coles pantalles d'entrada. Pue que nun " #~ "tuvieren efeutu toles actualizaciones." - #~ msgid "Users include list modification" #~ msgstr "Modificación de la llista d'inclusión d'usuarios" - #~ msgid "" #~ "Some of the users in the Include list (Users tab) now have uid lower than " #~ "MinimalUID and will be removed." #~ msgstr "" #~ "Algunos de los usuarios na llista d'Inclusión (Solapa d'usuarios) anguañu " #~ "tienen un uid menor que MinimalUID y sedrán desaniciaos." - #~ msgid "Themed" #~ msgstr "Temáticu" - #~ msgid "Themed with face browser" #~ msgstr "Decoráu con amosador de cares" - #~ msgid "Plain" #~ msgstr "Plano" - #~ msgid "Plain with face browser" #~ msgstr "Llisu con amosador de cares" - #~ msgid "Autologin or timed login to the root account is forbidden." #~ msgstr "" #~ "Nun se permite la entrada temporizada o automática pala cuenta " #~ "d'alministración (root)." - #~ msgid "The \"%s\" user UID is lower than allowed MinimalUID." #~ msgstr "El UID del usuario \"%s\" ye menor que'l MinimalUID permitíu." - #~ msgid "User not allowed" #~ msgstr "Usuariu non permitíu" - #~ msgid "(Enabled)" #~ msgstr "(Activáu)" - #~ msgid "(Disabled)" #~ msgstr "(Desactiváu)" - #~ msgid "No themes selected!" #~ msgstr "Nun hai ficheru esbilláu" - #~ msgid "" #~ "You need one or more themes selected for the \"Random from selected\" " #~ "option to be valid. Failure to do so will force \"Selected only\" mode." @@ -3280,122 +2663,87 @@ #~ "Necesita unu o más temes esbillaos pa que sea válida la opción " #~ "\"Aleatoriu de los seleccionados\". Si falla al facer esto forzará'l móu " #~ "\"Sólo esbillaos\"." - #~ msgid "Apply changes to the modified command?" #~ msgstr "¿Quier aplicar los cambeos al comanduo modificáu?" - #~ msgid "If you don't apply, the changes will be discarded." #~ msgstr "Si nun aplica, los cambeos descartaránse." - #~ msgid "Autologin or timed login to the root account is not allowed." #~ msgstr "" #~ "Nun se permite la entrada temporizada o automática pala cuenta " #~ "d'alministración (root)." - #~ msgid "The \"%s\" user already exists in the include list." #~ msgstr "L'usuariu \"%s\" ya esiste na llista d'inclusión." - #~ msgid "Cannot add user" #~ msgstr "Nun se pudo amestar al usuariu" - #~ msgid "The \"%s\" user already exists in the exclude list." #~ msgstr "L'usuariu \"%s\" ya esiste na llista d'esclusión." - #~ msgid "The \"%s\" user does not exist." #~ msgstr "L'usuariu \"%s\" nun esiste." - #~ msgid "Invalid command path" #~ msgstr "Ruta de comandu no válida" - #~ msgid "" #~ "The path you provided for this command is not valid. The changes will not " #~ "be saved." #~ msgstr "" #~ "La ruta que proporcionó pa esti comandu nun ye válida. Los cambeos nun se " #~ "guardarán." - #~ msgid "" #~ "Some of the users had uid lower than MinimalUID (Security tab) and could " #~ "not be added." #~ msgstr "" #~ "Dellos de los usuarios teníen uid menor que MinimalUID (Solapa de " #~ "Seguridad) y nun pudieron ser amostaos." - #~ msgid "Select Command" #~ msgstr "Seleicione'l comandu" - #~ msgid "No file selected" #~ msgstr "Nun hai ficheru esbilláu" - #~ msgid "Apply the changes to commands before closing?" #~ msgstr "¿Quier aplicar los cambeos a los comandos enantes de pesllar?" - #~ msgid "If you don't apply, the changes made will be disregarded." #~ msgstr "Si nun aplica, los cambeos descartaránse." - #~ msgid "Close _without Applying" #~ msgstr "Pesllar_ensin aplicar" - #~ msgid "Halt command" #~ msgstr "Comandu d'Apagaú" - #~ msgid "Reboot command" #~ msgstr "Comandu de Reiniciu" - #~ msgid "Suspend command" #~ msgstr "Comandi de Suspensión" - #~ msgid "Hibernate command" #~ msgstr "Comandu d'hibernación" - #~ msgid "Sounds" #~ msgstr "Soníos" - #~ msgid "None" #~ msgstr "Dengún" - #~ msgid "Archive is not of a subdirectory" #~ msgstr "L'archivu nun ye d'un subdirectoriu" - #~ msgid "Archive is not of a single subdirectory" #~ msgstr "L'archivu nun ye d'un solu subdirectoriu" - #~ msgid "File not a tar.gz or tar archive" #~ msgstr "El ficheru nun ye un archivu tar.gz o tar" - #~ msgid "Archive does not include a GdmGreeterTheme.info file" #~ msgstr "L'archivu nun inclui un ficheru GdmGreeterTheme.info" - #~ msgid "File does not exist" #~ msgstr "El ficheru nun esiste" - #~ msgid "%s" #~ msgstr "%s" - #~ msgid "Not a theme archive" #~ msgstr "Nun ye un archivu de tema" - #~ msgid "" #~ "Theme directory '%s' seems to be already installed. Install again anyway?" #~ msgstr "" #~ "El directoriu del tema '%s' parez que ya tá instaláu. ¿Quier volver a " #~ "instalalo?" - #~ msgid "Some error occurred when installing the theme" #~ msgstr "Asocedió dalgún error al instalar el tema" - #~ msgid "Select Theme Archive" #~ msgstr "Escueya Archivu de Tema" - #~ msgid "_Install" #~ msgstr "_Instalar" - #~ msgid "Theme archives" #~ msgstr "Archivos de temes" - #~ msgid "Theme active in \"Selected only\" mode" #~ msgstr "Tema activu en móu \"Sólo seleicionáu\"" - #~ msgid "" #~ "This theme cannot be deleted at this point. If you wish to delete this " #~ "theme switch to \"Selected only\" mode, and deselect it by choosing a " @@ -3403,22 +2751,16 @@ #~ msgstr "" #~ "Esti tema nin se pue desaniciar agora. Si quier borrar esti tema camude a " #~ "móu \"Sólo seleicionáu\", y deseleiciónelu escoyendo un tema diferente." - #~ msgid "Remove the \"%s\" theme?" #~ msgstr "¿Quier quitar el tema \"%s\"?" - #~ msgid "If you choose to remove the theme, it will be permanently lost." #~ msgstr "Si escueyi desaniciar el tema, perderáse dafechu." - #~ msgid "_Remove Theme" #~ msgstr "_Quitar tema" - #~ msgid "Install the theme from '%s'?" #~ msgstr "¿Quier instalar el tema dende '%s'?" - #~ msgid "Select install to add the theme from the file '%s'." #~ msgstr "Escueya instalar p'amestar el tema dende l'archivu '%s'." - #~ msgid "" #~ "This configuration window changes settings for the GDM daemon, which is " #~ "the graphical login screen for GNOME. Changes that you make will take " @@ -3439,55 +2781,41 @@ #~ "\n" #~ "Pa más información acuda a la estaya \"Escritoriu\" del navegador d'ayuda " #~ "de GNOME." - #~ msgid "auto" #~ msgstr "auto" - #~ msgid "yes" #~ msgstr "sí" - #~ msgid "no" #~ msgstr "non" - #~ msgid "Random theme mode change" #~ msgstr "Cambiu a móu de tema al debalu" - #~ msgid "" #~ "Since no themes were selected in random theme mode switching back to " #~ "single theme mode." #~ msgstr "" #~ "Debido a que nun s'escoyó denngún tema nel móu de tema al debalu, " #~ "tornaráse al móu de tema único." - #~ msgid "Apply the changes to users before closing?" #~ msgstr "¿Quier aplicar los cambeos a los usuarios enantes de pesllar?" - #~ msgid "" #~ "If you don't apply, the changes made on the Users tab will be disregarded." #~ msgstr "Si nun aplica, los cambeos fechos na solapa Usuarios inoraránse." - #~ msgid "Could not access configuration file (defaults.conf)" #~ msgstr "Nun se pudo acceder al archivu de configuración (defaults.conf)" - #~ msgid "" #~ "Make sure that the file exists before launching login manager config " #~ "utility." #~ msgstr "" #~ "Asegúrese de que l'archivu esista enantes d'entamar la utilidad de " #~ "configuración del xestor d'accesu." - #~ msgid "Could not access configuration file (custom.conf)" #~ msgstr "Nun se pudo acceder al archivu de configuración (custom.conf)" - #~ msgid "You must be the root user to configure GDM." #~ msgstr "Tienes de ser usuariu root pa configurar GDM" - #~ msgid "Configure GDM login window appearance and behavior" #~ msgstr "Configure l'aspeutu y comportamientu de la pantalla d'entrada" - #~ msgid "%n will be replaced by hostname" #~ msgstr "%n reemplazaráse pol nome del equipu" - #~ msgid "" #~ "Note: Users in the Include list will appear in the face browser " #~ "if enabled and will appear in the user drop-down lists for automatic and " @@ -3501,7 +2829,6 @@ #~ "na llista Excluir nun apaecerán. L'axuste MinimalUID na solapa de " #~ "seguridá afectará a qué usuarios se-ys permitirá unise a la llista " #~ "Incluir." - #~ msgid "" #~ "Note: You can select different commands from the drop-down list, " #~ "and modify them through relevant fields located below. To save changes " @@ -3510,7 +2837,6 @@ #~ "Nota: Pue escoyer distintos comandos de la llista estenderexable, " #~ "y camudalos a través de los campos relevantes allugaos embaxu. Pa guardar " #~ "los cambeos calque'l botón «Aplicar cambios al comandu»." - #~ msgid "" #~ "Warning: Incorrect settings could prevent the X server from " #~ "restarting. Changes to these settings will not take effect until GDM is " @@ -3519,31 +2845,22 @@ #~ "Adlvertencia: Axustes incorreutos puen impedir que'l sirvidor X " #~ "se reanicie. Los cambeos nestos axustes nun tendrán efeutu hasta que GDM " #~ "se reanicie." - #~ msgid "A_dd..." #~ msgstr "A_mestar…" - #~ msgid "A_llow remote system administrator login" #~ msgstr "_Permitir entrada remota al alministrador del sistema" - #~ msgid "A_pply User Changes" #~ msgstr "A_plicar los cambeos del usuariu" - #~ msgid "Accessibility" #~ msgstr "Accesibilidá" - #~ msgid "Accessible from the outside of the login manager" #~ msgstr "Accesible dende fuera del xestor d'accesu" - #~ msgid "Add / Modify Servers To Start" #~ msgstr "Amestar/Camudar servidores qu'entamar" - #~ msgid "Add S_erver..." #~ msgstr "Amestar_servidor…" - #~ msgid "Add User" #~ msgstr "Amestar usuariu" - #~ msgid "" #~ "Adds a chooser button to the Actions menu that will restart the current X " #~ "server with a chooser. XDMCP does not need to be enabled on the local " @@ -3552,17 +2869,14 @@ #~ "Amesta un botón de selector al menú «Aiciones» que reaniciará'l sirvidor X " #~ "actual con un seleutor. Nun se necesita activar XDMCP nel equipu llocal " #~ "pa qu'esto furrule." - #~ msgid "" #~ "All users with a lower UID will be excluded from the face browser, " #~ "automatic and timed login." #~ msgstr "" #~ "Tolos usuarios con un UID menor escartaránse del visor de rostros, y de " #~ "les entraes automátiques y temporizaes." - #~ msgid "Allo_w remote timed logins" #~ msgstr "Permitir entraes remotes _temporizaes" - #~ msgid "" #~ "Allow changing the GTK+ (widget) theme from the greeter. Currently this " #~ "only affects the standard greeter. The theme will stay in effect on this " @@ -3573,24 +2887,19 @@ #~ "sólo afecta al interfaz estándar. El tema tará n'efeuto nesta pantalla " #~ "hasta que se camude y afectará a les demás ventanes que tén controlaes " #~ "por GDM." - #~ msgid "Allow group writable files and directories." #~ msgstr "Permitir archivos y directorios escribibles pol grupu." - #~ msgid "Allow logi_n if group write permissions on user's home directory" #~ msgstr "" #~ "Permitir l'a_niciu si hai permisu d'escritura pal grupu nel direutoriu " #~ "home del usuariu" - #~ msgid "Allow login _if all write permissions on user's home directory" #~ msgstr "" #~ "Permitir l'aniciu s_i hai permisu d'escritura universal nel direutoriu " #~ "home del usuariu" - #~ msgid "Allow world writable files and directories." #~ msgstr "" #~ "Autorizar el permisu d'escritura universal pa archivos y direutorios" - #~ msgid "" #~ "Always append -nolisten tcp to the command line of local X servers, thus " #~ "disallowing TCP connection. This is useful if you do not care for " @@ -3604,74 +2913,55 @@ #~ "permitir conexones remotes, desque'l protocolu X puede ser un peligru " #~ "potencial pa la seguridá si queda abiertu, anque nun esistan problemes de " #~ "seguridá conocíos. Tamién desactiva X forwarding, pero nun afeuta a XDMCP." - #~ msgid "Apply Co_mmand Changes" #~ msgstr "Aplicar Ca_mbéos d'Ordes" - #~ msgid "Author:" #~ msgstr "Autor:" - #~ msgid "Background" #~ msgstr "Fondu de pantalla" - #~ msgid "Background color of the greeter." #~ msgstr "Color de fondu pa la entrada." - #~ msgid "Behaviour" #~ msgstr "Comportamientu" - #~ msgid "C_ommand:" #~ msgstr "_Orde:" - #~ msgid "C_ustom:" #~ msgstr "Personalizá_u:" - #~ msgid "" #~ "Checks the ownership of the home directories before writing to them. This " #~ "prevents security issues in case of bad setup." #~ msgstr "" #~ "Compreba la propiedá de los direutorios home enantes d'escribir nellos. " #~ "Esto previén problemes de seguridá en casu de mala configuración." - #~ msgid "Co_lor:" #~ msgstr "Co_lor:" - #~ msgid "Color depth:" #~ msgstr "Profundidá de la color" - #~ msgid "Comma_nd type:" #~ msgstr "Tipu de coma_ndu:" - #~ msgid "Configure XDMC_P..." #~ msgstr "Configurar XDMC_P..." - #~ msgid "Configure _X Server..." #~ msgstr "Configurar Sirvidor _X..." - #~ msgid "" #~ "Controls which text to display next to the logo image in the greeter for " #~ "remote XDMCP sessions." #~ msgstr "" #~ "Controla qué testu se amuesa al lláu de la imaxe del logotipu nel " #~ "interfaz pales sesiones remotes XDMCP." - #~ msgid "" #~ "Controls which text to display next to the logo image in the standard " #~ "greeter. This string is only used for local logins." #~ msgstr "" #~ "Controla qué testu se amuesa al lláu de la imaxe del logotipu nel " #~ "interfaz estándar. Esta cadena úsase sólo pa entraes llocales." - #~ msgid "Copyright:" #~ msgstr "Copyright:" - #~ msgid "De_fault session:" #~ msgstr "Sesión _predeterminada:" - #~ msgid "Delay in seconds before the Timed login user will be logged in." #~ msgstr "" #~ "Retrasu en segundos enantes de qu'entre l'usuariu d'entrada temporizada." - #~ msgid "" #~ "Determines the maximum number of remote display connections which will be " #~ "managed simultaneously. I.e. the total number of remote displays that can " @@ -3680,7 +2970,6 @@ #~ "Determina'l númberu máximu de conexones de pantalles remotes que " #~ "xestionaránse a ún tiempu. Por exemplu, el númberu de pantalles remotes " #~ "totales que pue usar el so host." - #~ msgid "" #~ "Determines the maximum number of seconds between the time where a user " #~ "chooses a host and the subsequent indirect query where the user is " @@ -3692,41 +2981,30 @@ #~ "elixe un host y la consulta subsiguiente onde el usuariu conectase al " #~ "host. Cuando'l tiempu se pasa, la información al rodiu del host elexíu " #~ "escaécese y'l slot indireutu libérase pa otres pantalles." - #~ msgid "Disa_ble multiple logins for a single user" #~ msgstr "Enca_boxar múltiples conexones d'un mesmu usuariu" - #~ msgid "Display the title bar in the greeter." #~ msgstr "Ver la barra de títulu na ventana d'entrada." - #~ msgid "Displays per _host:" #~ msgstr "Pantalles por _host:" - #~ msgid "Displays this image as the background in the greeter." #~ msgstr "Amosar esta imaxe como fondu de la pantalla." - #~ msgid "Do not show image for _remote logins" #~ msgstr "Nun amosar imaxe pa conexones _remotes" - #~ msgid "" #~ "Does not place cookies into the users home directory if this directory is " #~ "on NFS." #~ msgstr "" #~ "Nun coloca cookies nel direutoriu personal del usuariu si esi direutoriu " #~ "tá en NFS." - #~ msgid "Don't restart the login manager after the execution" #~ msgstr "Nun reaniciar el xestor de conexones tres de la execución" - #~ msgid "E_dit Commands..." #~ msgstr "E_ditar ordes..." - #~ msgid "E_xclude:" #~ msgstr "E_xcluir:" - #~ msgid "Ena_ble debug messages to system log" #~ msgstr "Permitir mensaxes de de_bug al rexistru del sistema" - #~ msgid "" #~ "Enables XDMCP INDIRECT choosing (i.e. remote execution of gdmchooser) for " #~ "X-terminals which don't supply their own display browser." @@ -3734,7 +3012,6 @@ #~ "Activa la eleición XDMCP INDIRECT (ex. execución remota de gdmchooser) " #~ "palos terminales X que nun suministren el so propiu esaminador de " #~ "pantalles." - #~ msgid "" #~ "Enables greeter to be launched with additional Gtk+ modules. This is " #~ "useful when extra features are required such as accessible login. Note " @@ -3744,17 +3021,14 @@ #~ "cuando faen falta carauterístiques adicionales como una entrada " #~ "accesible. Note que sólo deberíen usase módulos \"confiaos\" pa minimizar " #~ "problemes de seguridá." - #~ msgid "" #~ "Full path and arguments for the command to be executed. If the value is " #~ "missing, the command will not be available." #~ msgstr "" #~ "Ruta completa y argumentos del comandu que s'executará. Si'l valor tá " #~ "vacíu, el comandu nun tará disponible." - #~ msgid "Full path and arguments to the command to be executed" #~ msgstr "Ruta completa y argumentos del comandu que s'executará." - #~ msgid "" #~ "GDM should run the login window on this server and allow a user to log " #~ "in. If not selected, then GDM will just run this server and wait for it " @@ -3763,10 +3037,8 @@ #~ "GDM debería executar la ventana d'entrada nesti servidor y permitir a un " #~ "usuarii entrar. Si nun se seleiciona, entós GDM executará esti servidor y " #~ "esperará a que fine." - #~ msgid "General" #~ msgstr "Xeneral" - #~ msgid "" #~ "Given user should be logged in after a number of seconds (set with Pause " #~ "before login) of inactivity on the login screen. This is useful for " @@ -3775,7 +3047,6 @@ #~ "L'usuariu dáu debería entrar tres un númberu de segundos (establecios con " #~ "Pausa enantes d'entrada) d'inactividá na pantalla d'entrada. Esto ye útil " #~ "palos terminales d'accesu públicu o quiciabes pa usu domésticu." - #~ msgid "" #~ "Given user should be logged in upon first bootup. No password will be " #~ "asked. This is useful for single user workstations where local console " @@ -3784,14 +3055,12 @@ #~ "L'usuariu dáu entamará sesión tres el primer arranque. Nun se pedirá " #~ "denguna contraseña. Esto ye útil pa estaciones de trabayu con un solu " #~ "usuariu onde la seguridá de la consola llocal nun ye un problema." - #~ msgid "" #~ "Greeter\n" #~ "Chooser" #~ msgstr "" #~ "Interfaz d'entrada\n" #~ "Seleutor d'equipos" - #~ msgid "" #~ "Hide visual feedback in the password entry. Turning this option on can " #~ "increase security, as the length of your password cannot be guessed by " @@ -3799,16 +3068,12 @@ #~ msgstr "" #~ "Escuende información na entrada de contraseñes. Activar esta opción pue " #~ "aumentar la seguridá ya que nun pue vese'l llargor de la so contraseña." - #~ msgid "Honor _indirect requests" #~ msgstr "Confiar nes solicitudes _indireutes" - #~ msgid "I_mage:" #~ msgstr "I_maxe:" - #~ msgid "I_nclude:" #~ msgstr "I_ncluir:" - #~ msgid "" #~ "If a user has no defined face image, GDM will use the \"stock_person\" " #~ "icon defined in the current GTK+ theme. If no such image is defined, the " @@ -3820,7 +3085,6 @@ #~ "definía, la imaxe especificada en DefaultFace sedrá la que se use. La " #~ "imaxe debe tar nun formatu soportáu por gdk-pixbuf y l'archivu debe ser " #~ "lleíble pol usuariu de GDM." - #~ msgid "" #~ "Image file to display in the logo box. The file must be in an gdk-pixbuf " #~ "supported format and it must be readable by the GDM user. If no file is " @@ -3830,17 +3094,14 @@ #~ "formatu soportáu por gdk-pixbuf y debe ser lleíble pol usuariu GDM. Si " #~ "nun s'especifica nengún archivu la carauterística del logotipu " #~ "desactívase." - #~ msgid "Includ_e Hostname Chooser (XDMCP) menu item" #~ msgstr "Inclui_r l'elementu Seleuor d'equipos (XDMCP) nel menú" - #~ msgid "" #~ "Indicates that the X server should be started at a different process " #~ "priority." #~ msgstr "" #~ "Indica que'l servidor X debería ser entamáu con una prioridá de procesu " #~ "diferente." - #~ msgid "" #~ "Interval in which to ping the X server in seconds. If the X server " #~ "doesn't return before the next time we ping it, the connection is stopped " @@ -3849,93 +3110,66 @@ #~ "Intervalu nel cual facer ping al servidor X en segundos. Si'l servidor X " #~ "nun devuelve dempués de la siguiente vez que se-y fai un ping, la conexón " #~ "fina y la sesión piésllase." - #~ msgid "LRla_bel:" #~ msgstr "Etiqu_etaLR" - #~ msgid "La_unch:" #~ msgstr "_Llanzar:" - #~ msgid "Listen on _UDP port: " #~ msgstr "Escuchar nel puertu _UDP: " - #~ msgid "Loc_k position of the window" #~ msgstr "_Bloquear posición de la ventana" - #~ msgid "Local" #~ msgstr "Llocal" - #~ msgid "Login Window Preferences" #~ msgstr "Preferencies de la ventana d'entrada" - #~ msgid "Login _failed:" #~ msgstr "Entrada _fallía:" - #~ msgid "Login _retry delay:" #~ msgstr "_Retrasu pa reintentu d'entrada:" - #~ msgid "Login _successful:" #~ msgstr "Entrada _esitosa:" - #~ msgid "Logo" #~ msgstr "Logu" - #~ msgid "Maximum _remote sessions:" #~ msgstr "Máximo de sesiones _remotes:" - #~ msgid "Maximum _wait time:" #~ msgstr "Tiempu máximu d'espe_ra:" - #~ msgid "Maximum indirect w_ait time:" #~ msgstr "Tiempu máximo d'espera indireut_a:" - #~ msgid "Maximum p_ending indirect requests:" #~ msgstr "Máximo de solicitudes indireutes p_endientes:" - #~ msgid "Menu Bar" #~ msgstr "Barra de Menú" - #~ msgid "Messa_ge:" #~ msgstr "Mensa_x:" - #~ msgid "Ne_ver place cookies on NFS" #~ msgstr "N_unca colocar cookies en NFS" - #~ msgid "No _restart required" #~ msgstr "_Nun se requier reiniciu" - #~ msgid "" #~ "Number of simultaneously provided displays with host choosers. If more " #~ "queries from different hosts come in, the oldest ones will be forgotten." #~ msgstr "" #~ "Númberu de pantalles proporcionaes a ún tiempu con seleutores de host. Si " #~ "entran más peticiones de distintos hosts, les más antigues escaeceránse." - #~ msgid "Only allow login i_f user owns their home directory" #~ msgstr "" #~ "Sólo permitir entrar s_i l'usuariu ye'l propietariu de la so carpeta " #~ "personal" - #~ msgid "Op_tions:\t" #~ msgstr "Op_ciones:\t" - #~ msgid "Pa_th:" #~ msgstr "Ru_ta:" - #~ msgid "Paranoia option. Only accepts user owned files and directories." #~ msgstr "" #~ "Opción paranoica. Sólo aceptar archivos y direutorios propiedá del " #~ "usuariu." - #~ msgid "Per_sistent" #~ msgstr "Pers_istente" - #~ msgid "Permissions" #~ msgstr "Permisos" - #~ msgid "Pick Background Color" #~ msgstr "Escueya'l color de fondu" - #~ msgid "" #~ "Plain\n" #~ "Plain with face browser\n" @@ -3946,25 +3180,18 @@ #~ "Planu con visor de rostros\n" #~ "Con temes\n" #~ "Con temaes y visor de rostros" - #~ msgid "Qui_ver when incorrect username/password entered" #~ msgstr "_Temblar cuando se introduz un usuariu/contraseña incorreutu" - #~ msgid "R_emove" #~ msgstr "D_esaniciar" - #~ msgid "Re_move Server" #~ msgstr "D_esaniciar servidor" - #~ msgid "Reboot, Halt, Suspend and Custom Command Preferences" #~ msgstr "Preferencies de Reaniciar, Apagar, Suspender y ordes personalizáes" - #~ msgid "Refresh rate:" #~ msgstr "Tasa de refrescu:" - #~ msgid "Remote" #~ msgstr "Remota" - #~ msgid "" #~ "Remote connections through XDMCP will be allowed to log into the " #~ "\"TimedLogin\" user by letting the login window time out, just like the " @@ -3973,36 +3200,28 @@ #~ "Les conexones remotes a través de XDMCP permitiráse-ys entrar col usuariu " #~ "«TimedLogin» tres dexar la pantalla d'entrada expirar, de la mesma manera " #~ "que l'usuariu llocal na primer consola." - #~ msgid "" #~ "Remote login disabled\n" #~ "Same as Local" #~ msgstr "" #~ "Entrada remota desactivada\n" #~ "Igual que la entrada llocal" - #~ msgid "Resolution:" #~ msgstr "Resolución:" - #~ msgid "Sc_ale to fit screen" #~ msgstr "E_scalar hasta axustar a la pantalla" - #~ msgid "Select Background Image" #~ msgstr "Escueya Imaxe de Fondu" - #~ msgid "Select Logo Image" #~ msgstr "Escueya Logu de Fondu" - #~ msgid "Select Sound File" #~ msgstr "Escueya un Ficheru de Soníu" - #~ msgid "" #~ "Selected only\n" #~ "Random from selected\n" #~ msgstr "" #~ "Sólo los seleicionaos\n" #~ "Al débalu de los seleicionaos\n" - #~ msgid "" #~ "Sends debug output to the syslog. This can be useful for tracking down " #~ "problems with GDM. This output tends to be verbose so should not be " @@ -4011,68 +3230,54 @@ #~ "Envía información de depuración al rexistru del sistema. Esto pue ser " #~ "útil pa llocalizar problemes con GDM. Esta información tiende a ser " #~ "extensa, polo que nun debería activase pa usu xeneral." - #~ msgid "Server Settings" #~ msgstr "Axustes del servidor" - #~ msgid "Server _name:" #~ msgstr "_Nome del sirvidor:" - #~ msgid "Servers To Start" #~ msgstr "Sirvidores pa aniciar" - #~ msgid "Set positio_n of the window:" #~ msgstr "Afitar la posició_n del ventanu:" - #~ msgid "Sh_ow title bar" #~ msgstr "Am_osar la barra de títulu" - #~ msgid "Shake the display when an incorrect username/password is entered." #~ msgstr "Ximelgar la pantalla al enxertar un usuariu/contraseña incorreutu." - #~ msgid "Sho_w Actions menu" #~ msgstr "A_mosar el menú d'aiciones" - #~ msgid "" #~ "Specifies if Custom Command will appear outside the login manager, for " #~ "example on the desktop through the Log Out/Shut Down widgets." #~ msgstr "" #~ "Afita si Orde Personalizada apaecerá fuera del xestor d'aniciu, por " #~ "exemplu nel escritoriu mandándose de los widgets Salir/Apagar." - #~ msgid "" #~ "Specifies if gdm will be stopped/restarted once Custom Command has been " #~ "executed." #~ msgstr "" #~ "Afita si gdm va parase/reaniciar desque se execute Orde Personalizada." - #~ msgid "" #~ "Specifies the label that will be displayed on the Custom Command buttons " #~ "and menu items." #~ msgstr "" #~ "Afita la etiqueta que s'amuesa nos botones y elementos del menú de Orde " #~ "Personalizada." - #~ msgid "" #~ "Specifies the label that will be displayed on the Custom Command list " #~ "items and radio buttons." #~ msgstr "" #~ "Afita la etiqueta que s'amuesa nos elementos de llista y botones " #~ "d'escoyeta de Orde Personalizada." - #~ msgid "" #~ "Specifies the message that will be displayed on Custom Command tooltip " #~ "entries." #~ msgstr "" #~ "Afita el mensaxe que s'amuesa nes entráes d'aida de Orde Personalizada." - #~ msgid "" #~ "Specifies the message that will be displayed on the warning dialog box " #~ "when one of the Custom Command widgets is activated." #~ msgstr "" #~ "Afita el mensaxe que s'amuesa na caxa dialogu d'avisu al activar un " #~ "widget de Orde Personalizada." - #~ msgid "" #~ "Systemwide directory for face files. The sysadmin can place icons for " #~ "users here without touching their homedirs. Faces are named after their " @@ -4084,89 +3289,70 @@ #~ "home. Les semeyes nómense igual que l'usuariu. Les imáxenes de semeya hai " #~ "que les guardar en formatos soportáos por gdk-pixbuf y tienen que poder " #~ "lleese pol usuariu GDM." - #~ msgid "T_ooltip:" #~ msgstr "Gabit_u:" - #~ msgid "Text to appear in the warning pop-up dialogs" #~ msgstr "Testu qu'apaecerá nos diálogos saltones d'avisu" - #~ msgid "Text to appear on the buttons and menu items" #~ msgstr "Testu qu'apaecerá nos botones y oxetos de menú" - #~ msgid "Text to appear on the radio buttons and list items" #~ msgstr "Testu qu'apaecerá nos botones d'escoyeta y oxetos de llista" - #~ msgid "Text to appear on the tooltips" #~ msgstr "Testu qu'apaecerá nos gabitos" - #~ msgid "" #~ "The UDP port number gdm should listen to for XDMCP requests. Don't change " #~ "this unless you know what you are doing." #~ msgstr "" #~ "El númberu de puertu UDP pol que tien qu'escuchar gdm los pidíos XDMCP. " #~ "Nun lo cambées si nun sabes lo que tas faciendo." - #~ msgid "" #~ "The command to execute, with full path to the binary of the X server, and " #~ "any extra arguments needed. Example: /usr/X11R6/bin/X" #~ msgstr "" #~ "La orde a executar, col camín completu al binariu del sirvidor X, y " #~ "cualisquier argumentu estra necesariu. Exemplu: /usr/X11R6/bin/X" - #~ msgid "The greeter will play a sound after a failed login attempt." #~ msgstr "" #~ "La interfaz reproducirá un soníu tres d'un intentu fallíu d'entamar " #~ "sesión." - #~ msgid "The greeter will play a sound after a successful login attempt." #~ msgstr "" #~ "La interfaz reproducirá un son tres d'una sesión entamada con ésitu." - #~ msgid "The greeter will play a sound or beep when it is ready for a login." #~ msgstr "" #~ "La interfaz reproducirá un son o pitará cuando tea llista pa entamar " #~ "sesión." - #~ msgid "The horizontal position of the login window." #~ msgstr "La posición horizontal del ventanu d'aniciu de sesión." - #~ msgid "The name that will be displayed to the user." #~ msgstr "El nome que s'amosará al usuariu." - #~ msgid "" #~ "The number of seconds that should pass before reactivating the entry " #~ "field after a failed login." #~ msgstr "" #~ "El númberu de segundos que tienen que pasar enantes de reactivar el campu " #~ "de entrada tres d'un fallu nel aniciu de sesión." - #~ msgid "The position of the login window cannot be changed." #~ msgstr "La posición del ventanu d'aniciu de sesión nun pue cambease." - #~ msgid "" #~ "The position of the login window is determined by Position X / Position Y." #~ msgstr "" #~ "La posición del ventanu d'aniciu de sesión determínase por Posición X / " #~ "Posición Y." - #~ msgid "" #~ "The session that is used by default if the user does not have a saved " #~ "preference and has picked 'Last' from the list of sessions." #~ msgstr "" #~ "La sesión que se usa por omisión si l'usuariu nun tien guardada la " #~ "preferencia y escueye \"Última\" na llista de sesiones." - #~ msgid "Themes" #~ msgstr "Temes" - #~ msgid "" #~ "This server is available as a choice when a user wishes to run a " #~ "flexible, on demand server." #~ msgstr "" #~ "Esti sirvidor ta disponible como escoyeta cuando un usuariu quier " #~ "executar un sirvidor flexible, a demanda." - #~ msgid "" #~ "To avoid denial of service attacks, GDM has fixed size queue of pending " #~ "connections. Please note that this parameter does *not* limit the number " @@ -4177,7 +3363,6 @@ #~ "fixu de peticiones pendientes. Esti parámetru *nun* llimita'l númberu de " #~ "pantalles remotes que puen xestionase. Sólo llimita'l númberu de " #~ "pantalles entamando una conexón a ún tiempu." - #~ msgid "" #~ "To prevent attackers from filling up the pending queue, GDM will only " #~ "allow one connection for each remote computer. If you want to provide " @@ -4188,7 +3373,6 @@ #~ "permitirá una conexón por cada equipu remotu. Si quier proporcionar " #~ "servicios de pantalla a equipos con más d'un monitor, tien que " #~ "incrementar esti valor correspondientemente." - #~ msgid "" #~ "Turns the Actions menu (which used to be called System menu) on or off. " #~ "If this is off then one of the actions will be available anywhere. These " @@ -4199,19 +3383,14 @@ #~ "Sistema). Si esto ta desactiváu entós una d'estes aiciones nun tarán " #~ "disponibles nenyures. Estes aiciones incluyen Apagar, Reaniciar, " #~ "Personalizar, Configurar, seleutor XDMCP." - #~ msgid "U_ser:" #~ msgstr "U_suariu:" - #~ msgid "Us_e 24 Hour Clock:" #~ msgstr "Usar r_eló de 24 Hores:" - #~ msgid "Users" #~ msgstr "Usuarios" - #~ msgid "Welcome Message" #~ msgstr "Mensax de Bienvenida" - #~ msgid "" #~ "When GDM is ready to manage a remote display, an ACCEPT packet is sent to " #~ "it containing a unique session id which will be used in future XDMCP " @@ -4228,7 +3407,6 @@ #~ "nun se recibe una rempuesta dientro del tiempu máximu d'espera, GDM " #~ "declarará la pantalla muerta y desaniciarála de la cola de pendientes, " #~ "lliberando l'espaciu pa otres pantalles." - #~ msgid "" #~ "When the user logs in and already has an existing session, they are " #~ "connected to that session rather than starting a new session. This only " @@ -4239,118 +3417,81 @@ #~ "esa sesión en llugar d'entamar una sesión nueva. Esto sólo furrula pales " #~ "sesiones que s'executen en terminales virtuales entamaos con " #~ "gdmflexiserver, y non con XDMCP." - #~ msgid "X Server Login Window Preferences" #~ msgstr "Preferencies de la ventana d'entrada del servidor X" - #~ msgid "XDMCP Login Window Preferences" #~ msgstr "Preferencies de la ventana d'entrada XDMCP" - #~ msgid "_Add..." #~ msgstr "_Amestar..." - #~ msgid "_Add/Modify..." #~ msgstr "_Amestar/Modificar..." - #~ msgid "_Allow local system administrator login" #~ msgstr "_Permitir entrada llocal al alministrador de sistema" - #~ msgid "_Allow users to change fonts and colors of plain greeter" #~ msgstr "" #~ "_Permitir que los usuarios camuden les fontes y colores del interfaz planu" - #~ msgid "_Background color:" #~ msgstr "Color de _fondu:" - #~ msgid "_Default: \"Welcome to %n\"" #~ msgstr "_Predetermináu: \"Bienveníu a %n\"" - #~ msgid "_Default: \"Welcome\"" #~ msgstr "_Predetermináu: \"Bienveníu\"" - #~ msgid "_Deny TCP connections to Xserver" #~ msgstr "_Denegar les conexones TCP a Xserver" - #~ msgid "_Enable Automatic Login" #~ msgstr "Activar l'_Entamu de sesión automáticu" - #~ msgid "_Flexible (on demand)" #~ msgstr "_Flexible (a demanda)" - #~ msgid "_Global face dir:" #~ msgstr "Directoriu _global de semeyes:" - #~ msgid "_GtkRC file:" #~ msgstr "Ficheru _GtkRC:" - #~ msgid "_Hide visual feedback in the password entry" #~ msgstr "_Tapecer de la vista la contraseña enxertada" - #~ msgid "_Image:" #~ msgstr "_Imaxe:" - #~ msgid "_Include all users from /etc/passwd (not for NIS)" #~ msgstr "_Incluyír toos los usuarios de /etc/passwd (non pa NIS)" - #~ msgid "_Label:" #~ msgstr "_Etiqueta:" - #~ msgid "_Logins are handled by this computer" #~ msgstr "Les _entraes xestionaránse nesti equipu" - #~ msgid "_Maximum pending requests:" #~ msgstr "Máximu de solicitues _pendientes:" - #~ msgid "_Minimal UID:" #~ msgstr "UID _mínimu:" - #~ msgid "_Only allow login if user's home directory permissions are secure" #~ msgstr "" #~ "_Sólo permitir entrar si los permisos de la carpeta personal del usuariu " #~ "son seguros" - #~ msgid "_Path: " #~ msgstr "_Camín: " - #~ msgid "_Pause before login:" #~ msgstr "_Pausa enantes d'entrar:" - #~ msgid "_Ping interval:" #~ msgstr "Intervalu de _ping:" - #~ msgid "_Priority:" #~ msgstr "_Prioridá:" - #~ msgid "_Remove" #~ msgstr "_Esaniciar" - #~ msgid "_Remove..." #~ msgstr "Quita_r..." - #~ msgid "_Server:" #~ msgstr "_Servidor:" - #~ msgid "_Servers:" #~ msgstr "_Servidores:" - #~ msgid "_Style:" #~ msgstr "E_stilu:" - #~ msgid "_Theme:" #~ msgstr "_Tema:" - #~ msgid "_User:" #~ msgstr "_Usuariu:" - #~ msgid "_VT:" #~ msgstr "_VT:" - #~ msgid "_X coordinate" #~ msgstr "Coordenada _X" - #~ msgid "_Y coordinate" #~ msgstr "Coordenada _Y" - #~ msgid "" #~ "auto\n" #~ "yes\n" @@ -4359,46 +3500,36 @@ #~ "auto\n" #~ "si\n" #~ "non" - #~ msgid "dummy" #~ msgstr "bobu" - #~ msgid "seconds" #~ msgstr "segundos" - #~ msgid "Too many users to list here..." #~ msgstr "Abondos usuarios pa llistar equí..." - #~ msgid "Restart Machine" #~ msgstr "Reaniciar Máquina" - #~ msgid "There was an error loading the theme %s" #~ msgstr "Asocedió un error al cargar el tema %s" - #~ msgid "The greeter theme is corrupt" #~ msgstr "El tema pa la interfaz d'entrada gráfica tá corrompíu" - #~ msgid "" #~ "The theme does not contain definition for the username/password entry " #~ "element." #~ msgstr "" #~ "El tema nun contien una definición pal elementu d'entrada de nome " #~ "d'usuario/contraseña." - #~ msgid "" #~ "There was an error loading the theme, and the default theme could not be " #~ "loaded. Attempting to start the standard greeter" #~ msgstr "" #~ "Asocedió un error al cargar el tema y el tema predetermináu tampocu pudo " #~ "cargase. Intentaráse entamar la interfaz d'entrada estándar" - #~ msgid "" #~ "The GTK+ greeter could not be started. This display will abort and you " #~ "may have to login another way and fix the installation of GDM" #~ msgstr "" #~ "Nun se pudo entamar la interfaz d'entrada GTK+. Esta pantalla pesllaráse " #~ "y quicibes deba entrar d'otru móu pa iguar la instalación de GDM" - #~ msgid "" #~ "Your session directory is missing or empty! There are two available " #~ "sessions you can use, but you should log in and correct the gdm " @@ -4407,158 +3538,111 @@ #~ "Nun se atopa'l so directoriu de sesiones o tá vacíu. Hai dos sesiones " #~ "disponibles que pues usar, pero deberíes entrar ya iguar la configuración " #~ "de GDM." - #~ msgid "Select _Session..." #~ msgstr "Escoyeta de _Sesión..." - #~ msgid "" #~ "Answer questions here and press Enter when done. For a menu press F10." #~ msgstr "Rellene'l campu equí y calque Intro. Pa tener un menú calque F10." - #~ msgid "Last session" #~ msgstr "Cabera sesión" - #~ msgid "Sus_pend" #~ msgstr "Sus_pender" - #~ msgid "Confi_gure" #~ msgstr "Confi_gurar" - #~ msgid "Op_tions" #~ msgstr "Op_ciones" - #~ msgid "_OK" #~ msgstr "_Aceutar" - #~ msgid "Change _Session" #~ msgstr "Camudar _Sesión" - #~ msgid "_Last session" #~ msgstr "_Cabera sesión" - #~ msgid "Log in using the session that you have used last time you logged in" #~ msgstr "Coneutase usando la sesión qu'emplegó la cabera vegada qu'entró" - #~ msgid "Confi_gure Login Manager..." #~ msgstr "Confi_gurar l'Alministrador de Conexón..." - #~ msgid "Shut _down the computer" #~ msgstr "_Apagar l'ordenador" - #~ msgid "Shut Down your computer so that you may turn it off." #~ msgstr "Detién l'ordenador pa que puedas apagalu." - #~ msgid "_Restart the computer" #~ msgstr "_Reainiciar l'ordenador" - #~ msgid "Restart your computer" #~ msgstr "Reaniciar el so ordenador" - #~ msgid "Sus_pend the computer" #~ msgstr "Sus_pender l'ordernador" - #~ msgid "Suspend your computer" #~ msgstr "Suspender el so ordenador" - #~ msgid "Hibernate your computer" #~ msgstr "Ivernar el so ordenador" - #~ msgid "Run _XDMCP chooser" #~ msgstr "Executar el seleutor _XDMCP" - #~ msgid "" #~ "Run an XDMCP chooser which will allow you to log into available remote " #~ "computers, if there are any." #~ msgstr "" #~ "Executa un selector XDMCP que-y permita entrar en equipos remotos " #~ "disponibles, si los hai." - #~ msgid "Confi_gure the login manager" #~ msgstr "Confi_gurar el xestor d'entrada" - #~ msgid "" #~ "Configure GDM (this login manager). This will require the root password." #~ msgstr "" #~ "Configurar GDM (esti xestor d'entrada). Requier la contraseña de root." - #~ msgid "(c) 2002 Bond, James Bond" #~ msgstr "(c) 2002 Bond, James Bond" - #~ msgid "Bond, James Bond" #~ msgstr "Bond, James Bond" - #~ msgid "Circles" #~ msgstr "Círculos" - #~ msgid "Theme with blue circles" #~ msgstr "Tema con círculos azules" - #~ msgid "(c) 2002 GNOME" #~ msgstr "(c) 2002 GNOME" - #~ msgid "GNOME Art variation of Circles with a Face Browser" #~ msgstr "GNOME Art variante de Círculos con amosador de semeyes" - #~ msgid "GNOME Artists" #~ msgstr "Artistes de GNOME" - #~ msgid "Happy GNOME with Browser" #~ msgstr "GNOME feliz con amosador de semeyes" - #~ msgid "GNOME Art variation of Circles" #~ msgstr "GNOME Art variante de Círculos" - #~ msgid "Happy GNOME" #~ msgstr "GNOME feliz" - #~ msgid "" #~ "Error while trying to run (%s)\n" #~ "which is linked to (%s)" #~ msgstr "" #~ "Error al intentar executar (%s)\n" #~ "que tá enllazáu con (%s)" - #~ msgid "Cannot open gestures file: %s" #~ msgstr "Nun se pue abrir el ficheru de xestos: %s" - #~ msgid "DMX display to migrate to" #~ msgstr "Pantalla DMX a la que migrar" - #~ msgid "DISPLAY" #~ msgstr "VISUALIZADOR" - #~ msgid "Backend display name" #~ msgstr "Nome de la pantalla de backend" - #~ msgid "Xauthority file for destination display" #~ msgstr "Ficheru Xauthority pa la pantalla de destín" - #~ msgid "AUTHFILE" #~ msgstr "AUTHFILE" - #~ msgid "Xauthority file for backend display" #~ msgstr "Ficheru Xauthority pa la pantalla de backend" - #~ msgid "Failed to open display \"%s\"\n" #~ msgstr "Falló al abrir la pantalla «%s»\n" - #~ msgid "DMX extension not present on \"%s\"\n" #~ msgstr "La extensión DMX nun tá presente en \"%s\"\n" - #~ msgid "- migrate a backend display from one DMX display to another" #~ msgstr "- migrar una pantalla de segundu planu d'una pantalla DMX a otra" - #~ msgid "You must specify a destination DMX display using %s\n" #~ msgstr "Tienes que conseñar una pantalla DMX de destin usando %s\n" - #~ msgid "You must specify a backend display by using %s\n" #~ msgstr "Tienes que conseñar una pantalla de backend usando %s\n" - #~ msgid "DMXAddScreen \"%s\" failed on \"%s\"\n" #~ msgstr "DMXAddScreen \"%s\" falló en \"%s\"\n" - #~ msgid "gdmaskpass only runs as root\n" #~ msgstr "gdmaskpass executase namái como superusuariu\n" - #~ msgid "Authentication failure!\n" #~ msgstr "¡Fallu d'autenticación!\n" + diff -Nru gdm-2.32.1/po/bg.po gdm-3.0.0/po/bg.po --- gdm-2.32.1/po/bg.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/bg.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,10 +1,10 @@ # Bulgarian translation of gdm po-file. # Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # Copyright (C) 2010 Krasimir Chonov . # Borislav Aleksandrov , 2002. # Yanko Kaneti , 2002. -# Alexander Shopov , 2002, 2005, 2006, 2007, 2008, 2009, 2010. +# Alexander Shopov , 2002, 2005, 2006, 2007, 2008, 2009, 2010, 2011. # Rostislav Raykov , 2004. # Krasimir Chonov , 2010. # @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: gdm master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-24 16:10+0300\n" -"PO-Revision-Date: 2010-08-24 16:10+0300\n" -"Last-Translator: Krasimir Chonov \n" +"POT-Creation-Date: 2011-03-25 21:53+0200\n" +"PO-Revision-Date: 2011-03-25 21:53+0200\n" +"Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -48,28 +48,28 @@ msgid "could not find user \"%s\" on system" msgstr "потребителят „%s“ не бе открит в системата" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Системата за влизане не може да бъде инициализирана" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Неуспех при идентификацията на потребителя" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Неуспех при оторизацията на потребителя" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Неуспех при установяване на акредитацията" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Неуспех при отваряне на сесия" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -93,17 +93,17 @@ "Сървърът бе породен от потребителя %s, но такъв потребител не съществува" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid не може да се зададе да е %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "неуспех на initgroups() за %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid не може да се зададе да е %d" @@ -153,83 +153,83 @@ msgid "The display device" msgstr "Устройството на дисплея" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" "грешка при инициализиране на обмяната на съобщения със системата за " -"идентификация: %s" +"идентификация — %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "обща грешка" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "паметта свърши" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "програмна грешка" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "неизвестна грешка" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Потребител:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "грешка при информиране на системата за идентификация за предпочитаното име " "на потребител: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "грешка при информиране на системата за идентификация за името на компютъра " "на потребителя: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "грешка при информиране на системата за идентификация за конзолата на " "потребителя: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "грешка при информиране на системата за идентификация за низа в променливата " "DISPLAY: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "грешка при информиране на системата за идентификация за акредитацията от " "xauth: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "няма потребител" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Потребителят не може да бъде сменен" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Потребителят „%s“ не съществува" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Групата „%s“ не съществува" @@ -458,7 +458,7 @@ msgstr "Обвивка на регистъра на AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Екран за идентификация" @@ -470,6 +470,10 @@ msgid "Power management daemon" msgstr "Демон за управление на захранването" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Проверка за ускорението за сесиите на GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Демон за настройките на GNOME" @@ -506,7 +510,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Агент за идентификация на PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Избор на система" @@ -518,38 +522,38 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Неуспех при прочитането на заглавната част на XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Стойност" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "процент от завършеното време" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Неактивен текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Текст, който да се ползва за етикет, ако потребителят все още не е избрал " "елемент" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Активен текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "" "Текстът, който да се ползва в етикета, когато потребителят е избрал елемент" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Видим списък" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Дали списъкът за избор е видим" @@ -581,65 +585,69 @@ msgid "%a %l:%M %p" msgstr "%a, %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Автоматично влизане…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Изберете език и натиснете „Влизане“" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Спиране…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Друга" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Друга сесия" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Спиране" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Име на компютър" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Влизане" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Отключване" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Версия" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Панел" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Опции за изключване…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Приспиване" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Рестартиране" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Изключване" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Друга" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Остава неизвестно време" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Друга сесия" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Панел" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Езици" @@ -667,35 +675,10 @@ msgid "Language" msgstr "Езици" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Неуказан" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Подредба на клавиатурата" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Клавиатура:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Друга…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Изберете подредба на клавиатурата от пълния списък с подредби." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Клавиатура" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Текст за етикета" @@ -787,61 +770,50 @@ msgstr "Икона, която да се ползва за програмата за посрещане" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Наскоро избрани подредби на клавиатурата" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Наскоро избрани езици" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Задайте да е списък с клавиатурни подредби, които стандартно да се показват " -"в прозореца за вход." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Задайте да е списък с езици, които стандартно да се показват в прозореца за " "вход." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Задайте да e иконата, която да се ползва за програмата за посрещане." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Задайте да е истина, за да не се показва списъкът с познати потребители в " "прозореца за вход." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Задайте да е истина, за да не си показват бутоните за рестартиране в " "прозореца за вход." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Задайте да е истина, за да включите приставката за управление на XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Задайте да е истина, за да включите приставката за управление на фона." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Задайте да е истина, за да включите приставката за мултимедийните клавиши." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Задайте да е истина, за да включите екранната клавиатура." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -849,33 +821,33 @@ "Задайте да е истина, за да включите приставката за управление на " "достъпността на клавиатурата." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Задайте да е истина, за да включите лупата." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Задайте да е истина, за да включите екранния четец." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Задайте да е истина, за да включите приставката за управление на звука." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Задайте да е истина, за да включите приставката за настройки на xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Задайте да е истина, за да се показва съобщението за поздрав." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Задайте да е истина, за да ползвате Compiz за мениджър на прозорците." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -883,33 +855,33 @@ "Текстът на съобщението за поздрав в прозореца за вход, когато списъкът за " "избор на потребител е празен, вместо този в ключа banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Текстът на съобщението за поздрав в прозореца за вход." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Истина, когато приставката за управление на XRandR е включена." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Истина, когато приставката за управление на фона е включена." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Истина, когато приставката за управление на мултимедийните клавиши е " "включена." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Истина, когато приставката за управление на звука е включена." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Истина, когато приставката за настройките на xsettings е включена." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "За мениджър на прозорци да се ползва Compiz" @@ -937,8 +909,8 @@ msgid "Whether the timer is currently ticking" msgstr "Дали в момента таймерът работи" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Влизане като %s" @@ -948,172 +920,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Друг…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Изберете различен потребител" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Гост" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Вход като гост" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Автоматично влизане" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Автоматично влизане в системата след избор на настройки" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "В момента е влязъл" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Тази програма (Аплет за смяна на потребител) е свободен софтуер. Можете да я " -"разпространявате и/или променяте под условията на Общия публичен лиценз на " -"GNU (GNU GPL), както е публикуван от Фондацията за свободен софтуер — версия " -"2 на лиценза или (по ваше решение) по-късна версия." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Тази програма се разпространява с надеждата, че ще бъде полезна, но БЕЗ " -"НИКАКВИ ГАРАНЦИИ, дори и косвените за ПРОДАЖБА или СЪОТВЕТСТВИЕ С КАКВАТО И " -"ДА Е УПОТРЕБА. За подробности погледнете Общия публичен лиценз на GNU." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Трябва да сте получили копие от Общия публичен лиценз на GNU (GNU GPL) " -"заедно с тази програма. Ако не сте, пишете до Free Software Foundation, " -"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Меню за бърза промяна на потребители." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Александър Шопов \n" -"\n" -"Проектът за превод на GNOME има нужда от подкрепа.\n" -"Научете повече за нас на http://gnome.cult.bg\n" -"Докладвайте за грешки на http://gnome.cult.bg/bugs" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Екранът не може да бъде заключен: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Програмата за защита на екрана не може да го затъмни временно: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Излизането е невъзможно: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "На линия" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Невидим" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Зает" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Отсъстващ" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Информация за регистрацията" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Системни настройки" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Заключване на екрана" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Смяна на потребител" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Излизане…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Непознат" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Аплет за смяна на потребител" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Промяна на настройките на регистрацията и състоянието" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Меню за бърза смяна на потребител" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Смяна на потребител" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Фабрика за аплета за смяна на потребител" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Редактиране на _личната информация" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Относно" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Редактиране на потребители и групи" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Поддържа се само командата VERSION" @@ -1149,11 +984,11 @@ msgid "Unable to start new display" msgstr "Неуспех при стартирането на нов дисплей" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Екранът е заснет" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Снимка на екрана" diff -Nru gdm-2.32.1/po/bn_IN.po gdm-3.0.0/po/bn_IN.po --- gdm-2.32.1/po/bn_IN.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/bn_IN.po 2011-04-04 14:37:16.000000000 +0000 @@ -8,39 +8,40 @@ # Mahay Alam Khan , 2005. # Samia Niamatullah , 2005. # Runa Bhattacharjee , 2005. -# Runa Bhattacharjee , 2008, 2009, 2010. +# Runa Bhattacharjee , 2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: bn_IN\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-04-01 01:14+0000\n" -"PO-Revision-Date: 2010-04-12 11:23+0530\n" -"Last-Translator: Runa Bhattacharjee \n" -"Language-Team: Bengali INDIA \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=gdm&component=general\n" +"POT-Creation-Date: 2011-02-17 16:55+0000\n" +"PO-Revision-Date: 2011-02-22 11:53+0530\n" +"Last-Translator: \n" +"Language-Team: Bengali (India) \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" "\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.1\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ক্যারেক্টার ডিভাইস নয়" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "ডিসপ্লে ID" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Display Manager Slave" @@ -49,86 +50,89 @@ msgid "could not find user \"%s\" on system" msgstr "সিস্টেমের মধ্যে \"%s\" নামক ব্যবহারকারী পাওয়া যায়নি" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "লগ-ইন ব্যবস্থা আরম্ভ করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "ব্যবহারকারীর পরিচয় পরীক্ষা করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "ব্যবহারকারীকে অনুমোদন প্রদান করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "পরিচয় নির্ধারণ করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 msgid "Unable to open session" msgstr "সেশান আরম্ভ করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1259 +#| msgid "" +#| "Could not start the X server (your graphical environment) due to some " +#| "internal error. Please contact your system administrator or check your " +#| "syslog to diagnose. In the meantime this display will be disabled. " +#| "Please restart GDM when the problem is corrected." msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" -"অভ্যন্তরীণ ত্রুটির ফলে X সার্ভার (গ্রাফিকাল পরিবেশ) আরম্ভ করতে ব্যর্থ। সমস্যা সনাক্ত " +"অভ্যন্তরীণ ত্রুটির ফলে X সার্ভার (গ্রাফিক্যাল পরিবেশ) আরম্ভ করতে ব্যর্থ। সমস্যা সনাক্ত " "করার জন্য আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন অথবা syslog পরীক্ষা " "করুন। বর্তমানে এই ডিসপ্লে নিষ্ক্রিয় করা হবে। সমস্যা সমাধান হলে GDM পুনরায় আরম্ভ করুন।" -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: ঊর্ধ্বতন ডিসপ্লে '%s'-র সাথে সংযোগ করতে ব্যর্থ" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "ব্যবহারকারী %s দ্বারা সার্ভার স্পন হওয়া উচিত, কিন্তু সংশ্লিষ্ট ব্যবহারকারী বর্তমানে " "উপস্থিত নেই" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid-র মান %d রূপে নির্ধারণ করতে ব্যর্থ" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s-র জন্য initgroups () বিফল" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid-র মান %d রূপে ধার্য করা যায়নি" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "groupid-র মান 0 (০) রূপে ধার্য করতে ব্যর্থ" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +#| msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: ডিসপ্লে %s-র জন্য লগ-ফাইল খুলতে ব্যর্থ!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: %s-র মান %s রূপে ধার্য করতে ব্যর্থ" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: সার্ভারের অগ্রাধিকারের মাত্রা %d রূপে নির্ধারণ করতে ব্যর্থ: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: ডিসপ্লে %s-র জন্য ফাঁকা সার্ভার কমান্ড উল্লিখিত" @@ -157,215 +161,226 @@ msgid "The display device" msgstr "ডিসপ্লে ডিভাইস" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1289 #, c-format -msgid "error initiating conversation with authentication system - %s" -msgstr "অনুমোদন ব্যবস্থার সাথে আলাপন আরম্ভ করতে সমস্যা - %s" +#| msgid "error initiating conversation with authentication system - %s" +msgid "error initiating conversation with authentication system: %s" +msgstr "অনুমোদন ব্যবস্থার সাথে আলাপন আরম্ভ করতে সমস্যা: %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1290 msgid "general failure" msgstr "সাধারণ বিফলতা" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1291 msgid "out of memory" msgstr "পর্যাপ্ত মেমরি অনুপস্থিত" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1292 msgid "application programmer error" msgstr "অ্যাপ্লিকেশন প্রোগ্রামার সংক্রান্ত ত্রুটি" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1293 msgid "unknown error" msgstr "অজানা সমস্যা" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1300 msgid "Username:" msgstr "ব্যবহারকারী অ্যাকাউন্টের নাম:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1306 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" -msgstr "অনুমোদন ব্যবস্থাকে পছন্দসই ব্যবহারকারীর নামের প্রমপ্ট সংক্রান্ত তথ্য জানাতে সমস্যা - %s" +#| msgid "" +#| "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" +msgstr "" +"পছন্দসই ব্যবহারকারীর নামের প্রমপ্ট সংক্রান্ত তথ্য অনুমোদন ব্যবস্থাকে জানাতে সমস্যা " +"হয়েছে: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1320 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর হোস্ট-নেম সংক্রান্ত তথ্য জানাতে সমস্যা - %s" +#| msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" +msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর হোস্ট-নেম সংক্রান্ত তথ্য জানাতে সমস্যা: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1335 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর কনসোল সংক্রান্ত তথ্য জানাতে সমস্যা - %s" +#| msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" +msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর কনসোল সংক্রান্ত তথ্য জানাতে সমস্যা: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1348 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লে স্ট্রিং সংক্রান্ত তথ্য জানাতে সমস্যা - - %s" +#| msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" +msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লে স্ট্রিং সংক্রান্ত তথ্য জানাতে সমস্যা: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1363 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" -msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লের xauth পরিচয় সংক্রান্ত তথ্য জানাতে সমস্যা - %s" +#| msgid "" +#| "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লের xauth পরিচয় সংক্রান্ত তথ্য জানাতে সমস্যা: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677 #, c-format msgid "no user account available" msgstr "কোনো ব্যবহারকারীর অ্যাকাউন্ট উপলব্ধ নেই" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1704 msgid "Unable to change to user" msgstr "চিহ্নিত ব্যবহারকারীর অ্যাকাউন্টে পরিবর্তন করা যায়নি" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s নামক ব্যবহারকারী অনুপস্থিত" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s নামক দল অনুপস্থিত" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "সকেট নির্মাণ করতে ব্যর্থ!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "হোস্ট %s থেকে প্রাপ্ত XDMCP কোয়েরি প্রত্যাখ্যান করা হয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "প্যাকেট থেকে authlist পড়া যায়নি" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "checksum-এ ত্রুটি" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "ঠিকানা সঠিক নয়" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: ডিসপ্লে ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: ডিসপ্লের ব্যবহৃত পোর্ট সংখ্যা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: প্যাকেট থেকে authlist পড়া যায়নি" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: checksum-এ ত্রুটি" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: নিষিদ্ধ হোস্ট %s থেকে REQUEST প্রাপ্ত হয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: ডিসপ্লের সংখ্যা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: সংযোগের ধরন পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: ক্লায়েন্টের ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: পরিচয় প্রমাণকারী নাম পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: পরিচয় প্রমাণকারী তথ্য পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: পরিচয় প্রমাণকারী তালিকা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: প্রস্তুতকারকের ID পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: %s থেকে প্রাপ্ত checksum সঠিক নয়" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: নিষিদ্ধ হোস্ট %s থেকে MANAGE প্রাপ্ত হয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: সেশন ID পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: ডিসপ্লে ক্লাস পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: নিষিদ্ধ হোস্ট %s থেকে KEEPALIVE প্রাপ্ত হয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: XDMCP হেডার পড়তে ব্যর্থ!" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: XDMCP সংস্করণ সঠিক নয়!" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: ঠিকানা পার্স করতে বিফল" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "সার্ভারের হোস্ট-নেম পাওয়া যায়নি: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" +#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "PID ফাইল %s লিখতে ব্যর্থ: সম্ভবত ডিস্কে অবশিষ্ট স্থান নেই: %s" #: ../daemon/main.c:271 @@ -391,7 +406,8 @@ #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "Authdir %s-র জন্য উল্লিখিত অনুমতি %o সঠিক নয়। %o হওয়া উচিত। কর্ম বাতিল করা হচ্ছে।" +msgstr "" +"Authdir %s-র জন্য উল্লিখিত অনুমতি %o সঠিক নয়। %o হওয়া উচিত। কর্ম বাতিল করা হচ্ছে।" #: ../daemon/main.c:409 #, c-format @@ -416,8 +432,9 @@ msgstr "সকল সতর্কবাণীরকে গুরুতর ধার্য করা হবে" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "সুনির্দিষ্ট সময়ের পরে প্রস্থান করা হবে - ডিবাগ করার জন্য" +#| msgid "Exit after a time - for debugging" +msgid "Exit after a time (for debugging)" +msgstr "সুনির্দিষ্ট সময়ের পরে প্রস্থান করা হবে (ডিবাগ করার জন্য)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -428,20 +445,23 @@ msgstr "GNOME Display Manager" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "শুধুমাত্র root দ্বারা GDM সঞ্চালিত হবে" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME Display Manager Session Worker" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "AT SPI Registry Wrapper" +#| msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" +msgstr "AT-SPI Registry Wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753 msgid "Login Window" msgstr "লগ-ইন উইন্ডো" @@ -466,11 +486,13 @@ msgstr "পর্দার অংশ বড় করে প্রদর্শন করা হবে" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +#| msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "GNOME অন-স্ক্রিন কি-বোর্ড (gok)" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" +#| msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" msgstr "পর্দায় স্থাপিত কি-বোর্ড ব্যবহার করা হবে" #: ../data/greeter-autostart/metacity.desktop.in.h:1 @@ -489,47 +511,48 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit অনুমোদনের এজেন্ট" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "সিস্টেম নির্বাচন করুন" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: XDMCP বাফার নির্মাণ করতে ব্যর্থ!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP হেডার পড়তে ব্যর্থ!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "মান" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "সমাপ্ত সময়ের শতাংশ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "নিষ্ক্রিয়তা চিহ্নকারী টেক্সট" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" -msgstr "ব্যবহারকারীরা দ্বারা কোনো বস্তু নির্বাচিত না হলে, লেবেলের জন্য ব্যবহারযোগ্য টেক্সট" +msgstr "" +"ব্যবহারকারীরা দ্বারা কোনো বস্তু নির্বাচিত না হলে, লেবেলের জন্য ব্যবহারযোগ্য টেক্সট" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "সক্রিয়তা চিহ্নকারী টেক্সট" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ব্যবহারকারীরা দ্বারা কোনো বস্তু নির্বাচিত হলে, লেবেলের জন্য ব্যবহারযোগ্য টেক্সট" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "দৃশ্যমান তালিকা" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "নির্বাচনযোগ্য তালিকা প্রদর্শিত হবে কি না" @@ -561,123 +584,128 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +#| msgid "Automatically logging in..." +msgid "Automatically logging in…" msgstr "স্বয়ংক্রিয় লগ-ইন..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 +msgid "Select language and click Log In" +msgstr "ভাষা নির্বাচন করে লগ-ইন করুন ক্লিক করুন" + #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 +#| msgid "Cancelling..." +msgid "Cancelling…" msgstr "বাতিল করা হচ্ছে..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 -msgid "Select language and click Log In" -msgstr "ভাষা নির্বাচন করে লগ-ইন করুন ক্লিক করুন" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 +msgctxt "customsession" +msgid "Custom" +msgstr "স্বনির্ধারিত" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 +msgid "Custom session" +msgstr "স্বনির্ধারিত সেশান" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "বাতিল" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "কম্পিউটারের নাম" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#| msgid "Log In" +msgid "Login" msgstr "লগ-ইন করুন" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "আন-লক করুন" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "সংস্করণ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "প্যানেল" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "কম্পিউটার বন্ধ করা সম্বন্ধীয় বিকল্প..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "স্থগিত করুন" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "পুনরায় আরম্ভ করুন" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "বন্ধ করুন" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "অবশিষ্ট সময় অজানা" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "প্যানেল" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ভাষা" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "ভাষা: (_L)" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "ভাষা: (_L)" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +#| msgctxt "language" +#| msgid "Other..." msgctxt "language" -msgid "Other..." +msgid "Other…" msgstr "অন্যান্য..." -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "উপলব্ধ ভাষার সম্পূর্ণ তালিকা থেকে একটি ভাষা নির্বাচন করুন।" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#| msgid "Languages" +msgid "Language" +msgstr "ভাষা" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "অনির্দিষ্ট" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "কি-বোর্ড বিন্যাস" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "কি-বোর্ড: (_K)" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "অন্যান্য..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "উপলব্ধ কি-বোর্ড বিন্যাসের সম্পূর্ণ তালিকা থেকে একটি কি-বোর্ড বিন্যাস নির্বাচন করুন।" - -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "লেবেলে ব্যবহৃত টেক্সট" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "লেবেলে ব্যবহৃত টেক্সট" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "আইকনের নাম" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "লেবেলের সাথে ব্যবহারযোগ্য আইকন" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "ডিফল্ট বস্তু" -#: ../gui/simple-greeter/gdm-option-widget.c:525 +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" msgstr "ডিফল্ট বস্তুর ID" @@ -691,7 +719,8 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" +#| msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" msgstr "দূরবর্তী লগ-ইন (%s-র সাথে সংযোগ স্থাপন করা হচ্ছে...)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 @@ -704,8 +733,9 @@ msgstr "দূরবর্তী লগ-ইন" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "সেশান: (_S)" +#| msgid "_Sessions:" +msgid "Session" +msgstr "সেশান" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -748,50 +778,50 @@ msgstr "অভিবাদনের লোগোর জন্য ব্যবহৃত আইকনের নাম" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "সম্প্রতি নির্বাচিত কি-বোর্ড বিন্যাস" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "সম্প্রতি নির্বাচিত ভাষা" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "লগ-ইন উইন্ডোর মধ্যে ডিফল্টরূপে প্রদর্শিত কি-বোর্ড বিন্যাসের তালিকায় নির্ধারণ করা হবে।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#| msgid "" +#| "Set to a list of languages to be shown by default at the login window." +msgid "Set to a list of languages to be shown by default in the login window." msgstr "লগ-ইন উইন্ডোর মধ্যে ডিফল্টরূপে প্রদর্শিত ভাষার তালিকায় নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "অভিবাদনের লোগোর জন্য ব্যবহৃত থিমের আইকনের নাম নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "লগ-ইন উইন্ডোর মধ্যে পরিচিত ব্যবহারকারীদের নাম প্রদর্শন না করার জন্য মান true (সত্য) " "নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "লগ-ইন উইন্ডোর মধ্যে পুনরারম্ভ চিহ্নকারী বাটন প্রদর্শন না করার জন্য মান true (সত্য) " "নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#| msgid "Set to true to enable the xrandr settings manager plugin." +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "" +"XRandR বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "পটভূমি পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "media-keys পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "পর্দার উপস্থিত কি-বোর্ড সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -799,71 +829,76 @@ "বিশেষ ব্যবহারের কি-বোর্ড পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) " "নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "পর্দা বিবর্ধক সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "পর্দার তথ্য পাঠ করার ব্যবস্থা সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." -msgstr "শব্দের বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "xrandr বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" +msgstr "" +"শব্দের বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "xsettings বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true (সত্য) নির্ধারণ " "করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "ব্যানার বার্তার টেক্সট প্রদর্শনের জন্য মান true (সত্য) নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." -msgstr "উইন্ডো পরিচালন ব্যবস্থা রূপে compiz ব্যবহারের জন্য মান true (সত্য) নির্ধারণ করা হবে।" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#| msgid "Set to true to use compiz as the window manager." +msgid "Set to true to use Compiz as the window manager." +msgstr "" +"উইন্ডো পরিচালন ব্যবস্থা রূপে Compiz ব্যবহারের জন্য মান true (সত্য) নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#| msgid "" +#| "Text banner message to show on the login window when the user chooser is " +#| "empty, instead of banner_message_text." msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "ব্যবহারকারী নির্বাচনের তালিকা ফাঁকা হলে banner_message_text-র পরিবর্তে লগ-ইন " "উইন্ডোর মধ্যে প্রদর্শনযোগ্য টেক্সট ব্যানারের বার্তা।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#| msgid "Text banner message to show on the login window." +msgid "Text banner message to show in the login window." msgstr "লগ-ইন উইন্ডোর মধ্যে প্রদর্শনযোগ্য ব্যানার টেক্সট বার্তা।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#| msgid "True if the xrandr settings manager plugin is enabled." +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "XRandR বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "পটভূমির বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "media-keys বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "শব্দের বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "xrandr বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "xsettings বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True (সত্য)।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" -msgstr "উইন্ডো পরিচালনা ব্যবস্থা রূপে compiz ব্যবহার করা হবে" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#| msgid "Use compiz as the window manager" +msgid "Use Compiz as the window manager" +msgstr "উইন্ডো পরিচালনা ব্যবস্থা রূপে Compiz ব্যবহার করা হবে" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -889,191 +924,50 @@ msgid "Whether the timer is currently ticking" msgstr "টাইমার বর্তমানে গণনা করছে কি না" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "পরিচালন ব্যবস্থা" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "চিহ্নিত ব্যবহারকারীকে নিয়ন্ত্রণ করার জন্য প্রয়োগ হওয়া ব্যবহারকারী পরিচালনার অবজেক্ট।" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 +#, c-format +msgid "Log in as %s" +msgstr "%s পরিচয়ে লগ-ইন করুন" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#| msgctxt "user" +#| msgid "Other..." msgctxt "user" -msgid "Other..." +msgid "Other…" msgstr "অন্যান্য..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 msgid "Choose a different account" msgstr "ভিন্ন অ্যাকউন্ট নির্বাচন করুন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 msgid "Guest" msgstr "অতিথি" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#| msgid "Login as a temporary guest" +msgid "Log in as a temporary guest" msgstr "অস্থায়ী অতিথি অ্যাকাউন্ট সহযোগে লগ-ইন করুন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 msgid "Automatic Login" msgstr "স্বয়ংক্রিয় লগ-ইন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#| msgid "Automatically login to the system after selecting options" +msgid "Automatically log into the system after selecting options" msgstr "বিকল্প নির্বাচনের পরে স্বয়ংক্রিয়রূপে সিস্টেমে লগ-ইন করুন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "%s পরিচয়ে লগ-ইন করুন" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 msgid "Currently logged in" msgstr "বর্তমানে লগ-ইন করা হয়েছে" -#: ../gui/user-switch-applet/applet.c:164 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:168 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:172 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "ব্যবহারকারী অ্যাকাউন্টের মধ্যে দ্রুত পরিবর্তনের জন্য ব্যবহারযোগ্য মেনু।" - -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "" -"Progga \n" -"Indranil Das Gupta \n" -"Mahay Alam Khan \n" -"Samia Niamatullah \n" -"Runa Bhattacharjee (runab@redhat.com)" - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "পর্দা লক করতে ব্যর্থ: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "অস্থায়ী রূপে স্ক্রিন-সেভারের জন্য ফাঁকা পর্দা প্রয়োগ করা যাবে না: %s" - -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "লগ-আউট করতে ব্যর্থ: %s" - -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "উপলব্ধ" - -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "অদৃশ্য" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "ব্যস্ত" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "অনুপস্থিত" - -#: ../gui/user-switch-applet/applet.c:1133 -msgid "Account Information" -msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য" - -#: ../gui/user-switch-applet/applet.c:1145 -msgid "System Preferences" -msgstr "সিস্টেম সংক্রান্ত পছন্দ" - -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "পর্দা লক করুন" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "প্রস্থান..." - -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "অজানা" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনের অ্যাপ্লেট" - -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "অ্যাকাউন্টের বৈশিষ্ট্য ও অবস্থা পরিবর্তন করুন" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ভিন্ন ব্যবহারকারী অ্যাকাউন্টে দ্রুত পরিবর্তন করতে ব্যবহৃত একটি মেনু" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন ব্যবস্থা" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "User Switcher Applet Factory" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "ব্যক্তিগত তথ্য পরিবর্তন করুন (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "পরিচিতি (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ব্যবহারকারী ও দল পরিবর্তন করুন (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "শুধুমাত্র VERSION কমান্ডটি সমর্থিত হবে" @@ -1084,7 +978,8 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" +#| msgid "Ignored - retained for compatibility" +msgid "Ignored — retained for compatibility" msgstr "উপেক্ষিত - সুসংগিতর জন্য অপরিবর্তিত রাখা হয়েছে" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 @@ -1109,15 +1004,157 @@ msgid "Unable to start new display" msgstr "নতুন ডিসপ্লে আরম্ভ করতে ব্যর্থ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "পর্দার ছবি গ্রহণ করা হয়েছে" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "পর্দার একটি ছবি নিন" -msgid "%1$s, %2$s" -msgstr "%1$s, %2$s" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "groupid-র মান 0 (০) রূপে ধার্য করতে ব্যর্থ" + +#~ msgid "Shutdown Options..." +#~ msgstr "কম্পিউটার বন্ধ করা সম্বন্ধীয় বিকল্প..." + +#~ msgid "Keyboard layouts" +#~ msgstr "কি-বোর্ড বিন্যাস" + +#~ msgid "_Keyboard:" +#~ msgstr "কি-বোর্ড: (_K)" + +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "অন্যান্য..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "উপলব্ধ কি-বোর্ড বিন্যাসের সম্পূর্ণ তালিকা থেকে একটি কি-বোর্ড বিন্যাস নির্বাচন করুন।" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "সম্প্রতি নির্বাচিত কি-বোর্ড বিন্যাস" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "লগ-ইন উইন্ডোর মধ্যে ডিফল্টরূপে প্রদর্শিত কি-বোর্ড বিন্যাসের তালিকায় নির্ধারণ করা " +#~ "হবে।" + +#~ msgid "Manager" +#~ msgstr "পরিচালন ব্যবস্থা" + +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "" +#~ "চিহ্নিত ব্যবহারকারীকে নিয়ন্ত্রণ করার জন্য প্রয়োগ হওয়া ব্যবহারকারী পরিচালনার " +#~ "অবজেক্ট।" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ব্যবহারকারী অ্যাকাউন্টের মধ্যে দ্রুত পরিবর্তনের জন্য ব্যবহারযোগ্য মেনু।" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Progga \n" +#~ "Indranil Das Gupta \n" +#~ "Mahay Alam Khan \n" +#~ "Samia Niamatullah \n" +#~ "Runa Bhattacharjee (runab@redhat.com)" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "পর্দা লক করতে ব্যর্থ: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "অস্থায়ী রূপে স্ক্রিন-সেভারের জন্য ফাঁকা পর্দা প্রয়োগ করা যাবে না: %s" + +#~ msgid "Can't logout: %s" +#~ msgstr "লগ-আউট করতে ব্যর্থ: %s" + +#~ msgid "Available" +#~ msgstr "উপলব্ধ" + +#~ msgid "Invisible" +#~ msgstr "অদৃশ্য" + +#~ msgid "Busy" +#~ msgstr "ব্যস্ত" + +#~ msgid "Away" +#~ msgstr "অনুপস্থিত" + +#~ msgid "Account Information" +#~ msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য" + +#~ msgid "System Preferences" +#~ msgstr "সিস্টেম সংক্রান্ত পছন্দ" + +#~ msgid "Lock Screen" +#~ msgstr "পর্দা লক করুন" + +#~ msgid "Switch User" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন" + +#~ msgid "Quit..." +#~ msgstr "প্রস্থান..." + +#~ msgid "Unknown" +#~ msgstr "অজানা" + +#~ msgid "User Switch Applet" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনের অ্যাপ্লেট" + +#~ msgid "Change account settings and status" +#~ msgstr "অ্যাকাউন্টের বৈশিষ্ট্য ও অবস্থা পরিবর্তন করুন" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ভিন্ন ব্যবহারকারী অ্যাকাউন্টে দ্রুত পরিবর্তন করতে ব্যবহৃত একটি মেনু" + +#~ msgid "User Switcher" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন ব্যবস্থা" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "User Switcher Applet Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "ব্যক্তিগত তথ্য পরিবর্তন করুন (_I)" + +#~ msgid "_About" +#~ msgstr "পরিচিতি (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ব্যবহারকারী ও দল পরিবর্তন করুন (_E)" +#~ msgid "%1$s, %2$s" +#~ msgstr "%1$s, %2$s" diff -Nru gdm-2.32.1/po/bn.po gdm-3.0.0/po/bn.po --- gdm-2.32.1/po/bn.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/bn.po 2011-04-04 14:37:16.000000000 +0000 @@ -10,15 +10,15 @@ # Runa Bhattacharjee , 2008, 2009. # Loba Yeasmeen , 2009. # Sadia Afroz , 2010. -# Israt Jahan , 2010. +# Israt Jahan , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: bn\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-03-15 11:31+0000\n" -"PO-Revision-Date: 2010-03-22 16:02+0600\n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-04-04 16:02+0600\n" "Last-Translator: Israt Jahan \n" "Language-Team: Bengali \n" "MIME-Version: 1.0\n" @@ -26,24 +26,24 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ক্যারেক্টার ডিভাইস নয়" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "ডিসপ্লে ID" # Translated by sadia -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "আইডি" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME ডিসপ্লে ম্যানেজার স্লেভ" @@ -52,88 +52,91 @@ msgid "could not find user \"%s\" on system" msgstr "সিস্টেমের মধ্যে \"%s\" নামক ব্যবহারকারী পাওয়া যায়নি" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "লগইন সিস্টেম আরম্ভ করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "ব্যবহারকারীর পরিচয় পরীক্ষা করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "ব্যবহারকারীকে অনুমোদন প্রদান করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "পরিচয় নির্ধারণ করতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 -#| msgid "Unable to authorize user" +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "সেশন খুলতে ব্যর্থ" -#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 +#| msgid "" +#| "Could not start the X server (your graphical environment) due to some " +#| "internal error. Please contact your system administrator or check your " +#| "syslog to diagnose. In the meantime this display will be disabled. " +#| "Please restart GDM when the problem is corrected." msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" -"অভ্যন্তরীণ ত্রুটির ফলে X সার্ভার (গ্রাফিকাল পরিবেশ) আরম্ভ করতে ব্যর্থ। সমস্যা সনাক্ত " -"করার জন্য আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন অথবা syslog পরীক্ষা " -"করুন। বর্তমানে এই ডিসপ্লে নিষ্ক্রিয় করা হবে। সমস্যা সমাধান হলে GDM পুনরায় আরম্ভ করুন।" +"অভ্যন্তরীণ ত্রুটির ফলে X সার্ভার (গ্রাফিকাল পরিবেশ) আরম্ভ করতে ব্যর্থ। " +"সমস্যা সনাক্ত করার জন্য আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন " +"অথবা syslog পরীক্ষা করুন। বর্তমানে এই ডিসপ্লে নিষ্ক্রিয় করা হবে। সমস্যা " +"সমাধান হলে GDM পুনরায় আরম্ভ করুন।" -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%1s: ঊর্ধ্বতন ডিসপ্লে '%2s' এর সাথে সংযোগ করতে ব্যর্থ" # spawn: সৃষ্টি হওয়া -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "ব্যবহারকারী %s দ্বারা সার্ভার স্পন হওয়া উচিত, কিন্তু সংশ্লিষ্ট ব্যবহারকারী বর্তমানে " "উপস্থিত নেই" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid এর মান %d নির্ধারণ করতে ব্যর্থ" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s-র জন্য initgroups () বিফল" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid এর মান %d নির্ধারণ করা যায়নি" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "groupid এর মান 0 নির্ধারণ করতে ব্যর্থ" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" -msgstr "%1$s: ডিসপ্লে %2$s-র জন্য লগ-ফাইল খুলতে ব্যর্থ!" +#| msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" +msgstr "%s: ডিসপ্লে %s র জন্য লগ-ফাইল খুলতে ব্যর্থ!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%1$s: %2$s এর মান %3$s নির্ধারণ করতে ব্যর্থ" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%1s: সার্ভারের অগ্রাধিকারের মাত্রা %d নির্ধারণ করতে ব্যর্থ: %2s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%1s: ডিসপ্লে %2s এর জন্য ফাঁকা সার্ভার কমান্ড উল্লিখিত" @@ -162,217 +165,228 @@ msgid "The display device" msgstr "ডিসপ্লে ডিভাইস" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "অনুমোদন ব্যবস্থার সাথে কথোপকথন আরম্ভ করতে ত্রুটি - %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "সাধারণ বিফলতা" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "পর্যাপ্ত মেমরি অনুপস্থিত" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "অ্যাপ্লিকেশন প্রোগ্রামার সংক্রান্ত ত্রুটি" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "অজানা ত্রুটি" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "ব্যবহারকারী নাম:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +#| msgid "" +#| "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "" -"অনুমোদন ব্যবস্থাকে পছন্দসই ব্যবহারকারীর নামের প্রমপ্ট সংক্রান্ত তথ্য জানাতে ত্রুটি - %s" +"অনুমোদন ব্যবস্থাকে পছন্দসই ব্যবহারকারীর নামের প্রমপ্ট সংক্রান্ত তথ্য জানাতে " +"ত্রুটি: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর হোস্ট নাম সংক্রান্ত তথ্য জানাতে ত্রুটি - %s" +#| msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" +msgstr "" +"অনুমোদন ব্যবস্থাকে ব্যবহারকারীর হোস্ট নাম সংক্রান্ত তথ্য জানাতে ত্রুটি: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর কনসোল সংক্রান্ত তথ্য জানাতে ত্রুটি - %s" +#| msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" +msgstr "অনুমোদন ব্যবস্থাকে ব্যবহারকারীর কনসোল সংক্রান্ত তথ্য জানাতে ত্রুটি: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লে স্ট্রিং সংক্রান্ত তথ্য জানাতে ত্রুটি - - %s" +#| msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" +msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লে স্ট্রিং সংক্রান্ত তথ্য জানাতে ত্রুটি: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" -msgstr "অনুমোদন ব্যবস্থাকে ডিসপ্লের xauth পরিচয় সংক্রান্ত তথ্য জানাতে ত্রুটি - %s" +#| msgid "" +#| "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "" +"অনুমোদন ব্যবস্থাকে ডিসপ্লের xauth পরিচয় সংক্রান্ত তথ্য জানাতে ত্রুটি: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "কোনো ব্যবহারকারীর অ্যাকাউন্ট বিদ্যমান নেই" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "ব্যবহারকারীর অ্যাকাউন্টে পরিবর্তন করা যায়নি" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s নামক ব্যবহারকারী অনুপস্থিত" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s নামক দল অনুপস্থিত" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "সকেট নির্মাণ করতে ব্যর্থ!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "হোস্ট %s থেকে প্রাপ্ত XDMCP কোয়েরি প্রত্যাখ্যান করা হয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "প্যাকেট থেকে authlist পড়া যায়নি" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "checksum এ ত্রুটি" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "ঠিকানা সঠিক নয়" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: ডিসপ্লে ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: ডিসপ্লের ব্যবহৃত পোর্ট সংখ্যা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: প্যাকেট থেকে authlist পড়া যায়নি" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: checksumএ ত্রুটি" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%1$s: নিষিদ্ধ হোস্ট %2$s থেকে REQUEST পেয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: ডিসপ্লের সংখ্যা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: সংযোগের ধরণ পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: ক্লায়েন্টের ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: পরিচয় প্রমাণকারী নাম পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: পরিচয় প্রমাণকারী তথ্য পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: পরিচয় প্রমাণকারী তালিকা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: প্রস্তুতকারকের ID পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%1$s: %2$s থেকে প্রাপ্ত checksum সঠিক নয়" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%1$s: নিষিদ্ধ হোস্ট %2$s থেকে MANAGE পেয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: সেশন ID পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: ডিসপ্লে ক্লাস পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: ঠিকানা পড়তে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%1$s: নিষিদ্ধ হোস্ট %2$s থেকে KEEPALIVE পেয়েছে" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: XDMCP হেডার পড়তে ব্যর্থ!" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: XDMCP সংস্করণ সঠিক নয়!" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: ঠিকানা পার্স করতে ব্যর্থ" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "সার্ভারের হোস্ট নাম পাওয়া যায়নি: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" -msgstr "PID ফাইল %1$s লিখতে ব্যর্থ: সম্ভবত ডিস্কে অবশিষ্ট স্থান নেই: %2$s" +#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" +msgstr "PID ফাইল লিখতে ব্যর্থ %s : সম্ভবত ডিস্কে অবশিষ্ট স্থান নেই: %s" #: ../daemon/main.c:271 #, c-format @@ -423,8 +437,9 @@ msgstr "সকল সতর্কবাণী গুরুতর নির্ধারণ করা হবে" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "সুনির্দিষ্ট সময়ের পরে প্রস্থান করা হবে - ডিবাগ করার জন্য" +#| msgid "Exit after a time - for debugging" +msgid "Exit after a time (for debugging)" +msgstr "সুনির্দিষ্ট সময়ের পরে প্রস্থান করা হবে (ডিবাগ করার জন্য)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -436,20 +451,23 @@ # Translated by sadia #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "শুধুমাত্র রূট-এর ব্যবহারকারী জিডিএম রান করতে পারবেন" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME ডিসপ্লে ম্যানেজার সেশন কর্মী " #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "SPI রেজিস্ট্রি র‍্যাপারে" +#| msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" +msgstr "AT-SPI রেজিস্ট্রি র‍্যাপারে" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "লগইন উইন্ডো" @@ -461,6 +479,10 @@ msgid "Power management daemon" msgstr "পাওয়ার ব্যবস্থাপনার ডেমন" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME সেশন এক্সিলারেশন চেকার" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME বৈশিষ্ট্য সংক্রান্ত ডেমন" @@ -474,12 +496,14 @@ msgstr "পর্দার একটি অংশ বিবর্ধন করা হবে" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" -msgstr "GNOME অনস্ক্রিন কীবোর্ড" +#| msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" +msgstr "GNOME অন-স্ক্রিন কীবোর্ড" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" -msgstr "পর্দায় স্থাপিত কীবোর্ড ব্যবহার করা হবে" +#| msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" +msgstr "অন-স্ক্রীন কীবোর্ড ব্যবহার করা হবে" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -497,49 +521,49 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit অনুমোদনের এজেন্ট" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "সিস্টেম নির্বাচন করুন" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: XDMCP বাফার নির্মাণ করতে ব্যর্থ!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP শীর্ষচরণ পড়তে ব্যর্থ!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "মান" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "সমাপ্ত সময়ের শতাংশ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "নিষ্ক্রিয় পাঠ্য" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "ব্যবহারকারীরা দ্বারা কোনো বস্তু নির্বাচিত না হলে, লেবেলের জন্য ব্যবহারযোগ্য পাঠ্য" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "সক্রিয় পাঠ্য" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ব্যবহারকারীরা দ্বারা কোনো বস্তু নির্বাচিত হলে, লেবেলের জন্য ব্যবহারযোগ্য পাঠ্য" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "দৃশ্যমান তালিকা" # Translated by sadia -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "নির্বাচনকারীর তালিকা প্রদর্শিত হবে কি না" @@ -568,15 +592,6 @@ msgstr "%a %l:%M:%S %p" # Translated by sadia -#. translators: This is the time format to use for the date -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:87 -#: ../gui/simple-greeter/gdm-clock-widget.c:94 -#, c-format -msgid "%x" -msgstr "%x" - -# Translated by sadia #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. @@ -584,126 +599,129 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." -msgstr "স্বয়ংক্রিয় লগইন করছে..." - -#. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." -msgstr "বাতিল করা হচ্ছে..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +#| msgid "Automatically logging in..." +msgid "Automatically logging in…" +msgstr "স্বয়ংক্রিয় লগইন করছে…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "ভাষা নির্বাচন করে লগইন ক্লিক করুন" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +#| msgid "Cancelling..." +msgid "Cancelling…" +msgstr "বাতিল করা হচ্ছে…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "পছন্দসই" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "পছন্দসই সেশন" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -msgid "Computer Name" -msgstr "কম্পিউটারের নাম" +#| msgid "Panel" +msgid "Cancel" +msgstr "বাতিল" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" -msgstr "লগইন করুন" +msgid "Computer Name" +msgstr "কম্পিউটারের নাম" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#| msgid "Log In" +msgid "Login" +msgstr "লগইন" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "অনবরুদ্ধ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "সংস্করণ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "প্যানেল" - -# Translated by sadia -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "বন্ধ করার অপশন..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "স্থগিত করুন" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "পুনরায় আরম্ভ করুন" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "বন্ধ করুন" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "অজানা অবশিষ্ট সময়" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "প্যানেল" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ভাষা" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "ভাষা: (_L)" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "ভাষা: (_L)" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +#| msgctxt "language" +#| msgid "Other..." msgctxt "language" -msgid "Other..." -msgstr "অন্যান্য..." +msgid "Other…" +msgstr "অন্যান্য…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "বিদ্যমান ভাষার সম্পূর্ণ তালিকা থেকে একটি ভাষা নির্বাচন করুন।" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#| msgid "Languages" +msgid "Language" +msgstr "ভাষা" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "অনির্দিষ্ট" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "কীবোর্ড বিন্যাস" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "কীবোর্ড: (_K)" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "অন্যান্য..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"বিদ্যমান কীবোর্ড বিন্যাসের সম্পূর্ণ তালিকা থেকে একটি কীবোর্ড বিন্যাস নির্বাচন করুন।" - -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "লেবেল পাঠ্য" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "লেবেল হিসেবে ব্যবহৃত টেক্সট" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "আইকনের নাম" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "লেবেলের সাথে ব্যবহারযোগ্য আইকন" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "পূর্বনির্ধারিত উপাদান" # Translated by sadia -#: ../gui/simple-greeter/gdm-option-widget.c:525 +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" msgstr "পূর্বনির্ধারিত বিষয়টির আইডি" @@ -717,8 +735,9 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "দূরবর্তী লগইন (%s-র সাথে সংযোগ স্থাপন করা হচ্ছে...)" +#| msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "দূরবর্তী লগইন (%s-র সাথে সংযোগ স্থাপন করা হচ্ছে…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -730,8 +749,9 @@ msgstr "দূরবর্তী লগইন" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "সেশন: (_S)" +#| msgid "_Sessions:" +msgid "Session" +msgstr "সেশন" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -774,53 +794,51 @@ msgstr "অভিবাদনের লোগোর জন্য ব্যবহৃত আইকনের নাম" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "সম্প্রতি নির্বাচিত কীবোর্ড বিন্যাস" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "সম্প্রতি নির্বাচিত ভাষা" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#| msgid "" +#| "Set to a list of languages to be shown by default at the login window." +msgid "Set to a list of languages to be shown by default in the login window." msgstr "" -"লগইন উইন্ডোর মধ্যে পূর্বনির্ধারিত হিসেবে প্রদর্শিত কীবোর্ড বিন্যাসের তালিকায় নির্ধারণ " +"লগইন উইন্ডোর মধ্যে পূর্বনির্ধারিত হিসেবে প্রদর্শিত ভাষার তালিকায় নির্ধারণ " "করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr "" -"লগইন উইন্ডোর মধ্যে পূর্বনির্ধারিত হিসেবে প্রদর্শিত ভাষার তালিকায় নির্ধারণ করা হবে।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "অভিবাদনের লোগোর জন্য ব্যবহৃত থিমের আইকনের নাম নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "লগইন উইন্ডোর মধ্যে পরিচিত ব্যবহারকারীদের নাম প্রদর্শন না করার জন্য মান true " "নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "লগইন উইন্ডোর মধ্যে পুনরারম্ভ বোতাম প্রদর্শন না করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#| msgid "Set to true to enable the xrandr settings manager plugin." +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "" +"XRandR বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "পটভূমি পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "media-keys পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "পর্দার উপস্থিত কীবোর্ড সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -828,70 +846,75 @@ "অ্যাক্সেসিবিলিটি কীবোর্ড সেটিং ব্যবস্থাপনার জন্য প্লাগ-ইন সক্রিয় করার জন্য মান true " "নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "পর্দা বিবর্ধক সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "পর্দা পাঠক সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "শব্দের বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "xrandr বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "xsettings বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় করার জন্য মান true নির্ধারণ করুন।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "ব্যানার বার্তার পাঠ্য প্রদর্শনের জন্য মান true নির্ধারণ করা হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." -msgstr "উইন্ডো পরিচালন ব্যবস্থা রূপে compiz ব্যবহারের জন্য মান true নির্ধারণ করা হবে।" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#| msgid "Set to true to use compiz as the window manager." +msgid "Set to true to use Compiz as the window manager." +msgstr "" +"উইন্ডো পরিচালন ব্যবস্থা রূপে Compiz ব্যবহারের জন্য মান true নির্ধারণ করা " +"হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#| msgid "" +#| "Text banner message to show on the login window when the user chooser is " +#| "empty, instead of banner_message_text." msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -"ব্যবহারকারী নির্বাচনের তালিকা ফাঁকা হলে banner_message_text এর পরিবর্তে লগইন " -"উইন্ডোর মধ্যে প্রদর্শনযোগ্য পাঠ্য ব্যানার বার্তা।" +"ব্যবহারকারী নির্বাচনের তালিকা ফাঁকা হলে banner_message_text এর পরিবর্তে, " +"লগইন উইন্ডোর মধ্যে প্রদর্শনযোগ্য পাঠ্য ব্যানার বার্তা।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#| msgid "Text banner message to show on the login window." +msgid "Text banner message to show in the login window." msgstr "লগইন উইন্ডোর মধ্যে প্রদর্শনযোগ্য পাঠ্য ব্যানার বার্তা।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#| msgid "True if the xrandr settings manager plugin is enabled." +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "XRandR বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "পটভূমির বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "media-keys বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "শব্দের বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "xrandr বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "xsettings বৈশিষ্ট্য পরিচালনার প্লাগ-ইন সক্রিয় হলে মান True হবে।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" -msgstr "উইন্ডো ম্যানেজার হিসেবে compiz ব্যবহার করা হবে" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#| msgid "Use compiz as the window manager" +msgid "Use Compiz as the window manager" +msgstr "উইন্ডো ম্যানেজার হিসেবে Compiz ব্যবহার করা হবে" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -918,192 +941,50 @@ msgid "Whether the timer is currently ticking" msgstr "টাইমার বর্তমানে গণনা করছে কি না" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "ম্যানেজার" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "ব্যবহারকারী নিয়ন্ত্রণ করার জন্য প্রয়োগ হওয়া ব্যবহারকারী ম্যানেজার বস্তু।" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "%s পরিচয়ে লগইন করুন" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 +#| msgctxt "user" +#| msgid "Other..." msgctxt "user" -msgid "Other..." -msgstr "অন্যান্য..." +msgid "Other…" +msgstr "অন্যান্য…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "ভিন্ন অ্যাকউন্ট নির্বাচন করুন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "অতিথি" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" -msgstr "অস্থায়ী অতিথি হিসেবে লগইন করুন" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +#| msgid "Login as a temporary guest" +msgid "Log in as a temporary guest" +msgstr "অস্থায়ী অতিথি হিসেবে লগইন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "স্বয়ংক্রিয় লগইন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" -msgstr "বিকল্প নির্বাচনের পরে স্বয়ংক্রিয়রূপে সিস্টেমে লগইন করুন" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "%s পরিচয়ে লগইন করুন" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +#| msgid "Automatically login to the system after selecting options" +msgid "Automatically log into the system after selecting options" +msgstr "বিকল্প নির্বাচনের পরে স্বয়ংক্রিয়রূপে সিস্টেমে লগইন" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "বর্তমানে লগইন করা হয়েছে" -#: ../gui/user-switch-applet/applet.c:164 -msgid "" -"The User Switch Applet 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." -msgstr "" -"ব্যবারকারী পরিবর্তন অ্যাপ্লেট একটি বিনামূল্য সফ্টওয়্যার; Free Software Foundation " -"দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা " -"যাবে; হয় লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) সাম্প্রতিক কোনো সংস্করণ।" - -#: ../gui/user-switch-applet/applet.c:168 -msgid "" -"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." -msgstr "" -"এটি বিতরণ করার মূল উদ্দেশ্য হলো ব্যবহারকারী এর দ্বারা উপকৃত হবেন, কিন্তু কোন " -"ওয়ারেন্টি ছাড়াই; এমনকি বাণিজ্যিক এবং একটি নির্দিষ্ট কাজের উপযোগিতার নিহিত " -"ওয়ারেন্টি ছাড়াই। আরও অধিক জানতে GNU General Public License দেখুন।" - -#: ../gui/user-switch-applet/applet.c:172 -msgid "" -"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 " -msgstr "" -"আপনি এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি পাবেন; যদি " -"না থাকে, তাহলে ree Software Foundation, Inc., 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-1301, USA লিখে পাঠান।" - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "ব্যবহারকারী অ্যাকাউন্টের মধ্যে দ্রুত পরিবর্তনের জন্য ব্যবহারযোগ্য মেনু।" - -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "" -"অঙ্কুর প্রকল্পের পক্ষে, প্রজ্ঞা [ abulfazl@juniv.edu ]\n" -"ইন্দ্রনীল দাশগুপ্ত \n" -"মাহে আলম খান \n" -"সামিয়া নিয়ামতুল্লাহ \n" -"রুণা ভট্টাচার্য্য (runab@redhat.com)\n" -"লোবা ইয়াসমিন \n" -"সাদিয়া আফরোজ \n" -"ইসরাত জাহান " - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "পর্দা লক করতে ব্যর্থ: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "ফাঁকা পর্দায় অস্থায়িভাবে স্ক্রিনসেভার নির্ধারণ করা যাবে না: %s" - -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "লগ-আউট করতে ব্যর্থ: %s" - -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "উপস্থিত" - -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "অদৃশ্য" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "ব্যস্ত" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "অন্যত্র" - -#: ../gui/user-switch-applet/applet.c:1133 -msgid "Account Information" -msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য" - -#: ../gui/user-switch-applet/applet.c:1145 -msgid "System Preferences" -msgstr "সিস্টেমের পছন্দসমূহ" - -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "পর্দা লক করুন" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "প্রস্থান..." - -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "অজানা" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনের অ্যাপ্লেট" - -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "অ্যাকাউন্টের সেটিং ও অবস্থা পরিবর্তন করুন" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ভিন্ন ব্যবহারকারী অ্যাকাউন্টে দ্রুত পরিবর্তন করতে ব্যবহৃত একটি মেনু" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনকারী" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "ব্যবহারকারী পরিবর্তন কারী অ্যাপলেট ফ্যাক্টরি" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "ব্যক্তিগত তথ্য সম্পাদনা (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "পরিচিতি (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ব্যবহারকারী ও গ্রুপ পরিবর্তন (_E)" - # Translated by sadia #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" @@ -1115,8 +996,9 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "উপেক্ষিত - সুসংগিতর জন্য অপরিবর্তিত রাখা হয়েছে" +#| msgid "Ignored - retained for compatibility" +msgid "Ignored — retained for compatibility" +msgstr "উপেক্ষিত — সুসংগিতর জন্য অপরিবর্তিত রাখা হয়েছে" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 msgid "Debugging output" @@ -1140,15 +1022,163 @@ msgid "Unable to start new display" msgstr "নতুন ডিসপ্লে আরম্ভ করতে ব্যর্থ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "স্ক্রিনশট গ্রহণ করা হয়েছে" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "পর্দার একটি ছবি নিন" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "groupid এর মান 0 নির্ধারণ করতে ব্যর্থ" + +# Translated by sadia +#~ msgid "%x" +#~ msgstr "%x" + +# Translated by sadia +#~ msgid "Shutdown Options..." +#~ msgstr "বন্ধ করার অপশন..." + +#~ msgid "Keyboard layouts" +#~ msgstr "কীবোর্ড বিন্যাস" + +#~ msgid "_Keyboard:" +#~ msgstr "কীবোর্ড: (_K)" + +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "অন্যান্য..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "বিদ্যমান কীবোর্ড বিন্যাসের সম্পূর্ণ তালিকা থেকে একটি কীবোর্ড বিন্যাস নির্বাচন করুন।" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "সম্প্রতি নির্বাচিত কীবোর্ড বিন্যাস" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "লগইন উইন্ডোর মধ্যে পূর্বনির্ধারিত হিসেবে প্রদর্শিত কীবোর্ড বিন্যাসের তালিকায় " +#~ "নির্ধারণ করা হবে।" + +#~ msgid "Manager" +#~ msgstr "ম্যানেজার" + +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "ব্যবহারকারী নিয়ন্ত্রণ করার জন্য প্রয়োগ হওয়া ব্যবহারকারী ম্যানেজার বস্তু।" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "ব্যবারকারী পরিবর্তন অ্যাপ্লেট একটি বিনামূল্য সফ্টওয়্যার; Free Software Foundation " +#~ "দ্বারা প্রকাশিত GNU General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন " +#~ "করা যাবে; হয় লাইসেন্সের সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) সাম্প্রতিক কোনো " +#~ "সংস্করণ।" + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "এটি বিতরণ করার মূল উদ্দেশ্য হলো ব্যবহারকারী এর দ্বারা উপকৃত হবেন, কিন্তু কোন " +#~ "ওয়ারেন্টি ছাড়াই; এমনকি বাণিজ্যিক এবং একটি নির্দিষ্ট কাজের উপযোগিতার নিহিত " +#~ "ওয়ারেন্টি ছাড়াই। আরও অধিক জানতে GNU General Public License দেখুন।" + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "আপনি এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি পাবেন; " +#~ "যদি না থাকে, তাহলে ree Software Foundation, Inc., 51 Franklin Street, " +#~ "Fifth Floor, Boston, MA 02110-1301, USA লিখে পাঠান।" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ব্যবহারকারী অ্যাকাউন্টের মধ্যে দ্রুত পরিবর্তনের জন্য ব্যবহারযোগ্য মেনু।" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "অঙ্কুর প্রকল্পের পক্ষে, প্রজ্ঞা [ abulfazl@juniv.edu ]\n" +#~ "ইন্দ্রনীল দাশগুপ্ত \n" +#~ "মাহে আলম খান \n" +#~ "সামিয়া নিয়ামতুল্লাহ \n" +#~ "রুণা ভট্টাচার্য্য (runab@redhat.com)\n" +#~ "লোবা ইয়াসমিন \n" +#~ "সাদিয়া আফরোজ \n" +#~ "ইসরাত জাহান " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "পর্দা লক করতে ব্যর্থ: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "ফাঁকা পর্দায় অস্থায়িভাবে স্ক্রিনসেভার নির্ধারণ করা যাবে না: %s" + +#~ msgid "Can't logout: %s" +#~ msgstr "লগ-আউট করতে ব্যর্থ: %s" + +#~ msgid "Available" +#~ msgstr "উপস্থিত" + +#~ msgid "Invisible" +#~ msgstr "অদৃশ্য" + +#~ msgid "Busy" +#~ msgstr "ব্যস্ত" + +#~ msgid "Away" +#~ msgstr "অন্যত্র" + +#~ msgid "Account Information" +#~ msgstr "অ্যাকাউন্ট সংক্রান্ত তথ্য" + +#~ msgid "System Preferences" +#~ msgstr "সিস্টেমের পছন্দসমূহ" + +#~ msgid "Lock Screen" +#~ msgstr "পর্দা লক করুন" + +#~ msgid "Switch User" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন" + +#~ msgid "Quit..." +#~ msgstr "প্রস্থান..." + +#~ msgid "Unknown" +#~ msgstr "অজানা" + +#~ msgid "User Switch Applet" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনের অ্যাপ্লেট" + +#~ msgid "Change account settings and status" +#~ msgstr "অ্যাকাউন্টের সেটিং ও অবস্থা পরিবর্তন করুন" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ভিন্ন ব্যবহারকারী অ্যাকাউন্টে দ্রুত পরিবর্তন করতে ব্যবহৃত একটি মেনু" + +#~ msgid "User Switcher" +#~ msgstr "ব্যবহারকারী অ্যাকাউন্ট পরিবর্তনকারী" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "ব্যবহারকারী পরিবর্তন কারী অ্যাপলেট ফ্যাক্টরি" + +#~ msgid "Edit Personal _Information" +#~ msgstr "ব্যক্তিগত তথ্য সম্পাদনা (_I)" + +#~ msgid "_About" +#~ msgstr "পরিচিতি (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ব্যবহারকারী ও গ্রুপ পরিবর্তন (_E)" + #~ msgid "Enable debugging code" #~ msgstr "কোড ডিবাগকরণ সক্রিয় করা হবে" diff -Nru gdm-2.32.1/po/ca.po gdm-3.0.0/po/ca.po --- gdm-2.32.1/po/ca.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ca.po 2011-04-04 14:37:16.000000000 +0000 @@ -3,16 +3,17 @@ # Softcatalà , 2000, 2001, 2002. # Jordi Mallach , 2002, 2003, 2004, 2005, 2006. # Xavier Conde Rueda , 2006, 2007 -# David Planella Molas , 2008 +# David Planella Molas , 2008, 2009, 2010, 2011 # msgid "" msgstr "" "Project-Id-Version: gdm2 2.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-10 22:51+0200\n" -"PO-Revision-Date: 2010-09-21 21:41+0200\n" +"POT-Creation-Date: 2011-03-30 21:46+0200\n" +"PO-Revision-Date: 2011-03-30 21:47+0200\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,28 +45,28 @@ msgid "could not find user \"%s\" on system" msgstr "no s'ha trobat l'usuari «%s» al sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "No s'ha pogut inicialitzar el sistema d'entrada" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "No s'ha pogut autenticar l'usuari" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "No s'ha pogut autoritzar l'usuari" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "No s'han pogut establir les credencials" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "No s'ha pogut obrir la sessió" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -90,17 +91,17 @@ "L'usuari %s havia d'engendrar el servidor però aquest usuari no existeix" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "No s'ha pogut definir el groupid com a %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "ha fallat l'initgroups () per a %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "No s'ha pogut definir l'userid com a %d" @@ -150,83 +151,83 @@ msgid "The display device" msgstr "El dispositiu de pantalla" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" -"s'ha produït un error en iniciar la conversa amb el sistema d'autenticació: %" -"s" +"s'ha produït un error en iniciar la conversa amb el sistema d'autenticació - " +"%s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "s'ha produït una fallada general" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "s'ha exhaurit la memòria" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "s'ha produït un error de programació de l'aplicació" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "error desconegut" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Nom d'usuari:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "s'ha produït un error en informar el sistema d'autenticació de l'indicador " "de nom d'usuari preferit: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "s'ha produït un error en informar el sistema d'autenticació del nom de " "l'ordinador de l'usuari: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "s'ha produït un error en informar el sistema d'autenticació de la consola de " "l'usuari: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "s'ha produït un error en informar el sistema d'autenticació de la cadena de " "la pantalla: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "s'ha produït un error en informar el sistema d'autenticació de les " "credencials xauth de la pantalla: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "no hi ha tal compte d'usuari disponible" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "No s'ha pogut commutar a aquest usuari" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "No existeix l'usuari %s" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "No existeix el grup %s" @@ -372,8 +373,8 @@ #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" -"No es pot escriure el fitxer de PID %s: pot ser que no quedi espai al disc: %" -"s" +"No es pot escriure el fitxer de PID %s: pot ser que no quedi espai al disc: " +"%s" #: ../daemon/main.c:271 #, c-format @@ -394,8 +395,8 @@ #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "" -"El directori d'autenticació %s no és propietat de l'usuari %d ni del grup %" -"d. S'interromprà." +"El directori d'autenticació %s no és propietat de l'usuari %d ni del grup " +"%d. S'interromprà." #: ../daemon/main.c:372 #, c-format @@ -458,7 +459,7 @@ msgstr "Embolcall del servei de registre de l'accessibilitat (AT-SPI)" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1646 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Finestra d'entrada" @@ -470,6 +471,10 @@ msgid "Power management daemon" msgstr "Dimoni de la gestió de l'energia" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Comprovador de l'acceleració de la sessió del GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Dimoni dels paràmetres del GNOME" @@ -507,7 +512,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agent d'autenticació del PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Seleccioneu el sistema" @@ -519,37 +524,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: no s'ha pogut llegir la capçalera de l'XDMCP" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "percentatge de temps completat" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Text inactiu" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "El text a utilitzar a l'etiqueta si l'usuari encara no ha seleccionat cap " "element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Text actiu" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "El text a utilitzar a l'etiqueta si l'usuari ha seleccionat un element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "La llista és visible" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Si la llista per triar l'usuari és visible" @@ -585,65 +590,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "S'està entrant de manera automàtica…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Seleccioneu la llengua i feu clic a «Entra»" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "S'està cancel·lant…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalitzat" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sessió personalitzada" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancel·la" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nom de l'ordinador" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Entra" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desbloca" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versió" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Quadre" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opcions d'aturada…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Atura temporalment" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reinicia" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Atura" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalitzat" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Es desconeix el temps restant" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sessió personalitzada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Quadre" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Llengües" @@ -671,36 +680,10 @@ msgid "Language" msgstr "Llengua" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "No especificat" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Disposicions de teclat" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teclat:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Altres…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Trieu una disposició de teclat de les que hi ha disponibles a la llista." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Teclat" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Text de l'etiqueta" @@ -793,67 +776,56 @@ msgstr "El nom de la icona a utilitzar com a logotip del rebedor" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Disposicions de teclat seleccionades recentment" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Llengües seleccionades recentment" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Establiu-ho a una llista de disposicions de teclat a mostrar de manera " -"predeterminada a la finestra d'entrada." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Establiu-ho a una llista de llengües a mostrar de manera predeterminada a la " "finestra d'entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Establiu-ho al nom de la icona de tema a utilitzar per al logotip del " "rebedor." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Establiu-ho a «true» (cert) per evitar que es mostrin els usuaris coneguts a " "la pantalla d'entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" -"Establiu-ho a «true» (cert) per evitar que es mostrin els botons de reinici a " -"la pantalla d'entrada." +"Establiu-ho a «true» (cert) per evitar que es mostrin els botons de reinici " +"a la pantalla d'entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Establiu-ho a «true» (cert) per habilitar el connector del gestor de " "paràmetres XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Establiu-ho a «true» (cert) per habilitar el connector de gestió dels " "paràmetres del fons de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Establiu-ho a «true» (cert) per habilitar el connector de gestió dels " "paràmetres de les tecles multimèdia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Establiu-ho a «true» (cert) per habilitar el teclat en pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -861,36 +833,38 @@ "Establiu-ho a «true» (cert) per habilitar el connector de gestió dels " "paràmetres del teclat accessible." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Establiu-ho a «true» (cert) per habilitar l'ampliador de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Establiu-ho a «true» (cert) per habilitar el lector de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Establiu-ho a «true» (cert) per habilitar el connector de gestió dels " "paràmetres del so." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Establiu-ho a «true» (cert) per habilitar el connector de gestió dels " "paràmetres de l'xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." -msgstr "Establiu-ho a «true» (cert) per mostrar el text del missatge del bàner." +msgstr "" +"Establiu-ho a «true» (cert) per mostrar el text del missatge del bàner." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" -"Establiu-ho a «true» (cert) per utilitzar el Compiz com a gestor de finestres." +"Establiu-ho a «true» (cert) per utilitzar el Compiz com a gestor de " +"finestres." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -898,39 +872,39 @@ "Missatge de text del bàner a mostrar a la finestra d'entrada quan el " "selector d'usuari sigui buit, en lloc del paràmetre «banner_message_text»." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Missatge de text del bàner a mostrar a la finestra d'entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "És cert si el connector del gestor de paràmetres XRrandR està habilitat." # FIXME: a quin «background» es refereix? (dpm) -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "És cert si el connector del gestor de paràmetres de fons està habilitat." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "És cert si el connector del gestor de paràmetres de les tecles multimèdia " "està habilitat." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "És cert si el connector del gestor de paràmetres del so està habilitat." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "És cert si el connector del gestor de paràmetres de l'xsettings està " "habilitat." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Utilitza el Compiz com a gestor de finestres" @@ -958,8 +932,8 @@ msgid "Whether the timer is currently ticking" msgstr "Si el temporitzador està activat" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Entra com a %s" @@ -969,172 +943,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Altres…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Seleccioneu un compte diferent" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Convidat" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Entra com a convidat temporal" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Entrada automàtica" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Entra automàticament a la sessió després de seleccionar les opcions" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Actualment connectat" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"La miniaplicació del commutador d'usuaris és programari lliure; podeu " -"redistribuir-la i/o modificar-la d'acord amb els termes de la llicència " -"pública general de GNU tal com la publica la Free Software Foundation, ja " -"sigui la versió 2 de la llicència, o bé, si així ho voleu, qualsevol altra " -"versió posterior." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Aquest programa es distribueix amb l'esperança que sigui útil, però SENSE " -"CAP TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-" -"S'HI, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN ÚS " -"CONCRET. Vegeu la llicència pública general de GNU per obtenir-ne més " -"detalls." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Hauríeu d'haver rebut una còpia de la llicència pública general de GNU " -"juntament amb aquest programa. Si aquest no és el cas, escriviu a la Free " -"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" -"1301, USA." - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Un menú per commutar ràpidament d'usuari." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Jordi Mallach \n" -"Xavier Conde Rueda \n" -"David Planella Molas " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "No es pot blocar la pantalla: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"No es pot fer que l'estalvi de pantalla enfosqueixi la pantalla de manera " -"transitòria: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "No es pot sortir: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Disponible" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Invisible" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Ocupat" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Absent" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Informació del compte" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Preferències del sistema" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Bloca la pantalla" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Commuta d'usuari" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Surt…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Miniaplicació del commutador d'usuari" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Canvia els paràmetres del compte i l'estat" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menú per commutar ràpidament d'usuari" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Commutador d'usuari" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fàbrica de la miniaplicació del commutador d'usuari" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Edita la _informació personal" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Quant a" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Edita els usuaris i els grups" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Només s'admet l'ordre VERSION" @@ -1170,15 +1007,150 @@ msgid "Unable to start new display" msgstr "No es pot iniciar la pantalla nova" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "S'ha fet una captura de pantalla" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Fes una foto de la pantalla" +#~ msgid "Keyboard layouts" +#~ msgstr "Disposicions de teclat" + +#~ msgid "_Keyboard:" +#~ msgstr "_Teclat:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Altres…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Trieu una disposició de teclat de les que hi ha disponibles a la llista." + +#~ msgid "Keyboard" +#~ msgstr "Teclat" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Disposicions de teclat seleccionades recentment" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Establiu-ho a una llista de disposicions de teclat a mostrar de manera " +#~ "predeterminada a la finestra d'entrada." + +#~ msgid "Shutdown Options…" +#~ msgstr "Opcions d'aturada…" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "La miniaplicació del commutador d'usuaris és programari lliure; podeu " +#~ "redistribuir-la i/o modificar-la d'acord amb els termes de la llicència " +#~ "pública general de GNU tal com la publica la Free Software Foundation, ja " +#~ "sigui la versió 2 de la llicència, o bé, si així ho voleu, qualsevol " +#~ "altra versió posterior." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Aquest programa es distribueix amb l'esperança que sigui útil, però SENSE " +#~ "CAP TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE " +#~ "LIMITAR-S'HI, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A " +#~ "UN ÚS CONCRET. Vegeu la llicència pública general de GNU per obtenir-ne " +#~ "més detalls." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Hauríeu d'haver rebut una còpia de la llicència pública general de GNU " +#~ "juntament amb aquest programa. Si aquest no és el cas, escriviu a la Free " +#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " +#~ "02110-1301, USA." + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Un menú per commutar ràpidament d'usuari." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Jordi Mallach \n" +#~ "Xavier Conde Rueda \n" +#~ "David Planella Molas " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "No es pot blocar la pantalla: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "No es pot fer que l'estalvi de pantalla enfosqueixi la pantalla de manera " +#~ "transitòria: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "No es pot sortir: %s" + +#~ msgid "Available" +#~ msgstr "Disponible" + +#~ msgid "Invisible" +#~ msgstr "Invisible" + +#~ msgid "Busy" +#~ msgstr "Ocupat" + +#~ msgid "Away" +#~ msgstr "Absent" + +#~ msgid "Account Information" +#~ msgstr "Informació del compte" + +#~ msgid "System Preferences" +#~ msgstr "Preferències del sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Bloca la pantalla" + +#~ msgid "Switch User" +#~ msgstr "Commuta d'usuari" + +#~ msgid "Quit…" +#~ msgstr "Surt…" + +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicació del commutador d'usuari" + +#~ msgid "Change account settings and status" +#~ msgstr "Canvia els paràmetres del compte i l'estat" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Un menú per commutar ràpidament d'usuari" + +#~ msgid "User Switcher" +#~ msgstr "Commutador d'usuari" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fàbrica de la miniaplicació del commutador d'usuari" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Edita la _informació personal" + +#~ msgid "_About" +#~ msgstr "_Quant a" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Edita els usuaris i els grups" + #~ msgid "Unknown" #~ msgstr "Desconegut" @@ -1470,8 +1442,8 @@ #~ msgstr "" #~ "No s'ha pogut iniciar la sessió i per tant s'ha iniciat la sessió xterm a " #~ "prova de fallades. Les finestres només tenen el focus si hi poseu el " -#~ "cursor a sobre. Per a sortir d'aquest mode, introduïu «exit» a la finestra " -#~ "del cantó superior esquerre" +#~ "cursor a sobre. Per a sortir d'aquest mode, introduïu «exit» a la " +#~ "finestra del cantó superior esquerre" #~ msgid "%s: Could not write new authorization entry: %s" #~ msgstr "%s: no s'ha pogut crear una nova entrada d'autorització: %s" @@ -2571,8 +2543,8 @@ #~ "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-" #~ "authfile %s': %s" #~ msgstr "" -#~ "%s: s'ha produït un error en executar «%s --display %s --display-authfile %" -#~ "s --to %s --to-authfile %s»: %s" +#~ "%s: s'ha produït un error en executar «%s --display %s --display-authfile " +#~ "%s --to %s --to-authfile %s»: %s" #~ msgid "%s: No XDMCP support" #~ msgstr "%s: no es permet l'ús de l'XDMCP" @@ -4874,13 +4846,13 @@ #~ msgstr "(memòria intermèdia)" #~ msgid "" -#~ "An error occurred while loading user interface element %s%s from file %" -#~ "s. Possibly the glade interface description was corrupted. %s cannot " +#~ "An error occurred while loading user interface element %s%s from file " +#~ "%s. Possibly the glade interface description was corrupted. %s cannot " #~ "continue and will exit now. You should check your installation of %s or " #~ "reinstall %s." #~ msgstr "" -#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s%" -#~ "s del fitxer %s. Possiblement la descripció d'interfície de glade estava " +#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s" +#~ "%s del fitxer %s. Possiblement la descripció d'interfície de glade estava " #~ "corrompuda. %s no pot continuar i sortirà ara. Hauríeu de comprovar la " #~ "instal·lació de %s o tornar a instal·lar %s." @@ -4906,14 +4878,14 @@ #~ "interface description was corrupted. %s cannot continue and will exit " #~ "now. You should check your installation of %s or reinstall %s." #~ msgstr[0] "" -#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s%" -#~ "s del fitxer %s. El giny de tipus CList ha de tenir %d columna. " +#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s" +#~ "%s del fitxer %s. El giny de tipus CList ha de tenir %d columna. " #~ "Possiblement la descripció d'interfície de glade era corrupta. %s no pot " #~ "continuar i sortirà ara. Hauríeu de comprovar la instal·lació de %s o " #~ "tornar a instal·lar %s." #~ msgstr[1] "" -#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s%" -#~ "s del fitxer %s. El giny de tipus CList ha de tenir %d columnes. " +#~ "S'ha produït un error en carregar l'element de la interfície d'usuari %s" +#~ "%s del fitxer %s. El giny de tipus CList ha de tenir %d columnes. " #~ "Possiblement la descripció d'interfície de glade era corrupta. %s no pot " #~ "continuar i sortirà ara. Hauríeu de comprovar la instal·lació de %s o " #~ "tornar a instal·lar %s." diff -Nru gdm-2.32.1/po/cs.po gdm-3.0.0/po/cs.po --- gdm-2.32.1/po/cs.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/cs.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,5 +1,5 @@ # Czech translation of gdm. -# Copyright (C) 2002, 2003, 2007, 2008, 2009, 2010 the author(s) of gdm. +# Copyright (C) 2002, 2003, 2007, 2008, 2009, 2010, 2011 the author(s) of gdm. # Copyright (C) 2003, 2004, 2005, 2006 Miloslav Trmac . # Copyright (C) 2006 Lukas Novotny . # Copyright (C) 2006 Petr Tomeš . @@ -10,13 +10,13 @@ # Lukas Novotny , 2006. # Petr Tomeš , 2006. # Jakub Friedl , 2007. -# Petr Kovar , 2008, 2009, 2010. +# Petr Kovar , 2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-27 14:42+0200\n" -"PO-Revision-Date: 2010-09-27 14:42+0200\n" +"POT-Creation-Date: 2011-04-03 16:06+0200\n" +"PO-Revision-Date: 2011-04-03 16:05+0200\n" "Last-Translator: Petr Kovar \n" "Language-Team: Czech \n" "Language: cs\n" @@ -24,7 +24,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.1\n" #: ../common/gdm-common.c:456 #, c-format @@ -51,28 +51,28 @@ msgid "could not find user \"%s\" on system" msgstr "v systému nelze najít uživatele \"%s\"" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Nelze spustit systém přihlášení" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Nelze ověřit uživatele" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Nelze potvrdit uživatele" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Nelze vytvořit pověření" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Nelze otevřít sezení" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -95,17 +95,17 @@ msgstr "Server měl být spuštěný uživatelem %s, ale takový uživatel neexistuje" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nelze nastavit groupid na %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () selhalo u %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nelze nastavit userid na %d" @@ -155,75 +155,75 @@ msgid "The display device" msgstr "Zařízení displeje" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "chyba při spouštění komunikace s ověřovacím systémem: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "chyba při spouštění komunikace s ověřovacím systémem - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "obecné selhání" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "nedostatek paměti" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "aplikační chyba programátora" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "neznámá chyba" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Uživatel:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "chyba při informování ověřovacího systému o preferovaném dotazu na " "uživatelské jméno: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "chyba při informování ověřovacího systému o názvu počítače uživatele: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "chyba při informování ověřovacího systému o uživatelově konzole: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "chyba při informování ověřovacího systému o řetězci displeje: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "chyba při informování ověřovacího systému o pověření xauth displeje: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "není dostupný žádný uživatelský účet" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Nelze změnit uživatele" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Uživatel %s neexistuje" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Skupina %s neexistuje" @@ -445,7 +445,7 @@ msgstr "Objekt registru AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1638 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Přihlašovací okno" @@ -457,6 +457,10 @@ msgid "Power management daemon" msgstr "Démon správy napájení" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Kontrola akcelerace sezení GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Démon nastavení GNOME" @@ -493,7 +497,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Ověřovací agent PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Vybrat systém" @@ -505,36 +509,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nelze přečíst záhlaví XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Hodnota" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procent z času dokončení" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Neaktivní text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Text, který se má použít v popisku, pokud uživatel dosud nevybral položku" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktivní text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Text, který se má použít v popisku, pokud uživatel vybral položku" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Seznam je viditelný" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Zda je seznam výběru viditelný" @@ -566,65 +570,69 @@ msgid "%a %l:%M %p" msgstr "%a, %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automatické přihlašování..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Zvolte prosím jazyk a klikněte na Přihlásit se" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Probíhá rušení..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Vlastní" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Vlastní sezení" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Zrušit" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Název počítače" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Přihlásit" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Odemknout" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Verze" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Možnosti vypnutí..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Uspat" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Restartovat" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Vypnout" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Vlastní" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Zbývá neznámo kolik" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Vlastní sezení" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Jazyky" @@ -652,35 +660,10 @@ msgid "Language" msgstr "Jazyk" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Neurčeno" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Rozložení klávesnice" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Klávesnice:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Ostatní..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Vyberte klávesnici z úplného seznamu dostupných rozložení." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Klávesnice" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Text popisku" @@ -772,67 +755,56 @@ msgstr "Název ikony, který se má použít u loga uvítacího programu" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Naposledy zvolená rozložení klávesnice" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Naposledy zvolené jazyky" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Nastavte na seznam rozložení klávesnice, které mají být ve výchozím stavu " -"zobrazovány v okně přihlášení." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Nastavte na seznam jazyků, které mají být ve výchozím stavu zobrazovány v " "okně přihlášení." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Nastavte na název ikony opatřené motivem, která má být použita v logu " "uvítacího programu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Nastavte na \"true\", chcete-li vypnout zobrazování známých uživatelů v okně " "přihlášení." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Nastavte na \"true\", má-li být vypnuto zobrazování tlačítek restartu v okně " "přihlášení." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Nastavte na \"true\", má-li být zapnut zásuvný modul správce nastavení " "XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Nastavte na \"true\", má-li být zapnut zásuvný modul správce nastavení " "pozadí." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Nastavte na \"true\", má-li být zapnut zásuvný modul správce nastavení " "mediálních kláves." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Nastavte na \"true\", má-li být zapnuta klávesnice na obrazovce." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -840,34 +812,34 @@ "Nastavte na \"true\", má-li být zapnut zásuvný modul na správu nastavení " "zpřístupnění klávesnice." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Nastavte na \"true\", má-li být zapnuta lupa obrazovky." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Nastavte na \"true\", má-li být zapnuto čtení obrazovky." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Nastavte na \"true\", má-li být zapnut zásuvný modul správce nastavení zvuku." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Nastavte na \"true\", má-li být zapnut zásuvný modul správce nastavení " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Nastavte na \"true\", má-li být zobrazen text nápisu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Nastavte na \"true\", má-li být použit Compiz jako správce oken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -875,33 +847,33 @@ "Text nápisu, který se má zobrazovat v okně přihlášení při prázdném výběru " "uživatelů, namísto banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Text nápisu, který se má zobrazovat v okně přihlášení." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "\"True\", je-li zásuvný modul správce nastavení XRandR povolen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "\"True\", je-li zásuvný modul správce nastavení pozadí povolen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "\"True\", je-li zásuvný modul správce nastavení multimediálních kláves " "povolen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "\"True\", je-li zásuvný modul správce nastavení zvuku povolen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "\"True\", je-li zásuvný modul správce nastavení xsettings povolen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Použít Compiz jako správce oken" @@ -929,8 +901,8 @@ msgid "Whether the timer is currently ticking" msgstr "Zda časovač právě běží" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Přihlásit se jako %s" @@ -940,170 +912,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Ostatní..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Vybrat jiný účet" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Host" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Přihlásit se jako dočasný host" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatické přihlášení" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automaticky přihlásit k systému po výběru možností" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Aktuálně přihlášen" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Applet rychlého přepínaní uživatelů je svobodný software; můžete jej šířit a " -"modifikovat podle ustanovení GNU General Public License, vydávané Free " -"Software Foundation; a to buď verze 2 této licence anebo (podle vlastního " -"uvážení) kterékoliv pozdější verze." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ JAKÉKOLIV " -"ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO " -"URČITÝ ÚČEL. Další podrobnosti hledejte v GNU General Public License." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Kopii GNU General Public License jste měl(a) obdržet spolu s tímto " -"programem; pokud se tak nestalo, napište o ni Free Software Foundation, " -"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Nabídka rychlého přepínání mezi uživateli." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"George Lebl \n" -"Michal Bukovjan \n" -"Miloslav Trmač \n" -"Lukáš Novotný \n" -"Petr Tomeš \n" -"Jakub Friedl \n" -"Petr Kovář " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nelze uzamknout obrazovku: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Šetřič obrazovky nelze dočasně nastavit na prázdnou obrazovku: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Nelze se odhlásit: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Přítomen" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Neviditelný" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Zaneprázdněn" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Pryč" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Informace o účtu" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Předvolby systému" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Uzamknout obrazovku" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Přepnout uživatele" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Ukončit…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Applet přepínání uživatelů" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Změnit nastavení účtu a stav" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Nabídka rychlého přepínání mezi uživateli" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Přepínání uživatelů" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Generátor appletu přepínaní uživatelů" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Upravit osobní _informace" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "O _aplikaci" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Upravit _uživatele a skupiny" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Podporován je pouze příkaz VERSION" @@ -1139,32 +976,11 @@ msgid "Unable to start new display" msgstr "Nelze spustit nový displej" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Vytvořen snímek obrazovky" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Pořídit snímek obrazovky" - -#~ msgid "Couldn't set groupid to 0" -#~ msgstr "Nelze nastavit groupid na 0" - -#~ msgid "%x" -#~ msgstr "%x" - -#~ msgid "Log In" -#~ msgstr "Přihlásit se" - -#~ msgid "Manager" -#~ msgstr "Správce" - -#~ msgid "The user manager object this user is controlled by." -#~ msgstr "Objekt správce uživatele, kterým je tento uživatel ovládán." - -#~ msgid "Quit..." -#~ msgstr "Ukončit..." - -#~ msgid "Unknown" -#~ msgstr "Neznámý" diff -Nru gdm-2.32.1/po/da.po gdm-3.0.0/po/da.po --- gdm-2.32.1/po/da.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/da.po 2011-04-04 14:37:16.000000000 +0000 @@ -27,10 +27,11 @@ msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-22 15:10+0200\n" -"PO-Revision-Date: 2010-08-22 14:38+0200\n" +"POT-Creation-Date: 2011-04-02 19:33+0200\n" +"PO-Revision-Date: 2011-03-30 23:51+0200\n" "Last-Translator: Kenneth Nielsen \n" "Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -63,28 +64,28 @@ msgid "could not find user \"%s\" on system" msgstr "kunne ikke finde brugeren \"%s\" på systemet" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Kan ikke initiere logind-systemet" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Kan ikke godkende bruger" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Kan ikke autorisere brugeren" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Kan ikke etablere akkreditiver" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Kunne ikke åbne session" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -108,17 +109,17 @@ "Serveren skulle være startet af brugeren %s, men den bruger eksisterer ikke" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Kunne ikke sætte gruppe-id til %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () mislykkedes for %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Kunne ikke sætte bruger-id til %d" @@ -168,76 +169,76 @@ msgid "The display device" msgstr "Skærmenheden" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "fejl ved initiering af kommunikation med godkendelsessystemet: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "fejl ved initiering af kommunikation med godkendelsessystemet - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "generel fejl" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "løbet tør for hukommelse" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "applikationsprogrammørfejl" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "ukendt fejl" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Brugernavn:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "fejl under informering af godkendelsessystemet om foretrukken " "brugernavnsprompt: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "fejl under informering af godkendelsessystemet om brugerens værtsnavn: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "fejl under informering af godkendelsessystemet om brugerens konsol: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "fejl under informering af godkendelsessystemet om skærmstreng: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" -"fejl under informering af godkendelsessystemet om skærm-xauth-akkreditiver: %" -"s" +"fejl under informering af godkendelsessystemet om skærm-xauth-akkreditiver: " +"%s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ingen brugerkonto tilgængelig" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kan ikke skifte til bruger" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Brugeren %s findes ikke" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Gruppen %s findes ikke" @@ -461,7 +462,7 @@ msgstr "AT-SPI-registeromslag" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Logind-skærm" @@ -473,6 +474,10 @@ msgid "Power management daemon" msgstr "Strømstyringsdæmon" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Accelerationstjekker til GNOME-session" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME-indstillingsdæmon" @@ -509,7 +514,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit-autentificeringsagent" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Vælg system" @@ -521,37 +526,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Kunne ikke læse XDMCP-hoved!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Værdi" # ??? -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procentdel af tid fuldført" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Tekst ved inaktivitet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Teksten der bruges i etiketten, hvis brugeren endnu ikke har valgt et element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Tekst ved aktivitet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Teksten der bruges i etiketten, hvis brugeren har valgt et element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Liste synlig" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Hvorvidt vælgerlisten er synlig" @@ -583,65 +588,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Logger ind automatisk…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Vælg sprog og klik på log ind" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Annullerer…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Brugerdefineret" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Brugerdefineret session" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Annullér" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Computernavn" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Log ind" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Lås op" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Version" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Nedlukningsindstillinger…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Hvile" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Genstart" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Luk ned" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Brugerdefineret" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Ukendt resterende tid" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Brugerdefineret session" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Sprog" @@ -669,35 +678,10 @@ msgid "Language" msgstr "Sprog" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Ikke angivet" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tastaturgenveje" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatur:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Andre…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Vælg et tastaturlayout fra den fulde liste af tilgængelige layout." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tastatur" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etikettekst" @@ -789,61 +773,50 @@ msgstr "Ikonnavn der bruges til velkomstbyderlogoet" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Senest valgte tastaturlayout" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Senest valgte sprog" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Sæt til en liste af tastaturlayout der som standard skal vises i logind-" -"vinduet." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Sæt til en liste af sprog der som standard skal vises i logind-vinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Sæt til navnet på ikontemaet der bruges til velkomstbyderlogoet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Sæt til true for at deaktivere visning af kendte brugere i logind-vinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Sæt til true for at deaktivere visning af genstartsknapperne i logind-" "vinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Sæt til sand for at aktivere modulet til håndtering af XRandR-indstillinger." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Sæt til true for at aktivere modulet til håndtering af " "baggrundsindstillinger." # ??? -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Sæt til true for at aktivere modulet for indstillinger af medietaster." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Sæt til true for at aktivere skærmtastaturet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -851,34 +824,34 @@ "Sæt til true for at aktivere modulet for tilgængelighedsindstillinger til " "tastatur." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Sæt til true for at aktivere skærmforstørrelse." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Sæt til true for at aktivere skærmlæseren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Sæt til true for at aktivere modulet til håndtering af lydindstillinger." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Sæt til true for at aktivere modulet til håndtering af xsettings-" "indstillinger." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Sæt til true for at vise bannermeddelelsesteksten." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Sæt til sand for at bruge Compiz som vindueshåndtering." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -886,34 +859,34 @@ "Tekstbannermeddelelsen, der vises i logind-vinduet, når brugervælgeren er " "tom, frem for banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Tekstbannermeddelelsen, der vises i logind-vinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True hvis modulet til håndtering af XRandR-indstillinger er aktiveret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "True hvis modulet til håndtering af baggrundsindstillinger er aktiveret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "True hvis modulet til håndtering af media-keys-indstillinger er aktiveret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True hvis modulet til håndtering af lydindstillinger er aktiveret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "True hvis modulet til håndtering af xsettings-indstillinger er aktiveret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Brug Compiz som vindueshåndtering" @@ -941,8 +914,8 @@ msgid "Whether the timer is currently ticking" msgstr "Hvorvidt stopuret tager tid i øjeblikket" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Log ind som %s" @@ -952,181 +925,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Andre…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Vælg en anden konto" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gæst" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Log ind som midlertidig gæst" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatisk logind" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Log automatisk ind på systemet efter indstillingsvalg" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Logget ind lige nu" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Brugerskiftepanelprogrammet er fri software. Du kan redistribuere og/eller " -"modificere det under de betingelserne som er angivet i GNU General Public " -"License, som udgivet af Free Software Foundation. Enten version 3 af " -"licensen eller (efter eget valg) enhver senere version." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Dette program distribueres i håb om at det vil vise sig nyttigt, men UDEN " -"NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring " -"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan " -"læses i GNU General Public License." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Du skulle have modtaget en kopi af GNU General Public License sammen med " -"dette program. Hvis ikke, så skriv til Free Software Foundation, Inc., " -"Franklin Street 51, femte sal, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "En menu til hurtigt at skifte mellem brugere." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Kenneth Christiansen\n" -"Birger Langkjer\n" -"Keld Simonsen\n" -"Ole Laursen\n" -"Marie Lund\n" -"Martin Willemoes Hansen\n" -"Lasse Bang Mikkelsen\n" -"Ask Hjorth Larsen\n" -"Kenneth Nielsen\n" -"\n" -"Dansk-gruppen \n" -"\n" -"Mere info: http://www.dansk-gruppen.dk" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Kan ikke låse skærmen: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Kan ikke midlertidigt indstille pauseskærm til blank skærm: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Kan ikke logge ud: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Tilgængelig" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Usynlig" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Travl" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Fraværende" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Kontoinformation" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Systemindstillinger" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Lås skærm" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Skift bruger" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Afslut…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Ukendt" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Brugerskiftepanelprogram" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Ændr kontoinformation og status" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "En menu til hurtigt at skifte mellem brugere" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Brugerskifter" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fabrik til brugerskiftepanelprogram" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Redigér personlige _informationer" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Om" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Redigér brugere og grupper" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Kun VERSION-kommandoen er understøttet" @@ -1162,15 +989,157 @@ msgid "Unable to start new display" msgstr "Kan ikke starte ny terminal" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Skærmbillede taget" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Tag et billede af skærmen" +#~ msgid "Shutdown Options…" +#~ msgstr "Nedlukningsindstillinger…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Tastaturgenveje" + +#~ msgid "_Keyboard:" +#~ msgstr "_Tastatur:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Andre…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Vælg et tastaturlayout fra den fulde liste af tilgængelige layout." + +#~ msgid "Keyboard" +#~ msgstr "Tastatur" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Senest valgte tastaturlayout" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Sæt til en liste af tastaturlayout der som standard skal vises i logind-" +#~ "vinduet." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Brugerskiftepanelprogrammet er fri software. Du kan redistribuere og/" +#~ "eller modificere det under de betingelserne som er angivet i GNU General " +#~ "Public License, som udgivet af Free Software Foundation. Enten version 3 " +#~ "af licensen eller (efter eget valg) enhver senere version." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Dette program distribueres i håb om at det vil vise sig nyttigt, men UDEN " +#~ "NOGEN FORM FOR GARANTI, uden selv de underforståede garantier omkring " +#~ "SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan " +#~ "læses i GNU General Public License." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Du skulle have modtaget en kopi af GNU General Public License sammen med " +#~ "dette program. Hvis ikke, så skriv til Free Software Foundation, Inc., " +#~ "Franklin Street 51, femte sal, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "En menu til hurtigt at skifte mellem brugere." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Kenneth Christiansen\n" +#~ "Birger Langkjer\n" +#~ "Keld Simonsen\n" +#~ "Ole Laursen\n" +#~ "Marie Lund\n" +#~ "Martin Willemoes Hansen\n" +#~ "Lasse Bang Mikkelsen\n" +#~ "Ask Hjorth Larsen\n" +#~ "Kenneth Nielsen\n" +#~ "\n" +#~ "Dansk-gruppen \n" +#~ "\n" +#~ "Mere info: http://www.dansk-gruppen.dk" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Kan ikke låse skærmen: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Kan ikke midlertidigt indstille pauseskærm til blank skærm: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Kan ikke logge ud: %s" + +#~ msgid "Available" +#~ msgstr "Tilgængelig" + +#~ msgid "Invisible" +#~ msgstr "Usynlig" + +#~ msgid "Busy" +#~ msgstr "Travl" + +#~ msgid "Away" +#~ msgstr "Fraværende" + +#~ msgid "Account Information" +#~ msgstr "Kontoinformation" + +#~ msgid "System Preferences" +#~ msgstr "Systemindstillinger" + +#~ msgid "Lock Screen" +#~ msgstr "Lås skærm" + +#~ msgid "Switch User" +#~ msgstr "Skift bruger" + +#~ msgid "Quit…" +#~ msgstr "Afslut…" + +#~ msgid "Unknown" +#~ msgstr "Ukendt" + +#~ msgid "User Switch Applet" +#~ msgstr "Brugerskiftepanelprogram" + +#~ msgid "Change account settings and status" +#~ msgstr "Ændr kontoinformation og status" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "En menu til hurtigt at skifte mellem brugere" + +#~ msgid "User Switcher" +#~ msgstr "Brugerskifter" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fabrik til brugerskiftepanelprogram" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Redigér personlige _informationer" + +#~ msgid "_About" +#~ msgstr "_Om" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Redigér brugere og grupper" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Kunne ikke sætte gruppe-id til 0" @@ -1472,8 +1441,8 @@ #~ msgid "Cannot write PID file %s: possibly out of diskspace. Error: %s\n" #~ msgstr "" -#~ "Kan ikke skrive pid-filen %s: er muligvis løbet tør for diskplads. Fejl: %" -#~ "s\n" +#~ "Kan ikke skrive pid-filen %s: er muligvis løbet tør for diskplads. Fejl: " +#~ "%s\n" #~ msgid "%s: fork () failed!" #~ msgstr "%s: fork () mislykkedes!" @@ -3832,14 +3801,14 @@ #~ msgstr "(hukommelsesmellemlager)" #~ msgid "" -#~ "An error occurred while loading user interface element %s%s from file %" -#~ "s. Possibly the glade interface description was corrupted. %s cannot " +#~ "An error occurred while loading user interface element %s%s from file " +#~ "%s. Possibly the glade interface description was corrupted. %s cannot " #~ "continue and will exit now. You should check your installation of %s or " #~ "reinstall %s." #~ msgstr "" #~ "En fejl opstod under indlæsning af element %s%s af brugergrænsefladen fra " -#~ "filen %s. En mulig årsag kan være at grænsefladebeskrivelsen er ødelagt. %" -#~ "s kan ikke fortsætte og vil afslutte nu. Du bør kontrollere " +#~ "filen %s. En mulig årsag kan være at grænsefladebeskrivelsen er ødelagt. " +#~ "%s kan ikke fortsætte og vil afslutte nu. Du bør kontrollere " #~ "installationen af %s eller geninstallere %s." #~ msgid "Cannot load user interface" @@ -3866,14 +3835,14 @@ #~ "En fejl opstod under indlæsning af element %s%s af brugergrænsefladen fra " #~ "filen %s. CList-kontrollen skal have %d kolonne. En mulig årsag kan være " #~ "at Glade-grænsefladebeskrivelsen er ødelagt. %s kan ikke fortsætte og vil " -#~ "afslutte nu. Du bør kontrollere installationen af %s eller geninstallere %" -#~ "s." +#~ "afslutte nu. Du bør kontrollere installationen af %s eller geninstallere " +#~ "%s." #~ msgstr[1] "" #~ "En fejl opstod under indlæsning af element %s%s af brugergrænsefladen fra " #~ "filen %s. CList-kontrollen skal have %d kolonner. En mulig årsag kan være " #~ "at Glade-grænsefladebeskrivelsen er ødelagt. %s kan ikke fortsætte og vil " -#~ "afslutte nu. Du bør kontrollere installationen af %s eller geninstallere %" -#~ "s." +#~ "afslutte nu. Du bør kontrollere installationen af %s eller geninstallere " +#~ "%s." #~ msgid "" #~ "Glade file is on crack! Make sure the correct file is installed!\n" @@ -3889,8 +3858,8 @@ #~ "reinstall %s." #~ msgstr "" #~ "En fejl opstod under indlæsning af brugergrænsefladen fra filen %s. En " -#~ "mulig årsag kan være at Glade-grænsefladebeskrivelsen ikke blev fundet. %" -#~ "s kan ikke fortsætte og vil afslutte nu. Du bør kontrollere " +#~ "mulig årsag kan være at Glade-grænsefladebeskrivelsen ikke blev fundet. " +#~ "%s kan ikke fortsætte og vil afslutte nu. Du bør kontrollere " #~ "installationen af %s eller geninstallere %s." #~ msgid "No interface could be loaded. This is BAD! (file: %s)" diff -Nru gdm-2.32.1/po/de.po gdm-3.0.0/po/de.po --- gdm-2.32.1/po/de.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/de.po 2011-04-04 14:37:16.000000000 +0000 @@ -10,17 +10,20 @@ # Fabian Nowak , 2007. # Andre Klapper , 2008. # Jochen Skulj , 2008. -# Mario Blättermann , 2010. -# Christian Kirbach , 2009, 2010. +# Mario Blättermann , 2010, 2011. +# Paul Seyfert , 2011. +# Wolfgang Stöggl , 2011. +# Christian Kirbach , 2009, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: GDM master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-12 01:50+0200\n" -"PO-Revision-Date: 2010-06-12 01:51+0200\n" +"POT-Creation-Date: 2011-03-22 00:11+0100\n" +"PO-Revision-Date: 2011-03-22 00:11+0100\n" "Last-Translator: Christian Kirbach \n" "Language-Team: Deutsch \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,23 +31,23 @@ "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ist kein zeichenorientiertes Gerät" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:181 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Kennung anzeigen" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:181 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "Kennung" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:193 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Display Manager-Slave" @@ -53,28 +56,28 @@ msgid "could not find user \"%s\" on system" msgstr "Benutzer »%s« konnte nicht auf dem System gefunden werden" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Anmeldesystem konnte nicht initialisiert werden" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Benutzernachweis konnte nicht überprüft werden" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Benutzer konnte nicht berechtigt werden" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Berechtigungsnachweis konnte nicht eingerichtet werden" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Sitzung konnte nicht geöffnet werden" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1158 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -87,51 +90,51 @@ "Systemprotokoll. Bis auf Weiteres wird diese Anzeige deaktiviert. Bitte " "starten Sie GDM neu, wenn der Fehler behoben ist." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: Verbindung zur Elternanzeige »%s« gescheitert" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "Server sollte für den Benutzer %s gestartet werden, aber dieser Benutzer " "existiert nicht" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-server.c:392 -#: ../daemon/gdm-welcome-session.c:586 ../daemon/gdm-welcome-session.c:606 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "%d konnte nicht als Gruppenkennung festgelegt werden" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:592 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () für %s gescheitert" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:598 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "%d konnte nicht als Benutzerkennung festgelegt werden" -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: Protokolldatei für Anzeige %s konnte nicht geöffnet werden!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: %s konnte nicht auf %s gesetzt werden" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Priorität des Servers konnte nicht auf %d gesetzt werden: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Leerer Server-Befehl für Anzeige %s" @@ -160,219 +163,219 @@ msgid "The display device" msgstr "Das Anzeigegerät" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" -"Fehler beim Initialisieren des Austausches mit dem Legitimationssystem: %s" +"Fehler beim Initialisieren des Austausches mit dem Legitimationssystem - %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "Allgemeiner Fehler" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "Zu wenig Speicherplatz" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "Programmierfehler in der Anwendung" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "Unbekannter Fehler" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Benutzername:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "Fehler beim Benachrichtigen des Legitimationssystems über die bevorzugte " "Benutzernamenanzeige: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "Fehler beim Benachrichtigen des Legitimationssystems über den Rechnernamen " "des Benutzers: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "Fehler beim Benachrichtigen des Legitimationssystems über das " "Befehlseingabeprogramm des Benutzers: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "Fehler beim Benachrichtigen des Legitimationssystems über den Anzeigenamen " "des Benutzers: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "Fehler beim Benachrichtigen des Legitimationssystems über die Display xauth-" "Berechtigungsnachweise: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "Kein Benutzerkonto verfügbar" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Zum Benutzer konnte nicht gewechselt werden" -#: ../daemon/gdm-welcome-session.c:544 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Benutzer %s existiert nicht." -#: ../daemon/gdm-welcome-session.c:551 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Gruppe %s existiert nicht." -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Socket konnte nicht angelegt werden!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "XDMCP-Anfrage von Rechner %s abgewiesen" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "Legitimationsliste konnte dem Paket nicht entnommen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Fehler in Prüfsumme" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Fehlerhafte Adresse" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Anzeigeadresse konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Port-Nummer der Anzeige konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Legitimationsliste konnte dem Paket nicht entnommen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: Fehler in Prüfsumme" -#: ../daemon/gdm-xdmcp-display-factory.c:2192 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: REQUEST von gesperrtem Rechner %s erhalten" -#: ../daemon/gdm-xdmcp-display-factory.c:2202 -#: ../daemon/gdm-xdmcp-display-factory.c:2558 -#: ../daemon/gdm-xdmcp-display-factory.c:2812 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Anzeigenummer konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2209 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Verbindungstyp konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2216 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: Client-Adresse konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2224 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Legitimationsnamen konnten nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2233 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Legitimationsdaten konnten nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2243 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Autorisierungsliste konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2262 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Herstellerkennung konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2289 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: Fehler in Prüfsumme von %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2542 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: Manage von gesperrtem Host %s erhalten" -#: ../daemon/gdm-xdmcp-display-factory.c:2551 -#: ../daemon/gdm-xdmcp-display-factory.c:2819 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Sitzungskennung konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2565 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Anzeigeklasse konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2671 -#: ../daemon/gdm-xdmcp-display-factory.c:2721 -#: ../daemon/gdm-xdmcp-display-factory.c:2727 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Adresse konnte nicht gelesen werden" -#: ../daemon/gdm-xdmcp-display-factory.c:2802 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: KEEPALIVE von gesperrtem Rechner %s erhalten" -#: ../daemon/gdm-xdmcp-display-factory.c:2891 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: XDMCP-Kopfzeilen konnten nicht gelesen werden!" -#: ../daemon/gdm-xdmcp-display-factory.c:2897 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: Falsche XDMCP-Version!" -#: ../daemon/gdm-xdmcp-display-factory.c:2903 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: Adresse konnte nicht verarbeitet werden" -#: ../daemon/gdm-xdmcp-display-factory.c:3348 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Rechnername des Servers konnte nicht ermittelt werden: %s!" @@ -447,11 +450,13 @@ msgstr "GNOME Display-Manager" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Nur der Benutzer »root« darf GDM starten" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME Display-Manager Arbeitsprozess" @@ -460,7 +465,7 @@ msgstr "AT-SPI-Registrationseinbindung" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1553 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Anmeldefenster" @@ -472,6 +477,10 @@ msgid "Power management daemon" msgstr "Energieverwaltungsdienst" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Überprüfung der GNOME Sitzungsbeschleunigung" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME Verwaltungsdienst" @@ -508,52 +517,52 @@ msgid "PolicyKit Authentication Agent" msgstr "Legitimationsdienst von PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "System auswählen" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: XDMCP-Puffer konnte nicht angelegt werden!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP-Kopfzeilen konnten nicht gelesen werden!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Wert" # CHECK -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "Prozent der abgeschlossenen Zeit" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1437 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inaktiver Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1438 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Der Text wird in der Bezeichnung verwendet, wenn der Benutzer noch kein " "Element ausgewählt hat" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1446 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktiver Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1447 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "" "Der Text wird in der Bezeichnung verwendet, wenn der Benutzer ein Element " "ausgewählt hat" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1456 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Liste sichtbar" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1457 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Legt fest, ob die Liste des Wählers sichtbar ist" @@ -585,65 +594,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:284 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automatische Anmeldung …" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +msgid "Select language and click Log In" +msgstr "Wählen Sie eine Sprache aus und klicken Sie auf »Anmelden«" + #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:603 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Abbruch …" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:952 -msgid "Select language and click Log In" -msgstr "Wählen Sie eine Sprache aus und klicken Sie auf »Anmelden«" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Benutzerdefiniert" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Benutzerdefinierte Sitzung" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Abbrechen" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Rechnername" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Anmelden" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Entsperren" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Version" -#: ../gui/simple-greeter/gdm-greeter-panel.c:854 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:925 -msgid "Shutdown Options…" -msgstr "Einstellungen zum Ausschalten …" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:947 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Bereitschaft" -#: ../gui/simple-greeter/gdm-greeter-panel.c:952 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Neustart" -#: ../gui/simple-greeter/gdm-greeter-panel.c:956 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Ausschalten" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1127 -msgctxt "customsession" -msgid "Custom" -msgstr "Benutzerdefiniert" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Verbleibende Zeit unbekannt" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1128 -msgid "Custom session" -msgstr "Benutzerdefinierte Sitzung" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Sprachen" @@ -658,51 +671,24 @@ #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" msgid "Other…" msgstr "Andere …" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "" "Eine Sprache aus der vollständigen Liste der verfügbaren Sprachen wählen" -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 msgid "Language" msgstr "Sprache" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "nicht angegeben" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tastaturbelegungen" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatur:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other…" -msgstr "Andere …" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Eine Tastaturbelegung aus der vollständigen Liste der verfügbaren Belegungen " -"wählen" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "Keyboard" -msgstr "Tastatur" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Bezeichnungstext" @@ -733,7 +719,7 @@ #: ../gui/simple-greeter/gdm-recent-option-widget.c:311 msgid "The maximum number of items to keep around in the list" -msgstr "Die maximale Anzehl der Elemente, die in der Liste vorgehalten werden" +msgstr "Die maximale Anzahl der Elemente, die in der Liste vorgehalten werden" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format @@ -794,69 +780,58 @@ msgstr "Symbolname des zu verwendenden Logos" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Zuletzt gewählte Tastaturbelegungen" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Zuletzt gewählte Sprachen" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Der Schlüssel legt eine Liste von Tastaturbelegungen fest, die als Vorgabe " -"im Anmeldefenster angezeigt wird." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Der Schlüssel legt eine Liste von Sprachen fest, die als Vorgabe im " "Anmeldefenster angezeigt wird." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Der Schlüssel legt den konfigurierbaren Symbolnamen für das Begrüßer-Logo " "fest." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Den Schlüssel auf »wahr« setzen, um die Anzeige bekannter Benutzer im " "Anmeldefenster zu deaktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Den Schlüssel auf »wahr« setzen, um die Anzeige des Knopfes »Neustart« im " "Anmeldefenster zu deaktivieren." # CHECK -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Den Schlüssel auf »wahr« setzen, um das Plugin zur Verwaltung der XRandR-" "Einstellungen zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Den Schlüssel auf »wahr« setzen, um das Plugin für die Verwaltung der " "Hintergrundeinstellung zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Den Schlüssel auf »wahr« setzen, um das Plugin für die Verwaltung von " "Medientasten zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "" "Den Schlüssel auf »wahr« setzen, um die Bildschirmtastatur zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -864,36 +839,36 @@ "Den Schlüssel auf »wahr« setzen, um das Plugin zur Verwaltung der " "Barrierefreiheit für die Tastatur zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Den Schlüssel auf »wahr« setzen, um die Bildschirmlupe zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Den Schlüssel auf »wahr« setzen, um den Bildschirmleser zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Den Schlüssel auf »wahr« setzen, um das Plugin für die Verwaltung der Audio-" "Einstellungen zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Den Schlüssel auf »wahr« setzen, um das Plugin zur Verwaltung der xsettings-" "Einstellungen zu aktivieren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Den Schlüssel auf »wahr« setzen, um den Bannertext anzuzeigen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" "Den Schlüssel auf »wahr« setzen, um Compiz als Fenstermanager zu verwenden." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -901,41 +876,41 @@ "Der an Stelle von »banner_message_text« im Anmeldefenster anzuzeigende " "Bannertext, wenn der Benutzerwähler leer ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Der im Anmeldefenster anzuzeigende Bannertext." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "Der Schlüssel ist auf »wahr« gesetzt, wenn das Plugin für die Verwaltung der " "XRandR-Einstellungen aktiviert ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Der Schlüssel ist auf »wahr« gesetzt, wenn das Plugin für die " "Hintergrundeinstellungsverwaltung aktiviert ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Der Schlüssel ist auf »wahr« gesetzt, wenn das Plugin für die Verwaltung der " "Medientasten aktiviert ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "Der Schlüssel ist auf »wahr« gesetzt, wenn das Plugin für die Audio-" "Einstellungen aktiviert ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Der Schlüssel ist auf »wahr« gesetzt, wenn das Plugin für die Verwaltung der " "xsettings-Einstellungen aktiviert ist." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Compiz als Fenstermanager verwenden" @@ -964,8 +939,8 @@ msgid "Whether the timer is currently ticking" msgstr "Gibt an, ob der Zeitmesser momentan läuft" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:464 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Als %s anmelden" @@ -975,183 +950,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:244 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Andere …" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:245 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Eine andere Benutzerkennung wählen" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:259 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gast" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:260 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Als temporärer Gast anmelden" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:275 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatische Anmeldung" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:276 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automatische Anmeldung am System nach Auswahl der Einstellungen" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:916 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Momentan angemeldet" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Das Benutzerwechsel-Applet ist freie Software, Sie können es weitergeben und/" -"oder verändern, solange Sie sich an die Regeln der GNU General Public " -"License halten, so wie sie von der Free Software Foundation festgelegt " -"wurden entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder " -"folgenden Lizenz." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Dieses Programm wurde mit dem Ziel veröffentlicht, dass Sie es nützlich " -"finden, jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der " -"VERKAUFBARKEIT oder der NUTZBARKEIT FÜR EINEN SPEZIELLEN ZWECK. Schauen Sie " -"für weitere Informationen bitte in der GNU General Public License (GNU GPL) " -"nach." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Mit diesem Programm sollten Sie außerdem eine Kopie der GNU General Public " -"License erhalten haben. Wenn dem nicht so ist, so schreiben Sie bitte an die " -"Free Software Foundation, Inc.,\n" -" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Ein Menü, um schnell zwischen Benutzern zu wechseln" - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Karsten Weiss \n" -"Benedikt Roth \n" -"Christian Meyer \n" -"Christian Neumair \n" -"Hendrik Richter \n" -"Hendrik Brandt \n" -"Fabian Nowak \n" -"Andre Klapper \n" -"Jochen Skulj \n" -"Mario Blättermann " - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:778 -#: ../gui/user-switch-applet/applet.c:820 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Bildschirm konnte nicht gesperrt werden: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Bildschirmschoner kann nicht vorübergehend auf leeren Bildschirm gesetzt " -"werden: %s" - -#: ../gui/user-switch-applet/applet.c:879 -#, c-format -msgid "Can't log out: %s" -msgstr "Abmelden ist gescheitert: %s" - -#: ../gui/user-switch-applet/applet.c:963 -msgid "Available" -msgstr "Verfügbar" - -#: ../gui/user-switch-applet/applet.c:964 -msgid "Invisible" -msgstr "Unsichtbar" - -#: ../gui/user-switch-applet/applet.c:965 -msgid "Busy" -msgstr "Beschäftigt" - -#: ../gui/user-switch-applet/applet.c:966 -msgid "Away" -msgstr "Abwesend" - -#: ../gui/user-switch-applet/applet.c:1113 -msgid "Account Information" -msgstr "Kontoinformationen" - -#: ../gui/user-switch-applet/applet.c:1125 -msgid "System Preferences" -msgstr "Systemeinstellungen" - -#: ../gui/user-switch-applet/applet.c:1141 -msgid "Lock Screen" -msgstr "Bildschirm sperren" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1152 -msgid "Switch User" -msgstr "Benutzer wechseln" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1163 -msgid "Quit…" -msgstr "Beenden …" - -#: ../gui/user-switch-applet/applet.c:1269 -msgid "Unknown" -msgstr "Unbekannt" - -#: ../gui/user-switch-applet/applet.c:1382 -msgid "User Switch Applet" -msgstr "Benutzerwechsel-Applet" - -#: ../gui/user-switch-applet/applet.c:1397 -msgid "Change account settings and status" -msgstr "Einstellungen und Status des Benutzerkontos anpassen" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Ein Menü zum schnellen Wechsel zwischen Benutzern" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Benutzerwechsel" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Benutzerwechsel-Applet-Fabrik" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "_Persönliche Angaben bearbeiten" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Info" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Benutzer und Gruppen bearbeiten" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Es wird nur der Befehl »VERSION« unterstützt" @@ -1187,255 +1014,11 @@ msgid "Unable to start new display" msgstr "Neue Anzeige konnte nicht gestartet werden" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Bildschirmfoto wurde aufgenommen" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Ein Foto des Bildschirminhalts aufnehmen" - -#~ msgid "Manager" -#~ msgstr "Verwaltung" - -# CHECK: Was ist mit »user manager object« gemeint? -#~ msgid "The user manager object this user is controlled by." -#~ msgstr "" -#~ "Das Benutzerverwaltungsobjekt, von dem diese Benutzerkennung gesteuert " -#~ "wird" - -#~ msgid "Couldn't set groupid to 0" -#~ msgstr "0 konnte nicht als Gruppenkennung festgelegt werden" - -#~ msgid "%x" -#~ msgstr "%x" - -#~ msgid "Quit..." -#~ msgstr "Beenden …" - -#~ msgid "Enable debugging code" -#~ msgstr "Fehlerdiagnose-Code aktivieren" - -#~ msgid "id" -#~ msgstr "Kennung" - -#~ msgid "%a %b %e" -#~ msgstr "%a, %d. %b" - -#~ msgid "%1$s, %2$s" -#~ msgstr "%1$s, %2$s" - -#~ msgid "Authentication Dialog" -#~ msgstr "Legitimationsdialog" - -#~ msgid "Enable debugging" -#~ msgstr "Fehlerdiagnose aktivieren" - -#~ msgid "Enable debugging mode for the greeter." -#~ msgstr "Fehlerdiagnosemodus für Begrüßer aktivieren" - -#~ msgid "worker exited with status %d" -#~ msgstr "Arbeitsprozess wurde mit dem Status %d beendet" - -#~ msgid "Unable establish credentials" -#~ msgstr "Berechtigungsnachweis konnte nicht engerichtet werden" - -#~ msgid "Failed to restart computer" -#~ msgstr "Neustart des Computers gescheitert" - -#~ msgid "" -#~ "You are not allowed to restart the computer because multiple users are " -#~ "logged in" -#~ msgstr "" -#~ "Sie sollten den Computer nicht neu starten, da mehrere Benutzer " -#~ "angemeldet sind" - -#~ msgid "Failed to stop computer" -#~ msgstr "Ausschalten gescheitert" - -#~ msgid "" -#~ "You are not allowed to stop the computer because multiple users are " -#~ "logged in" -#~ msgstr "" -#~ "Sie sollten den Computer nicht ausschalten, da mehrere Benutzer " -#~ "angemeldet sind" - -# CHECK: Was bedeutet hier page 5? -#~ msgid "page 5" -#~ msgstr "Seite 5" - -#~ msgid "You have the Caps Lock key on." -#~ msgstr "Die Umschalttaste ist aktiviert." - -#~ msgid "User" -#~ msgstr "Benutzer" - -#~ msgid "The user this menu item represents." -#~ msgstr "Der Benutzer, den dieser Menüeintrag repräsentiert." - -#~ msgid "Icon Size" -#~ msgstr "Symbolgröße" - -#~ msgid "The size of the icon to use." -#~ msgstr "Die Größe des zu verwendenden Symbols" - -#~ msgid "Indicator Size" -#~ msgstr "Indikatorgrößs" - -# CHECK: check indicator? -#~ msgid "Size of check indicator" -#~ msgstr "Größe des Kontrollindikators" - -#~ msgid "Indicator Spacing" -#~ msgstr "Indikatorabstand" - -#~ msgid "Space between the username and the indicator" -#~ msgstr "Abstand zwischen Benutzername und Indikator" - -#~ msgid "_Help" -#~ msgstr "_Hilfe" - -#~ msgid "Main Options" -#~ msgstr "Haupteinstellungen" - -#, fuzzy -#~ msgid "Assistive Technology Preferences" -#~ msgstr "Einstellungen des Anmeldefotos" - -#~ msgid "Send the specified protocol command to GDM" -#~ msgstr "Den angegebenen Protokollbefehl an GDM senden" - -#~ msgid "Xnest mode" -#~ msgstr "Xnest-Modus" - -#~ msgid "Do not lock current screen" -#~ msgstr "Aktuellen Bildschirm nicht sperren" - -#~ msgid "Authenticate before running --command" -#~ msgstr "Vor dem Ausführen von »--command« legitimieren" - -#~ msgid "Start new flexible session; do not show popup" -#~ msgstr "Eine neue anpassungsfähige Sitzung starten; kein Popup anzeigen" - -#~ msgid "CDE" -#~ msgstr "CDE" - -#~ msgid "This session logs you into CDE" -#~ msgstr "Diese Sitzung meldet Sie an CDE an" - -#~ msgid "Run Xclient script" -#~ msgstr "Xclient-Skript ausführen" - -#~ msgid "This session runs the Xclients script" -#~ msgstr "Diese Sitzung führt das Xclients-Skript aus." - -#~ msgid "GNOME" -#~ msgstr "GNOME" - -#~ msgid "This session logs you into GNOME" -#~ msgstr "Diese Sitzung meldet Sie an GNOME an" - -#~ msgid "Secure Remote connection" -#~ msgstr "Sichere entfernte Verbindung" - -#~ msgid "This session logs you into a remote host using ssh" -#~ msgstr "" -#~ "Diese Sitzung meldet Sie mittels SSH auf einem entfernten Rechner an" - -#~ msgid "" -#~ "Failed to start the X server (your graphical interface). It is likely " -#~ "that it is not set up correctly. You will need to log in on a console " -#~ "and reconfigure the X server. Then restart GDM." -#~ msgstr "" -#~ "Der X-Server (Ihre grafische Oberfläche) konnte nicht gestartet werden. " -#~ "Wahrscheinlich ist er nicht korrekt eingerichtet. Sie müssen sich auf " -#~ "einer Konsole anmelden und den X-Server erneut konfigurieren. Starten Sie " -#~ "GDM dann neu." - -#~ msgid "" -#~ "Would you like to try to configure the X server? Note that you will need " -#~ "the root password for this." -#~ msgstr "" -#~ "Soll versucht werden, den X-Server zu konfigurieren? Hinweis: Sie " -#~ "benötigen dafür das »root«-Passwort." - -#~ msgid "Please type in the root (privileged user) password." -#~ msgstr "" -#~ "Bitte geben Sie das Passwort für »root« (den allmächtigen Benutzer) ein." - -#~ msgid "Trying to restart the X server." -#~ msgstr "Es wird versucht, den X-Server neu zu starten." - -#~ msgid "" -#~ "The X server is now disabled. Restart GDM when it is configured " -#~ "correctly." -#~ msgstr "" -#~ "Der X-Server ist nun deaktiviert. Starten Sie GDM neu, wenn er korrekt " -#~ "konfiguriert ist." - -#~ msgid "" -#~ "Failed to start the X server (your graphical interface). It is likely " -#~ "that it is not set up correctly. Would you like to view the X server " -#~ "output to diagnose the problem?" -#~ msgstr "" -#~ "Der X-Server (Ihre grafische Oberfläche) konnte nicht gestartet werden. " -#~ "Wahrscheinlich ist er nicht korrekt eingerichtet. Wollen Sie die Ausgabe " -#~ "des X-Servers sehen, um das Problem zu suchen?" - -#~ msgid "Would you like to view the detailed X server output as well?" -#~ msgstr "Wollen Sie auch die detaillierte X-Server-Ausgabe sehen?" - -#~ msgid "" -#~ "Failed to start the X server (your graphical interface). It seems that " -#~ "the pointer device (your mouse) is not set up correctly. Would you like " -#~ "to view the X server output to diagnose the problem?" -#~ msgstr "" -#~ "Der X-Server (Ihre grafische Oberfläche) konnte nicht gestartet werden. " -#~ "Anscheinend ist Ihr Zeigegerät (Ihre Maus) nicht korrekt eingerichtet. " -#~ "Wollen Sie die Ausgabe des X-Servers sehen, um das Problem zu suchen?" - -#~ msgid "" -#~ "Would you like to try to configure the mouse? Note that you will need " -#~ "the root password for this." -#~ msgstr "" -#~ "Soll versucht werden, die Maus zu konfigurieren? Hinweis: Sie benötigen " -#~ "hierfür das »root«-Passwort." - -#~ msgid "" -#~ "This is the failsafe xterm session. Windows now have focus only if you " -#~ "have your cursor above them. To get out of this mode type 'exit' in the " -#~ "window in the upper left corner" -#~ msgstr "" -#~ "Dies ist die abgesicherte xterm-Sitzung. Fenster sind nun ausschließlich " -#~ "fokussiert, falls sich der Zeiger darüber befindet. Geben Sie im Fenster " -#~ "in der oberen linken Ecke »exit« ein, um diesen Modus zu verlassen." - -#~ msgid "" -#~ "Failed to start the session, so starting a failsafe xterm session. " -#~ "Windows will have focus only if the mouse pointer is above them. To get " -#~ "out of this mode type 'exit' in the window in the upper left corner" -#~ msgstr "" -#~ "Ihre Sitzung konnte nicht gestartet werden, daher wurde die abgesicherte " -#~ "xterm-Sitzung gestartet. Fenster sind nun ausschließlich fokussiert, " -#~ "falls sich der Zeiger darüber befindet. Geben Sie im Fenster in der " -#~ "oberen linken Ecke »exit« ein, um diesen Modus zu verlassen." - -#~ msgid "%s: Could not write new authorization entry: %s" -#~ msgstr "%s: Neuer Legitimationseintrag %s konnte nicht geschrieben werden." - -#~ msgid "" -#~ "%s: Could not write new authorization entry. Possibly out of diskspace" -#~ msgstr "" -#~ "%s: Neuer Legitimationseintrag konnte nicht geschrieben werden. " -#~ "Möglicherweise ist kein Plattenplatz verfügbar" - -#~ msgid "" -#~ "GDM could not write a new authorization entry to disk. Possibly out of " -#~ "diskspace.%s%s" -#~ msgstr "" -#~ "GDM konnte den neuen Legitimationseintrag nicht auf die Platte schreiben. " -#~ "Möglicherweise kein Plattenplatz verfügbar.%s%s" - -#~ msgid "%s: Could not make new cookie file in %s" -#~ msgstr "%s: Cookie-Datei %s konnte nicht angelegt werden." diff -Nru gdm-2.32.1/po/el.po gdm-3.0.0/po/el.po --- gdm-2.32.1/po/el.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/el.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,13 +1,11 @@ # translation of gdm.HEAD.po to Greek # Greek translation of gdm2. # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -# # kostas:12Nov2003, updates and fixes # kostas:25Jan2004, update translation # kostas:02Mar2004, one more update # nikos:30Jul2004, consistency update # nikos:31Aug2004, update -# # simos: 261 messages, 13Feb2001. # simos: 276 messages, 20Feb2001. # simos: 276 messages, 27Feb2001, two fuzzies. @@ -26,19 +24,21 @@ # Nikos Charonitakis , 2004. # Pierros Papadeas , 2008. # Fotis Tsamis , 2009. +# Michael Kotsarinis , 2011. msgid "" msgstr "" "Project-Id-Version: gdm.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 22:30+0300\n" -"PO-Revision-Date: 2010-08-27 14:12+0200\n" -"Last-Translator: Michael Kotsarinis \n" -"Language-Team: Greek <>\n" +"POT-Creation-Date: 2011-01-17 21:58+0200\n" +"PO-Revision-Date: 2011-01-16 11:41+0300\n" +"Last-Translator: Michael Kotsarinis \n" +"Language-Team: Greek team\n" +"Language: el\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: KBabel 1.11.4\n" +"X-Generator: Virtaal 0.5.2\n" #: ../common/gdm-common.c:456 #, c-format @@ -65,29 +65,29 @@ msgid "could not find user \"%s\" on system" msgstr "αδυναμία εύρεσης του χρήστη \"%s\" στο σύστημα" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "Αδυναμία αρχικοποίησης του συστήματος εισόδου" # -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "Αποτυχία πιστοποίησης χρήστη" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "Αδυναμία έγκρισης χρήστη" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "Αδυναμία παρουσίασης διαπιστευτηρίων" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 msgid "Unable to open session" msgstr "Αδυναμία ανοίγματος συνεδρίας" #: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-simple-slave.c:1267 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -108,23 +108,24 @@ #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" -"Ο εξυπηρετητής Χ spawned από το χρήστη %s αλλά αυτός ο χρήστης δεν υπάρχει" +"Ο εξυπηρετητής Χ έπρεπε να προέλθει από το χρήστη %s αλλά αυτός ο χρήστης " +"δεν υπάρχει" # #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Αποτυχία ρύθμισης της ταυτότητας ομάδας σε %d" # -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" -msgstr "Το initgroups() απέτυχε για το %s" +msgstr "Το initgroups () απέτυχε για το %s" # -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Αποτυχία ρύθμισης της ταυτότητας χρήστη σε %d" @@ -145,7 +146,7 @@ #: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" -msgstr "%s: Η προτεραιότητα του εξυπηρετητής δεν μπορεί να ορισθεί σε %d: %s" +msgstr "%s: Η προτεραιότητα του εξυπηρετητή δεν μπορεί να ορισθεί σε %d: %s" #: ../daemon/gdm-server.c:631 #, c-format @@ -176,81 +177,81 @@ msgid "The display device" msgstr "Η συσκευή απεικόνισης" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1290 #, c-format msgid "error initiating conversation with authentication system: %s" msgstr "σφάλμα έναρξης συναλλαγής με το σύστημα πιστοποίησης: %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1291 msgid "general failure" msgstr "γενική αποτυχία" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1292 msgid "out of memory" msgstr "ανεπάρκεια μνήμης" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1293 msgid "application programmer error" msgstr "σφάλμα προγραμματιστή εφαρμογής" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1294 msgid "unknown error" msgstr "άγνωστο σφάλμα" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1301 msgid "Username:" msgstr "Όνομα χρήστη:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1307 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "σφάλμα πληροφόρησης του συστήματος πιστοποίησης για το προτιμώμενο τίτλο στο " "όνομα χρήστη: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1321 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "σφάλμα πληροφόρησης του συστήματος πιστοποίησης για το όνομα του υπολογιστή " "του χρήστη: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1336 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" -"σφάλμα πληροφόρησης του συστήματος πιστοποίησης για την κονσόλα του χρήστη: %" -"s" +"σφάλμα πληροφόρησης του συστήματος πιστοποίησης για την κονσόλα του χρήστη: " +"%s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1349 #, c-format msgid "error informing authentication system of display string: %s" msgstr "σφάλμα πληροφόρησης του συστήματος πιστοποίησης για φράση εισόδου: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1364 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "σφάλμα πληροφόρησης του συστήματος πιστοποίησης για την εμφάνιση " "πιστοποίησης xauth: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1678 #, c-format msgid "no user account available" msgstr "δεν υπάρχει διαθέσιμος λογαριασμός χρήστη" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1705 msgid "Unable to change to user" msgstr "Αδυναμία αλλαγής σε χρήστη" # -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Ο χρήστης %s δεν υπάρχει" # -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Η ομάδα %s δεν υπάρχει" @@ -501,7 +502,7 @@ msgstr "AT-SPI Registry Wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1649 msgid "Login Window" msgstr "Παράθυρο εισόδου" @@ -572,31 +573,31 @@ msgid "percentage of time complete" msgstr "ποσοστό χρόνου που πέρασε" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 msgid "Inactive Text" msgstr "Ανενεργό κείμενο" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Το κείμενο που θα χρησιμοποιείται στην ταμπέλα αν ο χρήστης δεν έχει " "επιλέξει ακόμα ένα αντικείμενο" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 msgid "Active Text" msgstr "Ενεργό κείμενο" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 msgid "The text to use in the label if the user has picked an item" msgstr "" "Το κείμενο που θα χρησιμοποιείται στην ταμπέλα αν ο χρήστης έχει επιλέξει " "ένα αντικείμενο" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 msgid "List Visible" msgstr "Ορατή λίστα" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 msgid "Whether the chooser list is visible" msgstr "Αν η λίστα επιλογής είναι ορατή" @@ -638,24 +639,28 @@ # #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 msgid "Cancelling…" msgstr "Ακύρωση…" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Ακύρωση" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Όνομα υπολογιστή" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Είσοδος" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Ξεκλείδωμα" # -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Έκδοση" @@ -687,7 +692,7 @@ #: ../gui/simple-greeter/gdm-greeter-panel.c:1110 msgid "Custom session" -msgstr "Προσραμοσμένη συνεδρία" +msgstr "Προσαρμοσμένη συνεδρία" # #: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 @@ -722,7 +727,7 @@ msgid "Language" msgstr "Γλώσσα" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:698 msgid "Unspecified" msgstr "Αδιευκρίνιστο" @@ -779,7 +784,7 @@ #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" -msgstr "Μέγιστη μέτρηση αντικειμένου" +msgstr "Μέγιστος αριθμός αντικειμένων" #: ../gui/simple-greeter/gdm-recent-option-widget.c:311 msgid "The maximum number of items to keep around in the list" @@ -788,7 +793,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format msgid "Remote Login (Connecting to %s…)" -msgstr "Απομακρυσμένη σύνδεση (Σύνδεση σε %s...)" +msgstr "Απομακρυσμένη σύνδεση (Σύνδεση σε %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -1006,8 +1011,8 @@ msgid "Whether the timer is currently ticking" msgstr "Εάν ακούγονται οι κτύποι του χρονόμετρου" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 #, c-format msgid "Log in as %s" msgstr "Είσοδος ως %s" @@ -1018,36 +1023,36 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 msgctxt "user" msgid "Other…" msgstr "Άλλος…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 msgid "Choose a different account" msgstr "Επιλέξτε ένα διαφορετικό λογαριασμό" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 msgid "Guest" msgstr "Προσωρινός χρήστης" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 msgid "Log in as a temporary guest" msgstr "Είσοδος ως προσωρινός εποσκέπτης" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 msgid "Automatic Login" msgstr "Αυτόματη είσοδος" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 msgid "Automatically log into the system after selecting options" msgstr "Αυτόματη είσοδος στο σύστημα μετά από την ολοκλήρωση των επιλογών" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 msgid "Currently logged in" msgstr "Ήδη συνδεδεμένος σε" -#: ../gui/user-switch-applet/applet.c:162 +#: ../gui/user-switch-applet/applet.c:163 msgid "" "The User Switch Applet is free software; you can redistribute it and/or " "modify it under the terms of the GNU General Public License as published by " @@ -1061,7 +1066,7 @@ "έκδοσης 2 της Άδειας, είτε (κατ' επιλογήν) οποιασδήποτε μεταγενέστερης " "έκδοσης." -#: ../gui/user-switch-applet/applet.c:166 +#: ../gui/user-switch-applet/applet.c:167 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -1074,7 +1079,7 @@ "λεπτομέρειες ανατρέξτε στη Γενική Άδεια Δημόσιας Χρήσης GNU (GNU General " "Public License)." -#: ../gui/user-switch-applet/applet.c:170 +#: ../gui/user-switch-applet/applet.c:171 msgid "" "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 " @@ -1085,78 +1090,76 @@ "επικοινωνήστε γραπτώς με το Ίδρυμα Ελεύθερου Λογισμικού (Free Software " "Foundation), Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA " -#: ../gui/user-switch-applet/applet.c:184 +#: ../gui/user-switch-applet/applet.c:185 msgid "A menu to quickly switch between users." msgstr "Ένα μενού για την γρήγορη εναλλαγή χρηστών." -#: ../gui/user-switch-applet/applet.c:188 +#: ../gui/user-switch-applet/applet.c:189 msgid "translator-credits" -msgstr "Κώστας Παπαδήμας " +msgstr "" +"Κώστας Παπαδήμας \n" +"Μιχάλης Κοτσαρίνης " -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 +#: ../gui/user-switch-applet/applet.c:665 +#: ../gui/user-switch-applet/applet.c:794 +#: ../gui/user-switch-applet/applet.c:836 #, c-format msgid "Can't lock screen: %s" msgstr "Αδυναμία κλειδώματος οθόνης: %s" -#: ../gui/user-switch-applet/applet.c:680 +#: ../gui/user-switch-applet/applet.c:687 #, c-format msgid "Can't temporarily set screensaver to blank screen: %s" msgstr "Αδυναμία προσωρινού ορισμού του screensaver σε κενή οθόνη: %s" -#: ../gui/user-switch-applet/applet.c:888 +#: ../gui/user-switch-applet/applet.c:895 #, c-format msgid "Can't log out: %s" msgstr "Αδυναμία αποσύνδεσης: %s" -#: ../gui/user-switch-applet/applet.c:972 +#: ../gui/user-switch-applet/applet.c:979 msgid "Available" msgstr "Διαθέσιμος" -#: ../gui/user-switch-applet/applet.c:973 +#: ../gui/user-switch-applet/applet.c:980 msgid "Invisible" msgstr "Αόρατος" -#: ../gui/user-switch-applet/applet.c:974 +#: ../gui/user-switch-applet/applet.c:981 msgid "Busy" msgstr "Απασχολημένος" -#: ../gui/user-switch-applet/applet.c:975 +#: ../gui/user-switch-applet/applet.c:982 msgid "Away" msgstr "Απών" -#: ../gui/user-switch-applet/applet.c:1122 +#: ../gui/user-switch-applet/applet.c:1128 msgid "Account Information" msgstr "Πληροφορίες λογαριασμού" -#: ../gui/user-switch-applet/applet.c:1134 +#: ../gui/user-switch-applet/applet.c:1140 msgid "System Preferences" msgstr "Προτιμήσεις συστήματος" -#: ../gui/user-switch-applet/applet.c:1148 +#: ../gui/user-switch-applet/applet.c:1154 msgid "Lock Screen" msgstr "Κλείδωμα οθόνης" #. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 +#: ../gui/user-switch-applet/applet.c:1165 msgid "Switch User" msgstr "Αλλαγή χρήστη" #. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 +#: ../gui/user-switch-applet/applet.c:1176 msgid "Quit…" msgstr "Αποσύνδεση…" -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Άγνωστο" - -#: ../gui/user-switch-applet/applet.c:1389 +#: ../gui/user-switch-applet/applet.c:1422 msgid "User Switch Applet" msgstr "Μικροεφαρμογή εναλλαγής χρηστών" -#: ../gui/user-switch-applet/applet.c:1404 +#: ../gui/user-switch-applet/applet.c:1437 msgid "Change account settings and status" msgstr "Αλλαγή ρυθμίσεων λογαριασμού και κατάστασης" @@ -1227,3 +1230,6 @@ #: ../utils/gdm-screenshot.c:283 msgid "Take a picture of the screen" msgstr "Λήψη φωτογραφίας της οθόνης" + +#~ msgid "Unknown" +#~ msgstr "Άγνωστο" diff -Nru gdm-2.32.1/po/en_GB.po gdm-3.0.0/po/en_GB.po --- gdm-2.32.1/po/en_GB.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/en_GB.po 2011-04-04 14:37:16.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the gdm2 package. # Gareth Owen , 2004. # Philip Withnall 2009, 2010. -# Bruce Cowan , 2010. +# Bruce Cowan , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 09:21+0100\n" -"PO-Revision-Date: 2010-06-19 00:50+0100\n" -"Last-Translator: Philip Withnall \n" +"POT-Creation-Date: 2011-03-30 15:29+0100\n" +"PO-Revision-Date: 2011-03-30 15:30+0100\n" +"Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -44,28 +44,28 @@ msgid "could not find user \"%s\" on system" msgstr "could not find user \"%s\" on system" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Unable to initialise login system" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Unable to authenticate user" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Unable to authorise user" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Unable to establish credentials" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Unable to open session" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -88,17 +88,17 @@ msgstr "Server was to be spawned by user %s but that user doesn't exist" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Couldn't set groupid to %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () failed for %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Couldn't set userid to %d" @@ -148,71 +148,71 @@ msgid "The display device" msgstr "The display device" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "error initiating conversation with authentication system - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "general failure" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "out of memory" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "application programmer error" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "unknown error" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Username:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "error informing authentication system of preferred username prompt: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "error informing authentication system of user's hostname: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "error informing authentication system of user's console: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "error informing authentication system of display string: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "error informing authentication system of display xauth credentials: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "no user account available" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Unable to change to user" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "User %s doesn't exist" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Group %s doesn't exist" @@ -434,7 +434,7 @@ msgstr "AT-SPI Registry Wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Login Window" @@ -446,6 +446,10 @@ msgid "Power management daemon" msgstr "Power management daemon" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME Session Acceleration Checker" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME Settings Daemon" @@ -482,7 +486,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit Authentication Agent" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Select System" @@ -494,35 +498,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Could not read XDMCP header!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Value" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "percentage of time complete" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inactive Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "The text to use in the label if the user hasn't yet picked an item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Active Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "The text to use in the label if the user has picked an item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "List Visible" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Whether the chooser list is visible" @@ -554,65 +558,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automatically logging in…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Select language and click Log In" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Cancelling…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Custom" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Custom session" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancel" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Computer Name" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Login" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Unlock" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Version" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Shutdown Options…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspend" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Restart" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Shut Down" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Custom" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Unknown time remaining" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Custom session" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Languages" @@ -640,35 +648,10 @@ msgid "Language" msgstr "Language" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Unspecified" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Keyboard layouts" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Keyboard:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Other…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Choose a keyboard layout from the full list of available layouts." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Keyboard" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Label Text" @@ -760,53 +743,43 @@ msgstr "Icon name to use for greeter logo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Recently-selected keyboard layouts" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Recently-selected languages" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Set to a list of keyboard layouts to be shown by default in the login window." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Set to a list of languages to be shown by default in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Set to the themed icon name to use for the greeter logo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "Set to true to disable showing known users in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Set to true to disable showing the restart buttons in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Set to true to enable the XRandR settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Set to true to enable the background settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Set to true to enable the media-keys settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Set to true to enable the on-screen keyboard." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -814,31 +787,31 @@ "Set to true to enable the plugin to manage the accessibility keyboard " "settings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Set to true to enable the screen magnifier." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Set to true to enable the screen reader." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Set to true to enable the sound settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Set to true to enable the xsettings settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Set to true to show the banner message text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Set to true to use Compiz as the window manager." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -846,31 +819,31 @@ "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Text banner message to show in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True if the XRandR settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True if the background settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "True if the media-keys settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True if the sound settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True if the xsettings settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Use Compiz as the window manager" @@ -898,8 +871,8 @@ msgid "Whether the timer is currently ticking" msgstr "Whether the timer is currently ticking" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Log in as %s" @@ -909,170 +882,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Other…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Choose a different account" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Guest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Log in as a temporary guest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatic Login" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automatically log into the system after selecting options" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Currently logged in" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet is free software; you can redistribute it and/or " -"modify it 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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 Licence for " -"more details." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"You should have received a copy of the GNU General Public Licence along with " -"this program; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "A menu to quickly switch between users." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Philip Withnall \n" -"Bruce Cowan " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Can't lock screen: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Can't temporarily set screensaver to blank screen: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Can't log out: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Available" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Invisible" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Busy" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Away" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Account Information" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "System Preferences" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Lock Screen" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Switch User" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Quit…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Unknown" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "User Switch Applet" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Change account settings and status" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "A menu to quickly switch between users" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "User Switcher" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "User Switcher Applet Factory" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Edit Personal _Information" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_About" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Edit Users and Groups" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Only the VERSION command is supported" @@ -1108,15 +946,146 @@ msgid "Unable to start new display" msgstr "Unable to start new display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Screenshot taken" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Take a picture of the screen" +#~ msgid "Shutdown Options…" +#~ msgstr "Shutdown Options…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Keyboard layouts" + +#~ msgid "_Keyboard:" +#~ msgstr "_Keyboard:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Other…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Choose a keyboard layout from the full list of available layouts." + +#~ msgid "Keyboard" +#~ msgstr "Keyboard" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Recently-selected keyboard layouts" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet is free software; you can redistribute it and/or " +#~ "modify it 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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 Licence for more details." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "You should have received a copy of the GNU General Public Licence along " +#~ "with this program; if not, write to the Free Software Foundation, Inc., " +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "A menu to quickly switch between users." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Philip Withnall \n" +#~ "Bruce Cowan " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Can't lock screen: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Can't temporarily set screensaver to blank screen: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Can't log out: %s" + +#~ msgid "Available" +#~ msgstr "Available" + +#~ msgid "Invisible" +#~ msgstr "Invisible" + +#~ msgid "Busy" +#~ msgstr "Busy" + +#~ msgid "Away" +#~ msgstr "Away" + +#~ msgid "Account Information" +#~ msgstr "Account Information" + +#~ msgid "System Preferences" +#~ msgstr "System Preferences" + +#~ msgid "Lock Screen" +#~ msgstr "Lock Screen" + +#~ msgid "Switch User" +#~ msgstr "Switch User" + +#~ msgid "Quit…" +#~ msgstr "Quit…" + +#~ msgid "Unknown" +#~ msgstr "Unknown" + +#~ msgid "User Switch Applet" +#~ msgstr "User Switch Applet" + +#~ msgid "Change account settings and status" +#~ msgstr "Change account settings and status" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "A menu to quickly switch between users" + +#~ msgid "User Switcher" +#~ msgstr "User Switcher" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "User Switcher Applet Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Edit Personal _Information" + +#~ msgid "_About" +#~ msgstr "_About" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Edit Users and Groups" + #~ msgid "Log In" #~ msgstr "Log In" diff -Nru gdm-2.32.1/po/es.po gdm-3.0.0/po/es.po --- gdm-2.32.1/po/es.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/es.po 2011-04-04 14:37:16.000000000 +0000 @@ -10,15 +10,16 @@ # Francisco Javier F. Serrador , 2006. # Lucas Vieites , 2008. # Jorge González , 2008, 2009, 2010. +# Daniel Mustieles , 2011. # msgid "" msgstr "" "Project-Id-Version: gdm.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-06-15 16:17+0000\n" -"PO-Revision-Date: 2010-06-16 07:05+0200\n" -"Last-Translator: Jorge González \n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-17 17:49+0100\n" +"Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,23 +29,23 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom no es un dispositivo de caracteres" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:181 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "ID de pantalla" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:181 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:193 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "Esclavo del gestor de pantallas de GNOME" @@ -53,28 +54,28 @@ msgid "could not find user \"%s\" on system" msgstr "no se pudo encontrar el usuario «%s» en el sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "No se pudo inicializar el sistema de acceso" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "No se pudo autenticar al usuario" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "No se pudo autorizar al usuario" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "No se pudieron establecer las credenciales" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "No se pudo abrir la sesión" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1158 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -86,50 +87,50 @@ "del sistema para obtener un diagnóstico. Mientras tanto esta pantalla se " "desactivará. Reinicie GDM cuando se haya solucionado el problema." -#: ../daemon/gdm-server.c:249 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: falló al conectar con la pantalla madre «%s»" -#: ../daemon/gdm-server.c:364 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "El servidor debía ser lanzado por el usuario %s pero ese usuario no existe" -#: ../daemon/gdm-server.c:375 ../daemon/gdm-server.c:395 -#: ../daemon/gdm-welcome-session.c:586 ../daemon/gdm-welcome-session.c:606 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "No se pudo establecer el id de grupo a %d" -#: ../daemon/gdm-server.c:381 ../daemon/gdm-welcome-session.c:592 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "Ha fallado initgroups() para %s" -#: ../daemon/gdm-server.c:387 ../daemon/gdm-welcome-session.c:598 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "No se pudo establecer el id de usuario a %d" -#: ../daemon/gdm-server.c:434 +#: ../daemon/gdm-server.c:435 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: No se pudo abrir el archivo de registro de la pantalla %s." -#: ../daemon/gdm-server.c:445 ../daemon/gdm-server.c:451 -#: ../daemon/gdm-server.c:457 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Ha ocurrido un error al establecer %s a %s" -#: ../daemon/gdm-server.c:477 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: La prioridad del servidor no se pudo poner a %d: %s" -#: ../daemon/gdm-server.c:629 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Comando de servidor vacío para la pantalla %s" @@ -158,217 +159,217 @@ msgid "The display device" msgstr "La pantalla" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "error al iniciar la conversación con el sistema de autenticación: %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "fallo general" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "sin memoria" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "error del programador de la aplicación" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "error desconocido" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Usuario:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "error al informar al sistema de autenticación del diálogo del nombre de " "usuario preferido: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "error al informar al sistema de autenticación del nombre del equipo del " "usuario: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "error al informar al sistema de autenticación acerca de la consola del " "usuario: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "error al informar al sistema de autenticación de la cadena de pantalla: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "error al informar al sistema de autenticación de las credenciales xauth de " "la pantalla: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "no hay cuentas de usuario disponibles" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "No se pudo cambiar el usuario" -#: ../daemon/gdm-welcome-session.c:544 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "El usuario %s no existe" -#: ../daemon/gdm-welcome-session.c:551 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "El grupo %s no existe" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "No se pudo crear el socket." -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "La petición XDMCP desde equipo %s se ha denegado" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "No se pudo extraer la lista de autorizaciones del paquete" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Error en la suma de comprobación" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Dirección errónea" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: no se pudo leer la dirección de la pantalla" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: no se pudo leer el número de puerto de la pantalla" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: no se pudo extraer la lista de autorizaciones del paquete" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: error en la suma de comprobación" -#: ../daemon/gdm-xdmcp-display-factory.c:2192 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: se ha recibido el mensaje REQUEST desde el equipo excluido %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2202 -#: ../daemon/gdm-xdmcp-display-factory.c:2558 -#: ../daemon/gdm-xdmcp-display-factory.c:2812 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: no se pudo leer el número de la pantalla" -#: ../daemon/gdm-xdmcp-display-factory.c:2209 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: no se pudo leer el tipo de conexión" -#: ../daemon/gdm-xdmcp-display-factory.c:2216 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: no se pudo leer la dirección del cliente" -#: ../daemon/gdm-xdmcp-display-factory.c:2224 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: no se pudo leer los nombres de autenticación" -#: ../daemon/gdm-xdmcp-display-factory.c:2233 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: no se pudo leer los datos de autenticación" -#: ../daemon/gdm-xdmcp-display-factory.c:2243 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: no se pudo leer la lista de autorizaciones" -#: ../daemon/gdm-xdmcp-display-factory.c:2262 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: no se pudo leer el ID del fabricante" -#: ../daemon/gdm-xdmcp-display-factory.c:2289 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: ha fallado la suma de verificación de %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2542 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: se ha recibido el mensaje MANAGE desde el equipo excluido %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2551 -#: ../daemon/gdm-xdmcp-display-factory.c:2819 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: no se pudo leer el Id de sesión" -#: ../daemon/gdm-xdmcp-display-factory.c:2565 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: no se pudo leer la clase de pantalla" -#: ../daemon/gdm-xdmcp-display-factory.c:2671 -#: ../daemon/gdm-xdmcp-display-factory.c:2721 -#: ../daemon/gdm-xdmcp-display-factory.c:2727 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: no se pudo leer la dirección" -#: ../daemon/gdm-xdmcp-display-factory.c:2802 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: se ha recibido el mensaje KEEPALIVE desde el equipo excluido %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2891 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: No se pudo leer la cabecera XDMCP." -#: ../daemon/gdm-xdmcp-display-factory.c:2897 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XDMCP: La versión de XDMCP es incorrecta." -#: ../daemon/gdm-xdmcp-display-factory.c:2903 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: No se puede analizar la dirección" -#: ../daemon/gdm-xdmcp-display-factory.c:3348 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "No se pudo obtener el nombre del equipo: %s." @@ -444,11 +445,13 @@ msgstr "Gestor de entrada de GNOME" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Solo el administrador puede ejecutar GDM" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "Trabajador de sesión de GDM" @@ -457,7 +460,7 @@ msgstr "Envolvente de registro AT SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1553 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Ventana de inicio de sesión" @@ -469,6 +472,10 @@ msgid "Power management daemon" msgstr "Demonio del gestor de energía" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Comprobador de aceleración de la sesión de GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Administrador de preferencias de GNOME" @@ -505,50 +512,50 @@ msgid "PolicyKit Authentication Agent" msgstr "Agente de autenticación de PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Seleccionar sistema" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: No se pudo crear un búfer XDMCP." -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: No se pudo leer la cabecera XDMCP." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "porcentaje de tiempo completado" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1445 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Texto inactivo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1446 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "El texto que se usará en la etiqueta si el usuario todavía no ha elegido un " "elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1454 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Texto activo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1455 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "" "El texto que se usará en la etiqueta si el usuario ha elegido un elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1464 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Listar visibles" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Indica si la lista del selector es visible" @@ -582,66 +589,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:284 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Iniciar sesión automáticamente…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +msgid "Select language and click Log In" +msgstr "Seleccione un idioma y pulse Iniciar sesión" + #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:603 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Cancelando…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:952 -msgid "Select language and click Log In" -msgstr "Seleccione un idioma y pulse Iniciar sesión" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizada" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sesión personalizada" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancelar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nombre del equipo" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Iniciar sesión" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desbloquear" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versión" -#: ../gui/simple-greeter/gdm-greeter-panel.c:854 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:925 -msgid "Shutdown Options…" -msgstr "Opciones de apagado…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:947 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspender" -#: ../gui/simple-greeter/gdm-greeter-panel.c:952 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reiniciar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:956 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Apagar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1127 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Tiempo restante desconocido" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1128 -msgid "Custom session" -msgstr "Sesión personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Idiomas" @@ -656,51 +666,23 @@ #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" msgid "Other…" msgstr "Otro…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Elija un idioma de la lista de idiomas disponibles." -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 -#| msgid "Languages" +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 msgid "Language" msgstr "Idioma" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Sin especificar" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Distribuciones de teclado" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teclado:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other…" -msgstr "Otra…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Elija una distribución de teclado de la lista de distribuciones disponibles." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "Teclado" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Texto de etiqueta" @@ -748,7 +730,6 @@ msgstr "Inicio de sesión remoto" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "Sesión" @@ -793,67 +774,56 @@ msgstr "Nombre del icono que usar para el logotipo de la interfaz de entrada" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Distribuciones de teclado seleccionadas recientemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Idiomas recientemente seleccionados" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Establecer una lista de distribuciones de teclado para mostrar en la ventana " -"de inicio de sesión de forma predeterminada." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Establecer a una lista de idiomas para mostrar en la ventana de inicio de " "sesión de forma predeterminada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Establecer al nombre del tema de iconos que usar para el logotipo de la " "interfaz gráfica." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Establecer a verdadero para desactivar el mostrado de los usuarios conocidos " "en la ventana de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Establecer a verdadero para desactivar el mostrado de los botones de " "reinicio en la ventana de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Establecer a verdadero para activar el complemento del gestor de ajustes de " "XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Establecer a verdadero para activar el complemento del gestor de ajustes del " "fondo de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Establecer a verdadero para activar los ajustes del complemento del gestor " "de teclas multimedia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Establecer a verdadero para activar el teclado en pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -861,35 +831,35 @@ "Establecer a verdadero para activar el complemento del gestor de ajustes de " "accesibilidad del teclado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Establecer a verdadero para activar el magnificador de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Establecer a verdadero para activar el lector de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Establecer a verdadero para activar el complemento del gestor de ajustes de " "sonido." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Establecer a verdadero para activar el complemento del gestor de ajustes " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Establecer a verdadero para mostrar el mensaje de texto de entrada." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Establecer a verdadero para usar Compiz como gestor de ventanas." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -897,38 +867,38 @@ "Mensaje de texto que mostrar en la ventana de inicio de sesión cuando el " "selector está vacío, en lugar de banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Mensaje de texto que mostrar en la ventana de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "Verdadero si el complemento del gestor de ajustes de XRandR está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Verdadero si el complemento del gestor de ajustes del fondo de pantalla está " "activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Verdadero si el complemento del gestor de ajustes de teclas multimedia está " "activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "Verdadero si el complemento del gestor de ajustes de sonido está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Verdadero si el complemento del gestor de ajustes xsettings está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Usar Compiz como gestor de ventanas" @@ -956,8 +926,8 @@ msgid "Whether the timer is currently ticking" msgstr "Indica si el contador está ejecutándose actualmente" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:464 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Iniciar sesión como %s" @@ -967,174 +937,37 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:244 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Otro…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:245 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Elija una cuenta distinta" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:259 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Invitado" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:260 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Iniciar sesión como invitado temporal" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:275 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Inicio de sesión automático" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:276 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "" "Iniciar sesión en el sistema automáticamente después de seleccionar las " "opciones" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:916 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Sesión iniciada" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"La miniaplicación Selector de usuarios es software libre; puede " -"redistribuirla y/o modificarla bajo los términs de la Licencia Pública " -"General GNU publicada por la Free Software Foundation; bien en la versión 2 " -"de la Licencia, o (a su elección) cualquier versión posterior." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Este programa se distribuye con la esperanza de que le sea útil, pero SIN " -"NINGUNA GARANTÍA; sin incluso la garantía implícita de MERCANTILIDAD o " -"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General GNU " -"para más detalles." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Debería haber recibido una copia de la Licencia Pública General de GNU junto " -"con este programa, si no es así, escriba a la Free Software Foundation, Inc, " -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE. UU." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Un menú para cambiar rápidamente entre usuarios." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Jorge González , 2009-2010\n" -"Lucas Vieites , 2008" - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:778 -#: ../gui/user-switch-applet/applet.c:820 -#, c-format -msgid "Can't lock screen: %s" -msgstr "No se puede bloquear la pantalla: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"No se puede establecer temporalmente el salvapantallas a oscurecer pantalla: " -"%s" - -#: ../gui/user-switch-applet/applet.c:879 -#, c-format -msgid "Can't log out: %s" -msgstr "No se puede salir de la sesión: %s" - -#: ../gui/user-switch-applet/applet.c:963 -msgid "Available" -msgstr "Disponible" - -#: ../gui/user-switch-applet/applet.c:964 -msgid "Invisible" -msgstr "Invisible" - -#: ../gui/user-switch-applet/applet.c:965 -msgid "Busy" -msgstr "Ocupado" - -#: ../gui/user-switch-applet/applet.c:966 -msgid "Away" -msgstr "Ausente" - -#: ../gui/user-switch-applet/applet.c:1113 -msgid "Account Information" -msgstr "Información de la cuenta" - -#: ../gui/user-switch-applet/applet.c:1125 -msgid "System Preferences" -msgstr "Preferencias del sistema" - -#: ../gui/user-switch-applet/applet.c:1141 -msgid "Lock Screen" -msgstr "Bloquear la pantalla" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1152 -msgid "Switch User" -msgstr "Cambiar de usuario" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1163 -msgid "Quit…" -msgstr "Salir…" - -#: ../gui/user-switch-applet/applet.c:1269 -msgid "Unknown" -msgstr "Desconocido" - -#: ../gui/user-switch-applet/applet.c:1382 -msgid "User Switch Applet" -msgstr "Miniaplicación del selector de usuarios" - -#: ../gui/user-switch-applet/applet.c:1397 -msgid "Change account settings and status" -msgstr "Cambiar los ajustes de la cuenta y el estado" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menú para cambiar rápidamente entre usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Selector de usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fábrica de la miniaplicación del selector de usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editar _información personal" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "Acerca _de" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editar usuarios y grupos" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Sólo se soporta el comando VERSION" @@ -1170,15 +1003,151 @@ msgid "Unable to start new display" msgstr "No se pudo iniciar la pantalla nueva" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Captura de pantalla obtenida" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Tomar una captura de la pantalla" +#~ msgid "Keyboard layouts" +#~ msgstr "Distribuciones de teclado" + +#~ msgid "_Keyboard:" +#~ msgstr "_Teclado:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Otra…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Elija una distribución de teclado de la lista de distribuciones " +#~ "disponibles." + +#~ msgid "Keyboard" +#~ msgstr "Teclado" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Distribuciones de teclado seleccionadas recientemente" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Establecer una lista de distribuciones de teclado para mostrar en la " +#~ "ventana de inicio de sesión de forma predeterminada." + +#~ msgid "Shutdown Options…" +#~ msgstr "Opciones de apagado…" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "La miniaplicación Selector de usuarios es software libre; puede " +#~ "redistribuirla y/o modificarla bajo los términs de la Licencia Pública " +#~ "General GNU publicada por la Free Software Foundation; bien en la versión " +#~ "2 de la Licencia, o (a su elección) cualquier versión posterior." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Este programa se distribuye con la esperanza de que le sea útil, pero SIN " +#~ "NINGUNA GARANTÍA; sin incluso la garantía implícita de MERCANTILIDAD o " +#~ "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General " +#~ "GNU para más detalles." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Debería haber recibido una copia de la Licencia Pública General de GNU " +#~ "junto con este programa, si no es así, escriba a la Free Software " +#~ "Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " +#~ "EE. UU." + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Un menú para cambiar rápidamente entre usuarios." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Jorge González , 2009-2010\n" +#~ "Lucas Vieites , 2008" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "No se puede bloquear la pantalla: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "No se puede establecer temporalmente el salvapantallas a oscurecer " +#~ "pantalla: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "No se puede salir de la sesión: %s" + +#~ msgid "Available" +#~ msgstr "Disponible" + +#~ msgid "Invisible" +#~ msgstr "Invisible" + +#~ msgid "Busy" +#~ msgstr "Ocupado" + +#~ msgid "Away" +#~ msgstr "Ausente" + +#~ msgid "Account Information" +#~ msgstr "Información de la cuenta" + +#~ msgid "System Preferences" +#~ msgstr "Preferencias del sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquear la pantalla" + +#~ msgid "Switch User" +#~ msgstr "Cambiar de usuario" + +#~ msgid "Quit…" +#~ msgstr "Salir…" + +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicación del selector de usuarios" + +#~ msgid "Change account settings and status" +#~ msgstr "Cambiar los ajustes de la cuenta y el estado" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Un menú para cambiar rápidamente entre usuarios" + +#~ msgid "User Switcher" +#~ msgstr "Selector de usuarios" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fábrica de la miniaplicación del selector de usuarios" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Editar _información personal" + +#~ msgid "_About" +#~ msgstr "Acerca _de" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editar usuarios y grupos" + +#~ msgid "Unknown" +#~ msgstr "Desconocido" + #~ msgid "Manager" #~ msgstr "Gestor" diff -Nru gdm-2.32.1/po/et.po gdm-3.0.0/po/et.po --- gdm-2.32.1/po/et.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/et.po 2011-04-04 14:37:16.000000000 +0000 @@ -2,27 +2,28 @@ # Estonian translation of GDM (The GNOME Display Manager). # # Copyright (C) 1999, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -# Copyright (C) 2007-2010 The GNOME Project. +# Copyright (C) 2007–2011 The GNOME Project. # This file is distributed under the same license as the GDM package. # # Lauris Kaplinski , 1999. # Tõivo Leedjärv , 2002, 2003. -# Ivar Smolin , 2005-2010. +# Ivar Smolin , 2005–2011. # Priit Laes , 2005. -# Mattias Põldaru , 2009-2010. +# Mattias Põldaru , 2009–2010. # msgid "" msgstr "" "Project-Id-Version: GDM MASTER\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gdm&component=general\n" -"POT-Creation-Date: 2010-06-19 20:30+0000\n" -"PO-Revision-Date: 2010-06-21 07:03+0300\n" +"POT-Creation-Date: 2011-03-08 21:44+0000\n" +"PO-Revision-Date: 2011-03-10 08:16+0200\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: Estonia\n" "X-Poedit-Country: ESTONIAN\n" @@ -127,8 +128,8 @@ msgstr "Kuvaseade" #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "viga autentimissüsteemiga suhtluse alustamisel: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "viga autentimissüsteemiga suhtluse alustamisel - %s" msgid "general failure" msgstr "üldine tõrge" @@ -449,12 +450,22 @@ msgid "Automatically logging in…" msgstr "Automaatne sisselogimine…" +msgid "Select language and click Log In" +msgstr "Vali keel ja klõpsa sisselogimise nupul" + #. need to wait for response from backend msgid "Cancelling…" msgstr "Tühistamine…" -msgid "Select language and click Log In" -msgstr "Vali keel ja klõpsa sisselogimise nupul" +msgctxt "customsession" +msgid "Custom" +msgstr "Kohandatud" + +msgid "Custom session" +msgstr "Kohandatud seanss" + +msgid "Cancel" +msgstr "Tühista" msgid "Computer Name" msgstr "Arvuti nimi" @@ -468,12 +479,6 @@ msgid "Version" msgstr "Versioon" -msgid "Panel" -msgstr "Paneel" - -msgid "Shutdown Options…" -msgstr "Väljalülitamise valikud…" - msgid "Suspend" msgstr "Alusta uinakut" @@ -484,12 +489,11 @@ msgid "Shut Down" msgstr "Lülita välja" -msgctxt "customsession" -msgid "Custom" -msgstr "Kohandatud" +msgid "Unknown time remaining" +msgstr "Järele jäänud aeg pole teada" -msgid "Custom session" -msgstr "Kohandatud seanss" +msgid "Panel" +msgstr "Paneel" msgid "Languages" msgstr "Keeled" @@ -516,25 +520,6 @@ msgid "Unspecified" msgstr "Määramata" -msgid "Keyboard layouts" -msgstr "Klaviatuuripaigutused" - -msgid "_Keyboard:" -msgstr "_Klaviatuur:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -msgctxt "keyboard" -msgid "Other…" -msgstr "Muu…" - -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Vali saadaolevate klaviatuuripaigutuste nimekirjast sobiv paigutus." - -msgid "Keyboard" -msgstr "Klaviatuur" - msgid "Label Text" msgstr "Sildi tekst" @@ -603,17 +588,9 @@ msgid "Icon name to use for greeter logo" msgstr "Tervitaja logona kasutatava ikooni nimi" -msgid "Recently selected keyboard layouts" -msgstr "Viimati valitud klaviatuuripaigutused" - msgid "Recently selected languages" msgstr "Viimati valitud keeled" -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Sisselogimisaknas näidatavate klaviatuuripaigutuste nimekirja määramine." - msgid "Set to a list of languages to be shown by default in the login window." msgstr "Sisselogimisaknas näidatavate keelte nimekirja määramine." @@ -742,146 +719,139 @@ msgid "Currently logged in" msgstr "Hetkel sisselogitud" -msgid "" -"The User Switch Applet 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." -msgstr "" -"Kasutajate vahel lülitumise rakend on vaba tarkvara. Te võite seda edasi " -"levitada ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, " -"nagu need on Vaba Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon " -"number 2 või (vastavalt Teie valikule) ükskõik milline hilisem versioon." +msgid "Only the VERSION command is supported" +msgstr "Ainult käsk VERSION on toetatud" -msgid "" -"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." -msgstr "" -"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE " -"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA või SOBIVUSELE " -"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku " -"Litsentsi." +msgid "COMMAND" +msgstr "KÄSK" -msgid "" -"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 " -msgstr "" -"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos selle " -"programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga, Inc., " -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " +msgid "Ignored — retained for compatibility" +msgstr "Eiratakse - see on lubatud ühilduvuse eesmärkidel" -msgid "A menu to quickly switch between users." -msgstr "Kiirmenüü kasutajate vahel lülitumiseks." +msgid "Debugging output" +msgstr "Väljastab silumisteavet" -msgid "translator-credits" -msgstr "" -"Lauris Kaplinski , 1999.\n" -"Tõivo Leedjärv , 2002, 2003.\n" -"Ivar Smolin , 2005-2010.\n" -"Priit Laes , 2005.\n" -"Mattias Põldaru , 2009-2010." +msgid "Version of this application" +msgstr "Selle rakenduse versioon" #, c-format -msgid "Can't lock screen: %s" -msgstr "Ekraani pole võimalik lukustada: %s" +msgid "Could not identify the current session." +msgstr "Praegust seanssi pole võimalik tuvastada." -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Ekraani ajutiseks puhastamiseks pole ekraanisäästjat võimalik kehtestada: %s" +#. Option parsing +msgid "- New GDM login" +msgstr "- Uus GDM sisselogimine" -#, c-format -msgid "Can't log out: %s" -msgstr "Välja pole võimalik logida: %s" +msgid "Unable to start new display" +msgstr "Uut kuva pole võimalik käivitada" -msgid "Available" -msgstr "Saadaval" +msgid "Screenshot taken" +msgstr "Kuvatõmmis on tehtud" -msgid "Invisible" -msgstr "Nähtamatu" +#. Option parsing +msgid "Take a picture of the screen" +msgstr "Ekraani pildistamine" -msgid "Busy" -msgstr "Hõivatud" +#~ msgid "Keyboard layouts" +#~ msgstr "Klaviatuuripaigutused" -msgid "Away" -msgstr "Eemal" +#~ msgid "_Keyboard:" +#~ msgstr "_Klaviatuur:" -msgid "Account Information" -msgstr "Konto andmed" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Muu…" -msgid "System Preferences" -msgstr "Süsteemi eelistused" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Vali saadaolevate klaviatuuripaigutuste nimekirjast sobiv paigutus." -msgid "Lock Screen" -msgstr "Lukusta ekraan" +#~ msgid "Keyboard" +#~ msgstr "Klaviatuur" -#. Only show if not locked down -msgid "Switch User" -msgstr "Lülitu kasutajate vahel" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Viimati valitud klaviatuuripaigutused" -#. Only show switch user if there are other users -msgid "Quit…" -msgstr "Lõpetamine…" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Sisselogimisaknas näidatavate klaviatuuripaigutuste nimekirja määramine." -msgid "Unknown" -msgstr "Tundmatu" +#~ msgid "Shutdown Options…" +#~ msgstr "Väljalülitamise valikud…" -msgid "User Switch Applet" -msgstr "Kasutajate vahel lülitumise rakend" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Kiirmenüü kasutajate vahel lülitumiseks." -msgid "Change account settings and status" -msgstr "Konto sätete ja oleku valimine" +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Lauris Kaplinski , 1999.\n" +#~ "Tõivo Leedjärv , 2002, 2003.\n" +#~ "Ivar Smolin , 2005–2011.\n" +#~ "Priit Laes , 2005.\n" +#~ "Mattias Põldaru , 2009–2010." -msgid "A menu to quickly switch between users" -msgstr "Menüü kiireks kasutajate vahel lülitumiseks" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Ekraani pole võimalik lukustada: %s" -msgid "User Switcher" -msgstr "Kasutajate vahel lülituja" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Ekraani ajutiseks puhastamiseks pole ekraanisäästjat võimalik kehtestada: " +#~ "%s" -msgid "User Switcher Applet Factory" -msgstr "Kasutajate vahel lülitumise rakendi Factory" +#~ msgid "Can't log out: %s" +#~ msgstr "Välja pole võimalik logida: %s" -msgid "Edit Personal _Information" -msgstr "Redigeeri _isiklikke andmeid" +#~ msgid "Available" +#~ msgstr "Saadaval" -msgid "_About" -msgstr "_Programmist lähemalt" +#~ msgid "Invisible" +#~ msgstr "Nähtamatu" -msgid "_Edit Users and Groups" -msgstr "_Redigeeri kasutajaid ja gruppe" +#~ msgid "Busy" +#~ msgstr "Hõivatud" -msgid "Only the VERSION command is supported" -msgstr "Ainult käsk VERSION on toetatud" +#~ msgid "Away" +#~ msgstr "Eemal" -msgid "COMMAND" -msgstr "KÄSK" +#~ msgid "Account Information" +#~ msgstr "Konto andmed" -msgid "Ignored — retained for compatibility" -msgstr "Eiratakse - see on lubatud ühilduvuse eesmärkidel" +#~ msgid "System Preferences" +#~ msgstr "Süsteemi eelistused" -msgid "Debugging output" -msgstr "Väljastab silumisteavet" +#~ msgid "Lock Screen" +#~ msgstr "Lukusta ekraan" -msgid "Version of this application" -msgstr "Selle rakenduse versioon" +#~ msgid "Switch User" +#~ msgstr "Lülitu kasutajate vahel" -#, c-format -msgid "Could not identify the current session." -msgstr "Praegust seanssi pole võimalik tuvastada." +#~ msgid "Quit…" +#~ msgstr "Lõpetamine…" -#. Option parsing -msgid "- New GDM login" -msgstr "- Uus GDM sisselogimine" +#~ msgid "User Switch Applet" +#~ msgstr "Kasutajate vahel lülitumise rakend" -msgid "Unable to start new display" -msgstr "Uut kuva pole võimalik käivitada" +#~ msgid "Change account settings and status" +#~ msgstr "Konto sätete ja oleku valimine" -msgid "Screenshot taken" -msgstr "Kuvatõmmis on tehtud" +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Menüü kiireks kasutajate vahel lülitumiseks" -#. Option parsing -msgid "Take a picture of the screen" -msgstr "Ekraani pildistamine" +#~ msgid "User Switcher" +#~ msgstr "Kasutajate vahel lülituja" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Kasutajate vahel lülitumise rakendi Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Redigeeri _isiklikke andmeid" + +#~ msgid "_About" +#~ msgstr "_Programmist lähemalt" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Redigeeri kasutajaid ja gruppe" + +#~ msgid "Unknown" +#~ msgstr "Tundmatu" diff -Nru gdm-2.32.1/po/eu.po gdm-3.0.0/po/eu.po --- gdm-2.32.1/po/eu.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/eu.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,21 +1,21 @@ # translation of eu.po to Basque -# Copyright (C) 2001, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2001, 2004, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # Hizkuntza Politikarako Sailburuordetza , 2004, 2005. -# Iñaki Larrañaga Murgoitio , 2006,2007,2008, 2009, 2010. +# Iñaki Larrañaga Murgoitio , 2006,2007,2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: eu\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-09-24 20:06+0000\n" -"PO-Revision-Date: 2010-09-27 11:07+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-29 16:34+0000\n" +"PO-Revision-Date: 2011-03-30 19:56+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n\n" #: ../common/gdm-common.c:456 #, c-format @@ -42,28 +42,28 @@ msgid "could not find user \"%s\" on system" msgstr "ezin izan da \"%s\" erabiltzailea aurkitu sisteman" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Ezin da sistemako saio-hasiera hasieratu" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Ezin da erabiltzailea autentifikatu" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Ezin da erabiltzailea baimendu" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Ezin dira kredentzialak ezarri" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Ezin da saioa ireki" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -88,17 +88,17 @@ "ez da existitzen" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Ezin izan da groupid ezarri %d(e)n" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s(r)en initgroups()-ek huts egin du." -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Ezin izan da userid ezarri %d(e)n" @@ -148,79 +148,80 @@ msgid "The display device" msgstr "Pantailaren gailua" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "errorea autentifikazio-sistemarekin harremanetan jartzean: %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "Hutsegite orokorra" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "Memoriarik ez" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "aplikazioaren programazioko errorea" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "errore ezezaguna" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Erabiltzaile-izena:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "errorea erabiltzaile-izenaren galdera hobetsiaren autentifikazio-sistema " "informatzean: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "errorea erabiltzailearen ostalari-izenaren autentifikazio-sistema " "informatzean: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "errorea erabiltzailearen kontsolaren autentifikazio-sistema informatzean: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "errorea pantailaren katearen autentifikazio-sistema informatzean: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "errorea pantailaren xauth kredentzialen autentifikazio-sistema informatzean: " "%s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ez dago erabiltzailearen konturik erabilgarri" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Ezin da erabiltzailez aldatu" # -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s erabiltzailea ez da existitzen" # -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s taldea ez da existitzen" @@ -445,7 +446,7 @@ msgstr "AT SPI erregistroaren bildukia" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1638 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Saio-hasieraren leihoa" @@ -458,6 +459,10 @@ msgid "Power management daemon" msgstr "Energia kudeatzeko daemon-a" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOMEren saioaren bizkortzailearen egiaztatzailea" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOMEren ezarpenen daemon-a" @@ -494,7 +499,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit autentifikazio agentea" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Hautatu sistema" @@ -506,37 +511,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XMCP: ezin izan da XDMCPren goiburua irakurri!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Balioa" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "osatutako denboraren ehunekoa" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Testu inaktiboa" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Etiketan erabiliko den testua, erabiltzaileak ez badu elementu bat hautatu " "oraindik" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Testu aktiboa" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Etiketan erabiliko den testua, erabiltzaileak elementu bat hautatu duenean" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Zerrenda ikusgai" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Hautatzailea ikusgai dagoen edo ez adierazten du" @@ -568,70 +573,73 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Saioa automatikoki hasten..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Hautatu hizkuntza eta egin klik 'Saioa-hasi'n" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Bertan behera uzten..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Pertsonalizatua" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Saio pertsonalizatua" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Utzi" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Ordenagailuaren izena" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Sartu saioan" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desblokeatu" # -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Bertsioa" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panela" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Itzaltzeko aukerak..." - # -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Eseki" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Berrabiarazi" # -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Itzali" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -#| msgid "Custom session" -msgctxt "customsession" -msgid "Custom" -msgstr "Pertsonalizatua" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Falta den denbora ezezaguna" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Saio pertsonalizatua" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panela" # -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Hizkuntzak" @@ -647,8 +655,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "Bestelakoa..." @@ -662,37 +668,10 @@ msgid "Language" msgstr "Hizkuntza" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Zehaztu gabea" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Teklatuen diseinuak" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teklatua:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "Bestelakoa..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Diseinu erabilgarrien zerrenda osotik aukeratu teklatu-diseinu bat." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Teklatua" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etiketaren testua" @@ -785,62 +764,52 @@ msgstr "Ikonoaren izena ongi etorriko logotipoan erabiltzeko" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Hautatutako azken teklatu-diseinuak" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Hautatutako azken hizkuntzak" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Ezarri teklatu-diseinuen zerrenda lehenetsi gisa erakusteko saio-hasierako " -"leihoan." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Ezarri hizkuntzen zerrenda lehenetsi gisa erakusteko saio-hasierako leihoan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Ezarri gaiaren ikonoaren izena ongi etorriko logotipoan erabiltzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Ezarri TRUE (egia) gisa erabiltzaile ezagunak erakustea desgaitzeko saio-" "hasierako leihoan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Ezarri TRUE (egia) gisa berrabiarazteko botoiak erakustea desgaitzeko saio-" "hasierako leihoan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Ezarri TRUE (egia) gisa xrandr-ren ezarpenen kudeatzailearen plugina " "gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Ezarri TRUE (egia) gisa atzeko planoaren ezarpenen kudeatzailearen plugina " "gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Ezarri TRUE (egia) gisa multimediako teklen ezarpenen kudeatzailearen " "plugina gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Ezarri TRUE (egia) gisa pantailako teklatua gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -848,33 +817,33 @@ "Ezarri TRUE (egia) gisa erabilerraztasuneko teklatuaren ezarpenak kudeatzeko " "plugina gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Ezarri TRUE (egia) gisa pantailako lupa gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Ezarri TRUE (egia) gisa pantailaren irakurlea gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Ezarri TRUE (egia) gisa soinuaren ezarpenen kudeatzailearen plugina gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Ezarri TRUE (egia) gisa xsettings-en ezarpenen kudeatzailearen plugina " "gaitzeko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Ezarri true (egia) gisa harrerako mezuaren testua erakusteko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Ezarri TRUE (egia) gisa Compiz erabiltzeko leiho-kudeatzaile gisa." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -882,33 +851,33 @@ "Harrerako mezuaren testua saio-hasierako leihoan erakusteko, erabiltzaile-" "hautatzailea hutsik dagoenean banner_message_text ordez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Harrerako mezuaren testua saio-hasierako leihoan erakusteko." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True (egia) XRandR-ren ezarpenen kudeatzailearen plugina gaituta badago." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "EGIA atzeko planoaren ezarpenen kudeatzailearen plugina gaituta badago." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "True (egia) multimediako teklen ezarpenen kudeatzailearen plugina gaituta " "badago." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True (egia) soinuaren ezarpenen kudeatzailearen plugina gaituta badago." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "EGIA xsettings-en ezarpenen kudeatzailearen plugina gaituta badago." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Erabili Compiz leiho-kudeatzaile gisa" @@ -936,8 +905,8 @@ msgid "Whether the timer is currently ticking" msgstr "Tenporizadorea exekutatzen ari den edo ez" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Hasi saioa %s gisa" @@ -947,169 +916,36 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Bestelakoa..." # -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Aukeratu beste kontu bat" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gonbidatua" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Hasi saioa aldi bateko gonbidatu gisa" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Saio-hasiera automatikoa" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Hasi sistemako saioa automatikoki aukerak hautatu ondoren" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Jadanik saio hasita" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"'User Switch Applet' software librea da; birbana eta/edo alda dezakezu " -"Software Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. " -"bertsioan, edo (nahiago baduzu) beste berriago batean, jasotako baldintzak " -"betez gero." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Programa hau erabilgarria izango delakoan banatzen da, baina, INOLAKO " -"BERMERIK GABE; era berean, ez da bermatzen beraren EGOKITASUNA " -"MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago " -"nahi izanez gero, ikus GNU Lizentzia Publiko Orokorra." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko " -"zenuen; hala ez bada, idatzi hona: Free SoftwareFoundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Erabiltzaileen artean bizkor aldatzeko menua." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Hizkuntza Politikarako Sailburuordetza \n" -"Iñaki Larrañaga Murgoitio " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Ezin da pantaila blokeatu: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Ezin da pantaila-babeslea aldi baterako ezarri pantaila belzteko: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Ezin da saioa amaitu: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Erabilgarri" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Ikusezina" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Lanpetuta" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Kanpoan" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Kontuaren informazioa" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Sistemaren hobespenak" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Blokeatu pantaila" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Aldatu erabiltzailez" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Irten..." - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Erabiltzailez aldatzeko miniaplikazioa" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Aldatu kontuaren ezarpenak eta egoera" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Erabiltzaileen artean bizkor aldatzeko menua" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Erabiltzaile-aldatzailea" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Erabiltzaile-aldatzaile miniaplikazioaren fabrika" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editatu _informazio pertsonala" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "Honi _buruz" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editatu erabiltzaileak eta taldeak" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "VERSION komandoa soilik dago onartuta" @@ -1145,12 +981,12 @@ msgid "Unable to start new display" msgstr "Ezin da pantaila berria hasi" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Hartutako pantaila-argazkia" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Egin pantailaren argazkia" diff -Nru gdm-2.32.1/po/fa.po gdm-3.0.0/po/fa.po --- gdm-2.32.1/po/fa.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/fa.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,141 +1,131 @@ # Persian translation of gdm2. -# Copyright (C) 2003, 2004, 2005, 2006, 2008 Sharif FarsiWeb, Inc. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2010, 2011 Iranian Free Software Users Group (IFSUG.org)translation team # This file is distributed under the same license as the gdm package. # Roozbeh Pournader , 2003, 2005, 2008. # Meelad Zakaria , 2004, 2005, 2006. # Alireza Kheirkhahan , 2005. # Hedayat Vatankhah , 2008. +# Mahyar Moghimi , 2010. +# Arash Mousavi , 2011. # msgid "" msgstr "" "Project-Id-Version: gdm\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-08 18:54+0000\n" -"PO-Revision-Date: 2008-06-05 12:29-0700\n" -"Last-Translator: Roozbeh Pournader \n" -"Language-Team: Persian\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-26 17:47+0000\n" +"PO-Revision-Date: 2011-03-26 22:22+0330\n" +"Last-Translator: Arash Mousavi \n" +"Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Poedit-Language: Persian\n" +"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" +"X-Poedit-SourceCharset: utf-8\n" -#: ../common/gdm-common.c:427 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" -msgstr "" - -#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516 -#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137 -#: ../daemon/simple-slave-main.c:176 ../daemon/xdmcp-chooser-slave-main.c:176 -msgid "Enable debugging code" -msgstr "" +msgstr "دستگاه dev/urandom/ یک دستگاه نویسه‌ای نیست" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:177 -#, fuzzy +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" -msgstr "نمایش" +msgstr "شناسه‌ی نمایش" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:177 -msgid "id" -msgstr "" +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +msgid "ID" +msgstr "شناسه" -#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187 -#: ../daemon/simple-slave-main.c:189 ../daemon/xdmcp-chooser-slave-main.c:189 -#, fuzzy +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" -msgstr "مدیر رومیزی گنوم" +msgstr " برده‌ی مدیر نمایش گنوم" -#: ../daemon/gdm-display-access-file.c:250 +#: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "" +msgstr "کاربر «%s» بر روی سیستم یافت نشد" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:195 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" -msgstr "" +msgstr "راه‌اندازی اولیه‌ی سیستمِ ورود ممکن نبود" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:228 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" -msgstr "هویت کاربر تأیید نشد" +msgstr "تأیید هویت کاربر امکان پذیر نیست." -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:274 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" -msgstr "" +msgstr "اجازه دادن به کاربر ممکن نبود" -#: ../daemon/gdm-factory-slave.c:281 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" -msgstr "Unable to establish service %s: %s\n" +msgstr "برپا کردن گواهی‌نامه ممکن نیست" -#: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1023 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 +msgid "Unable to open session" +msgstr "بازکردن نشست مقدور نیست" + +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." -msgstr "" -"Could not start the X\n" -"server (your graphical environment)\n" -"due to some internal error.\n" -"Please contact your system administrator\n" -"or check your syslog to diagnose.\n" -"In the meantime this display will be\n" -"disabled. Please restart GDM when\n" -"the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"بدلیل یک خطای داخلی، کارگزار X (محیط گرافیکی شما) آغاز نشد. لطفا با مدیر " +"سیستم خود تماس بگیرید یا syslog خود را برای خطایابی بررسی کنید. ضمنا این " +"نمایش غیرفعال خواهد شد. لطفا بعد از این‌که مشکل درست شد GDM را مجددا " +"راه‌اندازی کنید." -#: ../daemon/gdm-server.c:244 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" -msgstr "%s: failed to connect to parent display '%s'" +msgstr "%s: اتصال به نمایشگر والد شکست خورد «%s»" -#: ../daemon/gdm-server.c:362 -#, fuzzy, c-format +#: ../daemon/gdm-server.c:365 +#, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "%s: Server was to be spawned by uid %d but that user doesn't exist" +msgstr "کارگزار قرار بود که با کاربر %s راه‌اندازی شود ولی این کاربر وجود ندارد" -#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:415 -#, fuzzy, c-format +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 +#, c-format msgid "Couldn't set groupid to %d" -msgstr "%s: Couldn't set groupid to %d" +msgstr "تنظیم شناسه‌ی گروه به %Id ممکن نبود" -#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:421 -#, fuzzy, c-format +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 +#, c-format msgid "initgroups () failed for %s" -msgstr "%s: initgroups () failed for %s" +msgstr "تابع initgroups () برای %s شکست خورد" -#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:427 -#, fuzzy, c-format +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 +#, c-format msgid "Couldn't set userid to %d" -msgstr "%s: Couldn't set userid to %d" - -#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:435 -#, fuzzy -msgid "Couldn't set groupid to 0" -msgstr "%s: Couldn't set groupid to 0" +msgstr "تنظیم شناسه‌ی کاربر به %d ممکن نبود" -#: ../daemon/gdm-server.c:428 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" -msgstr "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" +msgstr "%s: Could not open log file for display %s!" -#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445 -#: ../daemon/gdm-server.c:451 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Error setting %s to %s" -#: ../daemon/gdm-server.c:466 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Server priority couldn't be set to %d: %s" -#: ../daemon/gdm-server.c:618 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Empty server command for display %s" @@ -145,976 +135,1038 @@ msgstr "نام کاربر" #: ../daemon/gdm-session-auditor.c:91 -#, fuzzy msgid "The username" msgstr "نام کاربر" #: ../daemon/gdm-session-auditor.c:95 -#, fuzzy msgid "Hostname" -msgstr "نام کاربر" +msgstr "نام میزبان" #: ../daemon/gdm-session-auditor.c:96 msgid "The hostname" -msgstr "" +msgstr "نام میزبان" #: ../daemon/gdm-session-auditor.c:101 -#, fuzzy msgid "Display Device" -msgstr "نمایش" +msgstr "دستگاه نمایش" #: ../daemon/gdm-session-auditor.c:102 msgid "The display device" -msgstr "" - -#: ../daemon/gdm-session-direct.c:1577 ../daemon/gdm-session-direct.c:1595 -#, c-format -msgid "worker exited with status %d" -msgstr "" +msgstr "دستگاه نمایش" -#: ../daemon/gdm-session-worker.c:967 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" -msgstr "" +msgstr "خطا در راه‌اندازی ارتباط با سیستم تایید هویت - %s" -#: ../daemon/gdm-session-worker.c:968 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" -msgstr "" +msgstr "خطای عمومی" -#: ../daemon/gdm-session-worker.c:969 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" -msgstr "" +msgstr "حافظه تمام شد" -#: ../daemon/gdm-session-worker.c:970 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" -msgstr "" +msgstr "خطای برنامه‌نویس برنامه" -#: ../daemon/gdm-session-worker.c:971 -#, fuzzy +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" -msgstr "خطای نانشاخته‌ای رخ داد." +msgstr "خطای ناشناخته" -#: ../daemon/gdm-session-worker.c:978 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "نام کاربر:" -#: ../daemon/gdm-session-worker.c:984 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" -msgstr "" +msgid "error informing authentication system of preferred username prompt: %s" +msgstr "خطا در اطلاع دادن اعلان نام کاربر ترجیحی به سیستم تایید هویت: %s" -#: ../daemon/gdm-session-worker.c:998 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "" +msgid "error informing authentication system of user's hostname: %s" +msgstr "خطا در اعلان نام میزبان کاربر به سیستم تایید هویت: %s" -#: ../daemon/gdm-session-worker.c:1013 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "" +msgid "error informing authentication system of user's console: %s" +msgstr "خطا در اعلان پیشانه‌ی کاربر به سیستم تایید هویت: %s" + +#: ../daemon/gdm-session-worker.c:1125 +#, c-format +msgid "error informing authentication system of display string: %s" +msgstr "خطا در اعلان رشته‌ی نمایش به سیستم تایید هویت: %s" + +#: ../daemon/gdm-session-worker.c:1140 +#, c-format +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "خطا در اعلان گواهی xauth نمایش به سیستم تایید هویت: %s" -#: ../daemon/gdm-session-worker.c:1292 ../daemon/gdm-session-worker.c:1310 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 +#, c-format msgid "no user account available" -msgstr "هیچ عکس صفحه‌ای موجود نیست" +msgstr "هیچ حساب کاربری موجود نیست" -#: ../daemon/gdm-session-worker.c:1337 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" -msgstr "" - -#: ../daemon/gdm-simple-slave.c:372 -#, fuzzy -msgid "Unable establish credentials" -msgstr "Unable to establish service %s: %s\n" +msgstr "ناتوان در تعویض کاربر" -#: ../daemon/gdm-welcome-session.c:397 -#, fuzzy, c-format +#: ../daemon/gdm-welcome-session.c:549 +#, c-format msgid "User %s doesn't exist" -msgstr "Xnest وجود ندارد." +msgstr "کاربر %s وجود ندارد" -#: ../daemon/gdm-welcome-session.c:404 -#, fuzzy, c-format +#: ../daemon/gdm-welcome-session.c:556 +#, c-format msgid "Group %s doesn't exist" -msgstr "Xnest وجود ندارد." +msgstr "گروه «%s» وجود ندارد" -#: ../daemon/gdm-xdmcp-display-factory.c:590 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" -msgstr "%s: Could not create socket!" +msgstr "ایجادسوکت «%s» ممکن نیست!" -#: ../daemon/gdm-xdmcp-display-factory.c:856 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "Denied XDMCP query from host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:1013 -#: ../daemon/gdm-xdmcp-display-factory.c:1234 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" -msgstr "%s: Could not extract authlist from packet" +msgstr "استخراج authlist از بسته ممکن نبود" -#: ../daemon/gdm-xdmcp-display-factory.c:1026 -#: ../daemon/gdm-xdmcp-display-factory.c:1249 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" -msgstr "%s: Error in checksum" +msgstr "خطار در checksum" -#: ../daemon/gdm-xdmcp-display-factory.c:1500 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" -msgstr "%s: Bad address" +msgstr "نشانی بد" -#: ../daemon/gdm-xdmcp-display-factory.c:1581 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Could not read display address" -#: ../daemon/gdm-xdmcp-display-factory.c:1589 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Could not read display port number" -#: ../daemon/gdm-xdmcp-display-factory.c:1598 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Could not extract authlist from packet" -#: ../daemon/gdm-xdmcp-display-factory.c:1618 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: Error in checksum" -#: ../daemon/gdm-xdmcp-display-factory.c:2120 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: Got REQUEST from banned host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2130 -#: ../daemon/gdm-xdmcp-display-factory.c:2485 -#: ../daemon/gdm-xdmcp-display-factory.c:2737 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Could not read Display Number" -#: ../daemon/gdm-xdmcp-display-factory.c:2137 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Could not read Connection Type" -#: ../daemon/gdm-xdmcp-display-factory.c:2144 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: Could not read Client Address" -#: ../daemon/gdm-xdmcp-display-factory.c:2152 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Could not read Authentication Names" -#: ../daemon/gdm-xdmcp-display-factory.c:2161 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Could not read Authentication Data" -#: ../daemon/gdm-xdmcp-display-factory.c:2171 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Could not read Authorization List" -#: ../daemon/gdm-xdmcp-display-factory.c:2190 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Could not read Manufacturer ID" -#: ../daemon/gdm-xdmcp-display-factory.c:2217 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: Failed checksum from %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2469 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: Got Manage from banned host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2478 -#: ../daemon/gdm-xdmcp-display-factory.c:2744 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Could not read Session ID" -#: ../daemon/gdm-xdmcp-display-factory.c:2492 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Could not read Display Class" -#: ../daemon/gdm-xdmcp-display-factory.c:2597 -#: ../daemon/gdm-xdmcp-display-factory.c:2647 -#: ../daemon/gdm-xdmcp-display-factory.c:2653 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Could not read address" -#: ../daemon/gdm-xdmcp-display-factory.c:2727 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: Got KEEPALIVE from banned host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2816 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -msgstr "%s: Could not read XDMCP header!" +msgstr "GdmXdmcpDisplayFactory: خواندن سرآیند XDMCP ممکن نبود!" -#: ../daemon/gdm-xdmcp-display-factory.c:2822 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 -#, fuzzy +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" -msgstr "%s: Incorrect XDMCP version!" +msgstr "XMDCP: نسخه‌ی نادرست XDMCP!" -#: ../daemon/gdm-xdmcp-display-factory.c:2828 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" -msgstr "" +msgstr "XMDCP: ناتوان در تجزیه‌ی نشانی" -#: ../daemon/gdm-xdmcp-display-factory.c:3226 -#, fuzzy, c-format +#: ../daemon/gdm-xdmcp-display-factory.c:3359 +#, c-format msgid "Could not get server hostname: %s!" -msgstr "%s: Could not get server hostname: %s!" +msgstr "گرفتن نام میزبان کارگزار ممکن نبود: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 -#, fuzzy, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" -msgstr "Cannot write PID file %s: possibly out of diskspace. Error: %s" +#, c-format +msgid "Cannot write PID file %s: possibly out of disk space: %s" +msgstr "نمی‌توان پرونده‌ی شناسه %s را نوشت: احتمالا دیسک جا ندارد: %s" -#: ../daemon/main.c:270 -#, fuzzy, c-format +#: ../daemon/main.c:271 +#, c-format msgid "Logdir %s does not exist or isn't a directory." -msgstr "" -"%s: Logdir %s does not exist or isn't a directory. Using ServAuthDir %s." +msgstr "شاخه‌ی ثبت وقایع %s وجود ندارد یا این یک شاخه نیست." -#: ../daemon/main.c:283 -#, fuzzy, c-format +#: ../daemon/main.c:287 +#, c-format msgid "Authdir %s does not exist. Aborting." -msgstr "%s: Authdir %s does not exist. Aborting." +msgstr "شاخه‌ی Authdir با نام %s وجود ندارد. در حال ساقط کردن." -#: ../daemon/main.c:287 -#, fuzzy, c-format +#: ../daemon/main.c:291 +#, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "%s: Authdir %s is not a directory. Aborting." +msgstr "شاخه‌ی Authdir با نام %s یک شاخه نیست. در حال ساقط کردن." -#: ../daemon/main.c:361 -#, fuzzy, c-format +#: ../daemon/main.c:365 +#, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "%s: Authdir %s is not owned by user %s, group %s. Aborting." +msgstr "" +"شاخه‌ی Authdir با نام %s در مالکیت کاربر %Id، گروه %Id نیست. در حال ساقط کردن." -#: ../daemon/main.c:368 -#, fuzzy, c-format +#: ../daemon/main.c:372 +#, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "%s: Authdir %s has wrong permissions %o. Should be %o. Aborting." +msgstr "" +"شاخه‌ی Authdir با نام %s مجوز‌های نادرست %o دارد. که باید %o باشد. در حال ساقط " +"کردن." -#: ../daemon/main.c:405 -#, fuzzy, c-format +#: ../daemon/main.c:409 +#, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "%s: Can't find the GDM user (%s). Aborting!" +msgstr "کاربر %s مربوط به GDM وجود ندارد. در حال ساقط کردن!" -#: ../daemon/main.c:411 -#, fuzzy +#: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "%s: The GDM user should not be root. Aborting!" +msgstr "کاربر GDM نباید کاربر ریشه باشد. در حال ساقط کردن!" -#: ../daemon/main.c:417 -#, fuzzy, c-format +#: ../daemon/main.c:421 +#, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "%s: Can't find the GDM group '%s'. Aborting!" +msgstr "گروه GDM با نام %s یافت نشد. در حال ساقط کردن!" -#: ../daemon/main.c:423 -#, fuzzy +#: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" -msgstr "%s: The GDM group should not be root. Aborting!" +msgstr "گروه GDM نباید ریشه باشد. در حال ساقط کردن!" -#: ../daemon/main.c:517 +#: ../daemon/main.c:533 msgid "Make all warnings fatal" -msgstr "" +msgstr "مهلک کردن همه‌ی اخطارها" -#: ../daemon/main.c:518 -msgid "Exit after a time - for debugging" -msgstr "" +#: ../daemon/main.c:534 +msgid "Exit after a time (for debugging)" +msgstr "خروج پس از تأخیری کوتاه (برای اشکال‌زدایی)" -#: ../daemon/main.c:519 +#: ../daemon/main.c:535 msgid "Print GDM version" msgstr "Print GDM version" -#: ../daemon/main.c:534 -#, fuzzy +#: ../daemon/main.c:550 msgid "GNOME Display Manager" -msgstr "مدیر رومیزی گنوم" +msgstr "مدیر نمایش گنوم" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:595 -#, fuzzy -msgid "Only root wants to run GDM" -msgstr "Only root wants to run GDM\n" - -#: ../daemon/session-worker-main.c:149 -#, fuzzy +#: ../daemon/main.c:616 +msgid "Only the root user can run GDM" +msgstr "فقط کاربر ریشه می‌تواند GDM را اجرا کند" + +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" -msgstr "‏GDM (مدیر نمایش گنوم) در حال اجرا نیست." +msgstr "کارگر نشست مدیر نمایش گنوم" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 -#, fuzzy -msgid "Select System" -msgstr "تصویر کاربر را انتخاب کنید" +#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 +msgid "AT-SPI Registry Wrapper" +msgstr "پوشه‌ی رجیستری AT-SPI" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 -#, fuzzy -msgid "XMCP: Could not create XDMCP buffer!" -msgstr "%s: Could not create XDMCP buffer!" +#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 +msgid "Login Window" +msgstr "پنجره‌ی ورود به سیستم" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 -#, fuzzy -msgid "XDMCP: Could not read XDMCP header!" -msgstr "%s: Could not read XDMCP header!" +#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 +msgid "Power Manager" +msgstr "مدیر انرژی" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.c:808 -#: ../gui/simple-greeter/gdm-greeter-panel.c:569 -#, fuzzy -msgid "Accessibility Preferences" -msgstr "دسترسی‌پذیری" +#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 +msgid "Power management daemon" +msgstr "شبح مدیریت انرژی" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:1 -msgid "Enable features that make your computer easier to use:" -msgstr "" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "بررسی‌کننده‌ی شتابده نشست گنوم" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:2 -#, fuzzy -msgid "Assistive Technology Preferences" -msgstr "ترجیحات عکس ورود به سیستم" +#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 +msgid "GNOME Settings Daemon" +msgstr "شبح تنظیمات گنوم" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:3 -msgid "_Hear text read aloud (Reader)" -msgstr "" +#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 +msgid "GNOME Screen Magnifier" +msgstr "ذره‌بین صفحه‌ی گنوم" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:4 -msgid "_Ignore duplicate keypresses (Bounce Keys)" -msgstr "" +#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 +msgid "Magnify parts of the screen" +msgstr "بزرگ کردن بخش‌هایی از صفحه‌نمایش" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:5 -msgid "_Make items larger (Magnifier)" -msgstr "" +#: ../data/greeter-autostart/gok.desktop.in.h:1 +msgid "GNOME On-Screen Keyboard" +msgstr "صفحه‌کلید مجازی گنوم" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:6 -msgid "_Only accept long held keypresses (Slow Keys)" -msgstr "" +#: ../data/greeter-autostart/gok.desktop.in.h:2 +msgid "Use an on-screen keyboard" +msgstr "استفاده از یک صفحه‌کلید مجازی" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:7 -msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)" -msgstr "" +#: ../data/greeter-autostart/metacity.desktop.in.h:1 +msgid "Metacity" +msgstr "متاسیتی" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:8 -msgid "_See more contrast in colors (High Contrast)" -msgstr "" +#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 +msgid "Orca Screen Reader" +msgstr "صفحه‌نمایش خوان اورکا" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:9 -msgid "_Type without the keyboard (On-screen Keyboard)" -msgstr "" +#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 +msgid "Present on-screen information as speech or braille" +msgstr "ارائه‌ی اطلاعات روی صفحه‌نمایش به شکل صدا یا بریل" -#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:10 -msgid "_Use a larger font size (Large Print)" -msgstr "" +#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 +msgid "PolicyKit Authentication Agent" +msgstr "عامل احراز هویت PolicyKit" + +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 +msgid "Select System" +msgstr "انتخاب سیستم" + +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 +msgid "XDMCP: Could not create XDMCP buffer!" +msgstr "XDMCP: ایجاد میان‌گیر XDMCP ممکن نبود!" + +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 +msgid "XDMCP: Could not read XDMCP header!" +msgstr "XDMCP: خواندن سرآیند XDMCP ممکن نبود!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:253 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" -msgstr "" +msgstr "مقدار" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:254 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" -msgstr "" +msgstr "درصد زمان کامل شده" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1123 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" -msgstr "" +msgstr "متن غیر فعال" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1124 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" +"متن مورد استفاده در برچسب هنگامی که هنوز کاربر موردی را انتخاب نکرده است" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1132 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" -msgstr "" +msgstr "متن فعال" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1133 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "" +msgstr "متن مورد استفاده در برچسب هنگامی که کاربر موردی انتخاب کرده است" -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M:%S %p" -msgstr "%OH:%OM:%OS" - -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M %p" -msgstr "%OH:%OM" - -#. translators: replace %e with %d if, when the day of the -#. * month as a decimal number is a single digit, it -#. * should begin with a 0 in your locale (e.g. "May -#. * 01" instead of "May 1"). -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:72 -msgid "%a %b %e" -msgstr "%A %Od %B" - -#. translators: reverse the order of these arguments -#. * if the time should come before the -#. * date on a clock in your locale. -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:77 -#, fuzzy, c-format -msgid "%1$s, %2$s" -msgstr "%s: %s" +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 +msgid "List Visible" +msgstr "آخرین مورد قابل دیدن" + +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 +msgid "Whether the chooser list is visible" +msgstr "این‌که فهرست انتخاب دیده شود" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:182 -#, fuzzy -msgid "You have the Caps Lock key on." -msgstr "قفل تبدیل روشن است!" +#. translators: This is the time format to use when both +#. * the date and time with seconds are being shown together. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:70 +msgid "%a %b %e, %l:%M:%S %p" +msgstr "%a %Od %b, %OH:%OM:%OS" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:325 -#, fuzzy -msgid "Automatically logging in..." -msgstr "ورود خودکار به سیستم" +#. translators: This is the time format to use when both +#. * the date and time without seconds are being shown together. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:76 +msgid "%a %b %e, %l:%M %p" +msgstr "%a %Od %b, %OH:%OM" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1223 -#, fuzzy -msgid "Failed to restart computer" -msgstr "Failed to restart self" +#. translators: This is the time format to use when there is +#. * no date, just weekday and time with seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:83 +msgid "%a %l:%M:%S %p" +msgstr "%a %OH:%OM:%OS" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1226 -msgid "" -"You are not allowed to restart the computer because multiple users are " -"logged in" -msgstr "" +#. translators: This is the time format to use when there is +#. * no date, just weekday and time without seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:92 +msgid "%a %l:%M %p" +msgstr "%a %OH:%OM" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" +msgstr "در حال ورود خودکار به سیستم..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1307 -#, fuzzy -msgid "Failed to stop computer" -msgstr "Failed to restart self" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +msgid "Select language and click Log In" +msgstr "زبان را انتخاب کنید و «ورود به سیستم» را کلیک کنید" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1310 -msgid "" -"You are not allowed to stop the computer because multiple users are logged in" -msgstr "" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" +msgstr "در حال لغو کردن..." + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "سفارشی" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "نشست سفارشی" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "لغو" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1385 -msgid "Select language and click Log In" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +msgid "Computer Name" +msgstr "نام رایانه" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1941 -msgid "Login Window" -msgstr "پنجرهٔ ورود به سیستم" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +msgid "Login" +msgstr "ورود به سیستم" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 -#, fuzzy -msgid "Authentication Dialog" -msgstr "تأیید هویت شکست خورد" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "باز کردن قفل" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 -msgid "Computer Name" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +msgid "Version" +msgstr "نسخه‌" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 -#, fuzzy -msgid "Log In" -msgstr "فقط _ورود به سیستم" +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +msgid "Suspend" +msgstr "تعلیق" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "راه‌اندازی مجدد" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" -msgstr "_خاموش کردن" - -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 -#, fuzzy -msgid "Suspend" -msgstr "_معلق کردن" - -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 -#, fuzzy -msgid "Version" -msgstr "_نشست" +msgstr "خاموش کردن" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:8 -msgid "page 5" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "مدت زمان نامعلوم باقی‌مانده" -#: ../gui/simple-greeter/gdm-greeter-panel.c:551 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 msgid "Panel" -msgstr "_انصراف" +msgstr "تابلو" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:221 -#, fuzzy +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" -msgstr "_زبان" +msgstr "زبان‌ها" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:258 -#, fuzzy +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" -msgstr "_زبان" +msgstr "_زبان‌ها:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:259 -#: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#, fuzzy +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" -msgstr "_زبان" +msgstr "_زبان:" -#: ../gui/simple-greeter/gdm-language-option-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:199 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:86 -#: ../gui/user-switch-applet/applet.c:1228 -#, fuzzy -msgid "Other..." -msgstr "_غیره" +#. translators: This brings up a dialog +#. * with a list of languages to choose from +#. +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +msgctxt "language" +msgid "Other…" +msgstr "دیگر..." -#: ../gui/simple-greeter/gdm-language-option-widget.c:203 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." -msgstr "" - -#: ../gui/simple-greeter/gdm-languages.c:587 -msgid "Unspecified" -msgstr "" - -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:210 -msgid "Keyboard layouts" -msgstr "" +msgstr "زبانی را از فهرست کامل زبان‌های موجود انتخاب کنید." -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:197 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:198 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:228 -msgid "_Keyboard:" -msgstr "" +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "زبان" -#: ../gui/simple-greeter/gdm-layout-option-widget.c:200 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" +#: ../gui/simple-greeter/gdm-languages.c:709 +msgid "Unspecified" +msgstr "نامشخص" -#: ../gui/simple-greeter/gdm-option-widget.c:493 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" -msgstr "" +msgstr "متن برچسب" -#: ../gui/simple-greeter/gdm-option-widget.c:494 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" -msgstr "" +msgstr "متن مورد استفاده برای برچسب" -#: ../gui/simple-greeter/gdm-option-widget.c:501 -#, fuzzy +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" -msgstr "شمایل" +msgstr "نام شمایل" -#: ../gui/simple-greeter/gdm-option-widget.c:502 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" -msgstr "" +msgstr "شمایلی که همراه با برچسب استفاده شود" -#: ../gui/simple-greeter/gdm-option-widget.c:510 -#, fuzzy +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" -msgstr "نشست پیش‌فرض سیستم" +msgstr "مورد پیش‌فرض" -#: ../gui/simple-greeter/gdm-option-widget.c:511 -#, fuzzy -msgid "The id of the default item" -msgstr "این نشست پیش‌فرض سیستم است" +#: ../gui/simple-greeter/gdm-option-widget.c:523 +msgid "The ID of the default item" +msgstr "شناسه‌ی مورد پیش‌فرض" -#: ../gui/simple-greeter/gdm-recent-option-widget.c:298 +#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" -msgstr "" +msgstr "بیشترین تعداد مورد‌ها" -#: ../gui/simple-greeter/gdm-recent-option-widget.c:299 +#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 msgid "The maximum number of items to keep around in the list" -msgstr "" +msgstr "بیشترین تعداد مورد‌ها که در لیست باقی بمانند" -#: ../gui/simple-greeter/gdm-remote-login-window.c:224 +#: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "" +msgid "Remote Login (Connecting to %s…)" +msgstr "ورود به سیستم از راه دور (در حال اتصال به %s...)" -#: ../gui/simple-greeter/gdm-remote-login-window.c:238 +#: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format msgid "Remote Login (Connected to %s)" -msgstr "" +msgstr "ورود به سیستم از راه دور (به %s متصل شد)" -#: ../gui/simple-greeter/gdm-remote-login-window.c:317 -#, fuzzy +#: ../gui/simple-greeter/gdm-remote-login-window.c:281 msgid "Remote Login" -msgstr "ورود جدید به سیستم" +msgstr "ورود به سیستم از راه دور" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#, fuzzy -msgid "_Sessions:" -msgstr "_نشست" +msgid "Session" +msgstr "نشست" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" -msgstr "" +msgstr "متن پیام بنر" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 -msgid "Disable showing the accessibility button" -msgstr "" +msgid "Banner message text when chooser is empty" +msgstr "متن پیام بنر وقتی گزیننده خالی است" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 msgid "Disable showing the restart buttons" -msgstr "" +msgstr "غیرفعال‌سازی نمایش دکمه‌های راه‌اندازی مجدد" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 msgid "Do not show known users in the login window" -msgstr "" +msgstr "کاربران شناخته شده در پنجره‌ی ورود به سیستم نمایش داده نشوند" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 -#, fuzzy msgid "Enable accessibility keyboard plugin" -msgstr "به کار انداختن پیمانه‌های د_سترسی‌پذیری" +msgstr "فعال‌سازی متصل‌شونده‌ی دسترسی‌پذیری" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 -#, fuzzy -msgid "Enable debugging" -msgstr "به کار انداختن ورود مدت‌دار به سیستم" +msgid "Enable on-screen keyboard" +msgstr "فعال‌سازی صفحه‌کلید مجازی" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 -msgid "Enable debugging mode for the greeter." -msgstr "" +msgid "Enable screen magnifier" +msgstr "فعال‌سازی ذره‌بین صفحه‌نمایش" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 -msgid "Enable on-screen keyboard" -msgstr "" +msgid "Enable screen reader" +msgstr "فعال‌سازی صفحه‌نمایش خوان" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 -msgid "Enable screen magnifier" -msgstr "" +msgid "Enable showing the banner message" +msgstr "فعال‌سازی نمایش پیام بنر" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 -#, fuzzy -msgid "Enable screen reader" -msgstr "آماد_ه کردن صفحهٔ ورود به سیستم:" +msgid "Icon name to use for greeter logo" +msgstr "شمایلی که برای نشان خوش‌آمد استفاده می‌شود" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Enable showing the banner message" -msgstr "" +msgid "Recently selected languages" +msgstr "زبان‌هایی که اخیرا انتخاب شده‌اند" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 -msgid "Icon name to use for greeter logo" +msgid "Set to a list of languages to be shown by default in the login window." msgstr "" +"روی فهرستی از زبان‌ها تنظیم شود که به عنوان پیش‌فرض در پنجره‌ی ورود به سیستم " +"نمایش داده شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to TRUE to disable showing known users in the login window." -msgstr "" +msgid "Set to the themed icon name to use for the greeter logo." +msgstr "روی نام شمایل تمی تنظیم شود تا به عنوان نشان خوش‌آمد استفاده شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "" -"Set to TRUE to disable showing the accessibility button in the login window." +msgid "Set to true to disable showing known users in the login window." msgstr "" +"روی درست تنظیم شود تا نمایش کاربران شناخته شده در پنجره‌ی ورود به سیستم را از " +"کار بیاندازد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "Set to TRUE to disable showing the restart buttons in the login window." +msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" +"روی درست تنظیم شود تا نمایش دکمه‌ی «راه‌اندازی مجدد» در پنجره‌ی ورود به سیستم از " +"کار بیافتد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to True to enable the background settings manager plugin." -msgstr "" +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "روی درست تنظیم شود تا افزونه‌ی مدیر تنظیمات XRandR به کار انداخته شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 -msgid "Set to True to enable the media-keys settings manager plugin." -msgstr "" +msgid "Set to true to enable the background settings manager plugin." +msgstr "روی درست تنظیم شود تا افزونه مدیر تنظیمات پس‌زمینه به کار انداخته شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -msgid "Set to True to enable the on-screen keyboard." +msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" +"روی درست تنظیم شود تا افزونه مدیر تنظیمات کلید‌های رسانه به کار انداخته شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 -msgid "" -"Set to True to enable the plugin to manage the accessibility keyboard " -"settings." -msgstr "" +msgid "Set to true to enable the on-screen keyboard." +msgstr "روی درست تنظیم شود تا صفحه‌کلید مجازی به کار افتد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 -msgid "Set to True to enable the screen magnifier." +msgid "" +"Set to true to enable the plugin to manage the accessibility keyboard " +"settings." msgstr "" +"روی درست تنظیم شود تا افزونه‌ای به کار انداخته شود که تنظیمات دسترسی‌پذیری " +"صفحه‌کلید را مدیریت کند." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 -msgid "Set to True to enable the screen reader." -msgstr "" +msgid "Set to true to enable the screen magnifier." +msgstr "روی درست تنظیم شود تا ذره‌بین صفحه‌نمایش به کار افتد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -msgid "Set to True to enable the sound settings manager plugin." -msgstr "" +msgid "Set to true to enable the screen reader." +msgstr "برای به کار انداختن صفحه‌نمایش خوان روی درست تنظیم کنید." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 -msgid "Set to True to enable the xsettings settings manager plugin." -msgstr "" +msgid "Set to true to enable the sound settings manager plugin." +msgstr "روی درست تنظیم شود تا افزونه‌ی مدیر تنظیمات صدا به کار افتد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 -msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" +msgid "Set to true to enable the xsettings settings manager plugin." +msgstr "روی درست تنظیم شود تا افزونه‌ی مدیر تنظیمات xsettings به کار افتد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." -msgstr "" +msgstr "روی درست تنظیم شود تا متن پیام بنر نمایش داده شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 -msgid "Set to true to use compiz as the window manager." -msgstr "" +msgid "Set to true to use Compiz as the window manager." +msgstr "روی درست تنظیم شود تا از کامپیز به عنوان مدیر پنجره استفاده شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -msgid "Text banner message to show on the login window." +msgid "" +"Text banner message to show in the login window when the user chooser is " +"empty, instead of banner_message_text." msgstr "" +"پیام بنری که وقتی گزیننده‌ی کاربر خالی است، در پنجره‌ی ورود به سیستم به جای " +"banner_message_text نمایش داده می‌شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "True if the background settings manager plugin is enabled." -msgstr "" +msgid "Text banner message to show in the login window." +msgstr "پیام بنر که پنجره‌ی ورود به سیستم نمایش داده شود." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "True if the media-keys settings manager plugin is enabled." -msgstr "" +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "درست اگر افزونه‌ی مدیر تنظیمات XRandR فعال باشد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "True if the sound settings manager plugin is enabled." -msgstr "" +msgid "True if the background settings manager plugin is enabled." +msgstr "درست اگر افزونه‌ی مدیر تنظیمات پس‌زمینه فعال باشد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -msgid "True if the xsettings settings manager plugin is enabled." -msgstr "" +msgid "True if the media-keys settings manager plugin is enabled." +msgstr "درست اگر افزونه‌ی مدیر تنظیمات کلیدهای رسانه فعال باشد." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 -msgid "Use compiz as the window manager" -msgstr "" +msgid "True if the sound settings manager plugin is enabled." +msgstr "درست اگر افزونه‌ی مدیر تنظیمات صدا فعال باشد." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +msgid "True if the xsettings settings manager plugin is enabled." +msgstr "درست اگر افزونه‌ی مدیر تنظیمات xsettings فعال باشد." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" +msgstr "از کامپیز به عنوان مدیر پنجره استفاده شود" #: ../gui/simple-greeter/gdm-timer.c:149 -#, fuzzy msgid "Duration" -msgstr "اطلاعات" +msgstr "مدت" #: ../gui/simple-greeter/gdm-timer.c:150 msgid "Number of seconds until timer stops" -msgstr "" +msgstr "تعداد ثانیه‌ها تا وقتی که زمان‌سنج بایستد" #: ../gui/simple-greeter/gdm-timer.c:157 -#, fuzzy msgid "Start time" -msgstr "آ_غاز دوباره" +msgstr "زمان آغاز" #: ../gui/simple-greeter/gdm-timer.c:158 msgid "Time the timer was started" -msgstr "" +msgstr "زمانی که زمان‌سنج آغاز به کار کرده است" #: ../gui/simple-greeter/gdm-timer.c:165 -#, fuzzy msgid "Is it Running?" -msgstr "‏GDM در حال اجرا نیست" +msgstr "آیا در حال اجرا است؟" #: ../gui/simple-greeter/gdm-timer.c:166 -msgid "Whether or not the timer is currently ticking" -msgstr "" +msgid "Whether the timer is currently ticking" +msgstr "اینکه زمان‌سنج هم‌اکنون تیک تیک می‌کند" -#: ../gui/simple-greeter/gdm-user.c:241 -#, fuzzy -msgid "Manager" -msgstr "_زبان" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "ورود با عنوان %s" -#: ../gui/simple-greeter/gdm-user.c:242 -msgid "The user manager object this user is controlled by." -msgstr "" +#. translators: This option prompts +#. * the user to type in a username +#. * manually instead of choosing from +#. * a list. +#. +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 +msgctxt "user" +msgid "Other…" +msgstr "دیگر..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:87 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" -msgstr "یک کنش انتخاب کنید" +msgstr "یک حساب دیگر انتخاب کنید" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:99 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" -msgstr "" +msgstr "مهمان" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:100 -msgid "Login as a temporary guest" -msgstr "" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" +msgstr "ورود به سیستم به عنوان مهمان موقت" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:112 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" -msgstr "ورود خودکار به سیستم" +msgstr "ورود به سیستم خودکار" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:113 -msgid "Automatically login to the system after selecting options" -msgstr "" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:441 -#, fuzzy, c-format -msgid "Log in as %s" -msgstr "Log in anyway" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" +msgstr "بعد از انتخاب گزینه‌ها، به طور خودکار وارد سیستم شود" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:525 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" -msgstr "هم‌اکنون داخل سیستم هستید" +msgstr "در حال حاضر وارد سیستم است" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" +#: ../utils/gdmflexiserver.c:61 +msgid "Only the VERSION command is supported" +msgstr "فقط دستور VERSION پشتیبانی می‌شود" -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" +#: ../utils/gdmflexiserver.c:61 +msgid "COMMAND" +msgstr "COMMAND" -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "" +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +msgid "Ignored — retained for compatibility" +msgstr "چشم‌پوشی شده - نگه داشته شده برای سازگاری" -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +msgid "Debugging output" +msgstr "خروجی اشکال‌زدایی" -#: ../gui/user-switch-applet/applet.c:795 -#, fuzzy, c-format -msgid "Can't lock screen: %s" -msgstr "نمی‌توان صفحهٔ نمایش را قفل کرد" +#: ../utils/gdmflexiserver.c:68 +msgid "Version of this application" +msgstr "نسخه‌ی این برنامه" -#: ../gui/user-switch-applet/applet.c:817 +#: ../utils/gdmflexiserver.c:675 #, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" +msgid "Could not identify the current session." +msgstr "شناسایی نشست جاری ممکن نبود" -#: ../gui/user-switch-applet/applet.c:1023 -msgid "Unknown" -msgstr "" +#. Option parsing +#: ../utils/gdmflexiserver.c:711 +msgid "- New GDM login" +msgstr "- ورود به سیستم٬ GDM جدید" -#: ../gui/user-switch-applet/applet.c:1081 -msgid "User Switch Applet" -msgstr "" +#: ../utils/gdmflexiserver.c:767 +msgid "Unable to start new display" +msgstr "نمی‌توان نمایش جدید را آغاز کرد" -#: ../gui/user-switch-applet/applet.c:1105 -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "عکس صفحه گرفته شد" -#: ../gui/user-switch-applet/gdm-user-menu-item.c:338 -#, fuzzy -msgid "User" -msgstr "کاربرها" +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "گرفتن یک عکس از صفحه‌نمایش" -#: ../gui/user-switch-applet/gdm-user-menu-item.c:339 -msgid "The user this menu item represents." -msgstr "" +#~ msgid "Shutdown Options…" +#~ msgstr "گزینه‌های خاموش کردن..." -#: ../gui/user-switch-applet/gdm-user-menu-item.c:346 -#, fuzzy -msgid "Icon Size" -msgstr "شمایل" +#~ msgid "Keyboard layouts" +#~ msgstr "چیدمان‌های صفحه‌کلید" -#: ../gui/user-switch-applet/gdm-user-menu-item.c:347 -msgid "The size of the icon to use." -msgstr "" +#~ msgid "_Keyboard:" +#~ msgstr "_صفحه‌کلید:" -#: ../gui/user-switch-applet/gdm-user-menu-item.c:353 -msgid "Indicator Size" -msgstr "" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "دیگر..." -#: ../gui/user-switch-applet/gdm-user-menu-item.c:354 -msgid "Size of check indicator" -msgstr "" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "یک چیدمان صفحه‌کلید را فهرست کامل چیدمان‌های موجود انتخاب کنید." -#: ../gui/user-switch-applet/gdm-user-menu-item.c:359 -msgid "Indicator Spacing" -msgstr "" +#~ msgid "Keyboard" +#~ msgstr "صفحه‌کلید" -#: ../gui/user-switch-applet/gdm-user-menu-item.c:360 -msgid "Space between the username and the indicator" -msgstr "" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "چیدمان‌های صفحه‌کلید که اخیرا گزیده شده‌اند" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "روی فهرستی از چیدمان‌های صفحه کلید تنظیم شود که به عنوان پیش‌فرض در پنجره‌ی " +#~ "ورود به سیستم نمایش داده شود." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "" +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "برنامک تعویض کاربر یک نرم‌افزار آزاد است. شما می‌توانید آن را تحت شرایط " +#~ "اجازه‌نامه‌ی همگانی عمومی گنو، که بنیاد نرم‌افزارهای آزاد منتشر کرده است،‌ " +#~ "تغییر دهید، یا دوباره توزیع کنید. یا نسخه‌ی 2 اجازه‌نامه یا (به اختیار " +#~ "خودتان) هر نسخه‌ی بالاتر دیگری." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "این برنامه به این امید توزیع می‌شود که سودمند باشد ولی هیچ‌گونه ضمانتی " +#~ "ندارد؛ حتی این ضمانت که قابل فروش باشد یا برای منظور بخصوصی مناسب باشد. " +#~ "برای جزئیات بیشتر متن مجوز عمومی همگانی گنو را ببینید." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -#, fuzzy -msgid "_About" -msgstr "_راه‌اندازی مجدد" +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "شما باید همراه با مرورگر وب گنوم یک نسخه از اجازه‌نامه‌ی همگانی عمومی گنو " +#~ "را دریافت کرده باشید، در غیر این صورت برای سازمان جنبش نرم‌افزار آزاد به " +#~ "آدرس 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA بنویسید." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "منویی برای تعویض فوری بین کاربران" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4 -msgid "_Help" -msgstr "" +#~ msgid "translator-credits" +#~ msgstr "" +#~ "مهیار مقیمی \n" +#~ "روزبه پورنادر ‎‎\n" +#~ "میلاد زکریا \n" +#~ "مسعود احمدزاده \n" +#~ "ساناز شاه‌رکنی " -#: ../utils/gdmflexiserver.c:60 -msgid "Send the specified protocol command to GDM" -msgstr "ارسال فرمان قرارداد مشخص شده به gdm" +#~ msgid "Can't lock screen: %s" +#~ msgstr "صفحه‌نمایش قفل نمی‌شود: %s" -#: ../utils/gdmflexiserver.c:60 -msgid "COMMAND" -msgstr "فرمان" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "نمی‌توان به طور موقت محافظ صفحه نمایش را روی صفحه‌ی خالی گذاشت: %s" -#: ../utils/gdmflexiserver.c:61 -msgid "Xnest mode" -msgstr "حالت Xnest" +#~ msgid "Can't log out: %s" +#~ msgstr "نمی‌توان از سیستم خارج شد: %s" -#: ../utils/gdmflexiserver.c:62 -msgid "Do not lock current screen" -msgstr "صفحهٔ فعلی قفل نشود" +#~ msgid "Available" +#~ msgstr "موجود:" -#: ../utils/gdmflexiserver.c:63 ../utils/gdm-screenshot.c:41 -msgid "Debugging output" -msgstr "خروجی اشکال‌زدایی" +#~ msgid "Invisible" +#~ msgstr "نامرئی" -#: ../utils/gdmflexiserver.c:64 -msgid "Authenticate before running --command" -msgstr "تأیید هویت قبل از اجرای ‎--command" +#~ msgid "Busy" +#~ msgstr "مشغول" -#: ../utils/gdmflexiserver.c:65 -msgid "Start new flexible session; do not show popup" -msgstr "" +#~ msgid "Away" +#~ msgstr "دور از دسترس" + +#~ msgid "Account Information" +#~ msgstr "اطلاعات حساب:" + +#~ msgid "System Preferences" +#~ msgstr "ترجیحات سیستم" + +#~ msgid "Lock Screen" +#~ msgstr "قفل کردن صفحه" + +#~ msgid "Switch User" +#~ msgstr "تعویض کاربر" + +#~| msgid "_Quit" +#~ msgid "Quit…" +#~ msgstr "ترک..." + +#~ msgid "Unknown" +#~ msgstr "ناشناخته" + +#~ msgid "User Switch Applet" +#~ msgstr "برنامک تعویض کاربر" + +#~ msgid "Change account settings and status" +#~ msgstr "تغییر تنظیمات حساب و وضعیت" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "منویی برای تعویض سریع بین کاربرها" + +#~ msgid "User Switcher" +#~ msgstr "تعویض‌گر کاربر" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "کارخانه‌ی برنامک تعویض کاربر" + +#~ msgid "Edit Personal _Information" +#~ msgstr "اطلاعات _شخصی خود را ویرایش کنید" + +#~ msgid "_About" +#~ msgstr "_درباره" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_ویرایش کاربرها و گروه‌ها" -#: ../utils/gdmflexiserver.c:67 #, fuzzy -msgid "Version of this application" -msgstr "چگونه از این برنامه استفاده کنیم" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "%s: Couldn't set groupid to 0" -#: ../utils/gdmflexiserver.c:674 -#, c-format -msgid "Could not identify the current session." -msgstr "" +#, fuzzy +#~ msgid "Unable establish credentials" +#~ msgstr "Unable to establish service %s: %s\n" -#: ../utils/gdmflexiserver.c:710 ../utils/gdm-screenshot.c:226 #, fuzzy -msgid "Main Options" -msgstr "گزینه‌های اصلی" +#~ msgid "Assistive Technology Preferences" +#~ msgstr "ترجیحات عکس ورود به سیستم" + +#~ msgid "%a %b %e" +#~ msgstr "%A %Od %B" -#: ../utils/gdmflexiserver.c:759 #, fuzzy -msgid "Unable to start new display" -msgstr "نمی‌توان نمایش جدید را آغاز کرد" +#~ msgid "%1$s, %2$s" +#~ msgstr "%s: %s" + +#, fuzzy +#~ msgid "You have the Caps Lock key on." +#~ msgstr "قفل تبدیل روشن است!" + +#, fuzzy +#~ msgid "Failed to restart computer" +#~ msgstr "Failed to restart self" + +#, fuzzy +#~ msgid "Failed to stop computer" +#~ msgstr "Failed to restart self" + +#, fuzzy +#~ msgid "_Sessions:" +#~ msgstr "_نشست" + +#, fuzzy +#~ msgid "Enable debugging" +#~ msgstr "به کار انداختن ورود مدت‌دار به سیستم" + +#, fuzzy +#~ msgid "User" +#~ msgstr "کاربرها" + +#, fuzzy +#~ msgid "Icon Size" +#~ msgstr "شمایل" + +#~ msgid "Send the specified protocol command to GDM" +#~ msgstr "ارسال فرمان قرارداد مشخص شده به gdm" + +#~ msgid "Xnest mode" +#~ msgstr "حالت Xnest" + +#~ msgid "Do not lock current screen" +#~ msgstr "صفحهٔ فعلی قفل نشود" + +#~ msgid "Authenticate before running --command" +#~ msgstr "تأیید هویت قبل از اجرای ‎--command" + +#, fuzzy +#~ msgid "Main Options" +#~ msgstr "گزینه‌های اصلی" #~ msgid "CDE" #~ msgstr "CDE" @@ -1444,2709 +1496,3 @@ #~ msgid "%s: Standard X server not found; trying alternatives" #~ msgstr "%s: Standard X server not found, trying alternatives" - -# msgstr "%s: ‏TimedLoginDelay کمتر از ۵ بود، پس از ۵ استفاده می‌شود" -#~ msgid "%s: No greeter specified." -#~ msgstr "%s: No greeter specified." - -#~ msgid "%s: No remote greeter specified." -#~ msgstr "%s: No remote greeter specified." - -#~ msgid "%s: No sessions directory specified." -#~ msgstr "%s: No sessions directory specified." - -#~ msgid "" -#~ "%s: XDMCP was enabled while there is no XDMCP support; turning it off" -#~ msgstr "" -#~ "%s: XDMCP was enabled while there is no XDMCP support, turning it off" - -#~ msgid "%s: TimedLoginDelay is less than 5, defaulting to 5." -#~ msgstr "%s: TimedLoginDelay is less than 5, defaulting to 5." - -#~ msgid "%s: Empty server command; using standard command." -#~ msgstr "%s: Empty server command; using standard command." - -#~ msgid "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " -#~ "does not exist. Please correct GDM configuration and restart GDM." -#~ msgstr "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " -#~ "does not exist. Please correct GDM configuration and restart GDM." - -#~ msgid "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " -#~ "is not a directory. Please correct GDM configuration and restart GDM." -#~ msgstr "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but this " -#~ "is not a directory. Please correct GDM configuration and restart GDM." - -#~ msgid "%s: Invalid server line in config file. Ignoring!" -#~ msgstr "%s: Invalid server line in config file. Ignoring!" - -#~ msgid "%s: XDMCP disabled and no static servers defined. Aborting!" -#~ msgstr "%s: XDMCP disabled and no static servers defined. Aborting!" - -#~ msgid "" -#~ "%s: XDMCP disabled and no static servers defined. Adding %s on :%d to " -#~ "allow configuration!" -#~ msgstr "" -#~ "%s: XDMCP disabled and no static servers defined. Adding %s on :%d to " -#~ "allow configuration!" - -#~ msgid "" -#~ "XDMCP is disabled and GDM cannot find any static server to start. " -#~ "Aborting! Please correct the configuration and restart GDM." -#~ msgstr "" -#~ "XDMCP is disabled and GDM cannot find any static server to start. " -#~ "Aborting! Please correct the configuration and restart GDM." - -#~ msgid "" -#~ "The GDM user '%s' does not exist. Please correct GDM configuration and " -#~ "restart GDM." -#~ msgstr "" -#~ "The GDM user '%s' does not exist. Please correct GDM configuration and " -#~ "restart GDM." - -#~ msgid "" -#~ "The GDM user is set to be root, but this is not allowed since it can pose " -#~ "a security risk. Please correct GDM configuration and restart GDM." -#~ msgstr "" -#~ "The GDM user is set to be root, but this is not allowed since it can pose " -#~ "a security risk. Please correct GDM configuration and restart GDM." - -#~ msgid "" -#~ "The GDM group '%s' does not exist. Please correct GDM configuration and " -#~ "restart GDM." -#~ msgstr "" -#~ "The GDM group '%s' does not exist. Please correct GDM configuration and " -#~ "restart GDM." - -#~ msgid "" -#~ "The GDM group is set to be root, but this is not allowed since it can " -#~ "pose a security risk. Please correct GDM configuration and restart GDM." -#~ msgstr "" -#~ "The GDM group is set to be root, but this is not allowed since it can " -#~ "pose a security risk. Please correct GDM configuration and restart GDM." - -#~ msgid "%s: Greeter not found or can't be executed by the GDM user" -#~ msgstr "%s: Greeter not found or can't be executed by the GDM user" - -#~ msgid "%s: Remote greeter not found or can't be executed by the GDM user" -#~ msgstr "%s: Remote greeter not found or can't be executed by the GDM user" - -#~ msgid "%s: Chooser not found or it can't be executed by the GDM user" -#~ msgstr "%s: Chooser not found or it can't be executed by the GDM user" - -#~ msgid "No daemon/ServAuthDir specified in the GDM configuration file" -#~ msgstr "No daemon/ServAuthDir specified in the GDM configuration file" - -#~ msgid "%s: No daemon/ServAuthDir specified." -#~ msgstr "%s: No daemon/ServAuthDir specified." - -#~ msgid "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but is " -#~ "not owned by user %s and group %s. Please correct the ownership or GDM " -#~ "configuration and restart GDM." -#~ msgstr "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but is " -#~ "not owned by user %s and group %s. Please correct the ownership or GDM " -#~ "configuration and restart GDM." - -#~ msgid "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but has " -#~ "the wrong permissions: it should have permissions of %o. Please correct " -#~ "the permissions or the GDM configuration and restart GDM." -#~ msgstr "" -#~ "Server Authorization directory (daemon/ServAuthDir) is set to %s but has " -#~ "the wrong permissions: it should have permissions of %o. Please correct " -#~ "the permissions or the GDM configuration and restart GDM." - -#~ msgid "y = Yes or n = No? >" -#~ msgstr "y = Yes or n = No? >" - -#~ msgid "%s: Cannot get local addresses!" -#~ msgstr "%s: Cannot get local addresses!" - -#~ msgid "Could not setgid %d. Aborting." -#~ msgstr "Could not setgid %d. Aborting." - -#~ msgid "initgroups () failed for %s. Aborting." -#~ msgstr "initgroups () failed for %s. Aborting." - -#~ msgid "%s: Error setting signal %d to %s" -#~ msgstr "%s: Error setting signal %d to %s" - -#~ msgid "" -#~ "Last login:\n" -#~ "%s" -#~ msgstr "" -#~ "Last login:\n" -#~ "%s" - -#~ msgid "Can not start fallback console" -#~ msgstr "Can not start fallback console" - -#~ msgid "" -#~ "There already appears to be an X server running on display %s. Should " -#~ "another display number by tried? Answering no will cause GDM to attempt " -#~ "starting the server on %s again.%s" -#~ msgstr "" -#~ "There already appears to be an X server running on display %s. Should " -#~ "another display number by tried? Answering no will cause GDM to attempt " -#~ "starting the server on %s again.%s" - -#~ msgid "" -#~ " (You can change consoles by pressing Ctrl-Alt plus a function key, such " -#~ "as Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 " -#~ "and higher.)" -#~ msgstr "" -#~ " (You can change consoles by pressing Ctrl-Alt plus a function key, such " -#~ "as Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 " -#~ "and higher.)" - -#~ msgid "Display '%s' cannot be opened by Xnest" -#~ msgstr "Display '%s' cannot be opened by Xnest" - -#~ msgid "Display %s is busy. There is another X server running already." -#~ msgstr "Display %s is busy. There is another X server running already." - -#~ msgid "%s: Error opening a pipe: %s" -#~ msgstr "%s: Error opening a pipe: %s" - -#~ msgid "%s: Cannot find a free display number" -#~ msgstr "%s: Cannot find a free display number" - -#~ msgid "%s: Display %s busy. Trying another display number." -#~ msgstr "%s: Display %s busy. Trying another display number." - -#~ msgid "Invalid server command '%s'" -#~ msgstr "Invalid server command '%s'" - -#~ msgid "Server name '%s' not found; using standard server" -#~ msgstr "Server name '%s' not found; using standard server" - -#~ msgid "%s: Xserver not found: %s" -#~ msgstr "%s: Xserver not found: %s" - -#~ msgid "%s: Can't fork Xserver process!" -#~ msgstr "%s: Can't fork Xserver process!" - -#~ msgid "Can't set EGID to user GID" -#~ msgstr "Can't set EGID to user GID" - -#~ msgid "Can't set EUID to user UID" -#~ msgstr "Can't set EUID to user UID" - -#~ msgid "" -#~ "You are already logged in. You can log in anyway, return to your " -#~ "previous login session, or abort this login" -#~ msgstr "" -#~ "You are already logged in. You can log in anyway, return to your " -#~ "previous login session, or abort this login" - -#~ msgid "Return to previous login" -#~ msgstr "Return to previous login" - -#~ msgid "Abort login" -#~ msgstr "Abort login" - -#~ msgid "" -#~ "You are already logged in. You can log in anyway or abort this login" -#~ msgstr "" -#~ "You are already logged in. You can log in anyway or abort this login" - -#~ msgid "%s: cannot fork" -#~ msgstr "%s: cannot fork" - -#~ msgid "%s: cannot open display %s" -#~ msgstr "%s: cannot open display %s" - -#~ msgid "" -#~ "Could not execute the configuration application. Make sure its path is " -#~ "set correctly in the configuration file. Attempting to start it from the " -#~ "default location." -#~ msgstr "" -#~ "Could not execute the configuration application. Make sure its path is " -#~ "set correctly in the configuration file. Attempting to start it from the " -#~ "default location." - -#~ msgid "" -#~ "Could not execute the configuration application. Make sure its path is " -#~ "set correctly in the configuration file." -#~ msgstr "" -#~ "Could not execute the configuration application. Make sure its path is " -#~ "set correctly in the configuration file." - -#~ msgid "You must authenticate as root to run configuration." -#~ msgstr "You must authenticate as root to run configuration." - -#~ msgid "" -#~ "Login sound requested on non-local display or the play software cannot be " -#~ "run or the sound does not exist." -#~ msgstr "" -#~ "Login sound requested on non-local display or the play software cannot be " -#~ "run or the sound does not exist." - -#~ msgid "%s: Can't init pipe to gdmgreeter" -#~ msgstr "%s: Can't init pipe to gdmgreeter" - -#~ msgid "" -#~ "No servers were defined in the configuration file and XDMCP was " -#~ "disabled. This can only be a configuration error. GDM has started a " -#~ "single server for you. You should log in and fix the configuration. " -#~ "Note that automatic and timed logins are disabled now." -#~ msgstr "" -#~ "No servers were defined in the configuration file and XDMCP was " -#~ "disabled. This can only be a configuration error. GDM has started a " -#~ "single server for you. You should log in and fix the configuration. " -#~ "Note that automatic and timed logins are disabled now." - -#~ msgid "" -#~ "Could not start the regular X server (your graphical environment) and so " -#~ "this is a failsafe X server. You should log in and properly configure " -#~ "the X server." -#~ msgstr "" -#~ "Could not start the regular X server (your graphical environment) and so " -#~ "this is a failsafe X server. You should log in and properly configure " -#~ "the X server." - -#~ msgid "" -#~ "The specified display number was busy, so this server was started on " -#~ "display %s." -#~ msgstr "" -#~ "The specified display number was busy, so this server was started on " -#~ "display %s." - -#~ msgid "" -#~ "The greeter application appears to be crashing.\n" -#~ "Attempting to use a different one." -#~ msgstr "" -#~ "The greeter application appears to be crashing.\n" -#~ "Attempting to use a different one." - -#~ msgid "" -#~ "%s: Cannot start greeter with gtk modules: %s. Trying without modules" -#~ msgstr "" -#~ "%s: Cannot start greeter with gtk modules: %s. Trying without modules" - -#~ msgid "%s: Cannot start greeter trying default: %s" -#~ msgstr "%s: Cannot start greeter trying default: %s" - -#~ msgid "" -#~ "Cannot start the greeter application; you will not be able to log in. " -#~ "This display will be disabled. Try logging in by other means and editing " -#~ "the configuration file" -#~ msgstr "" -#~ "Cannot start the greeter application; you will not be able to log in. " -#~ "This display will be disabled. Try logging in by other means and editing " -#~ "the configuration file" - -#~ msgid "%s: Error starting greeter on display %s" -#~ msgstr "%s: Error starting greeter on display %s" - -#~ msgid "%s: Can't fork gdmgreeter process" -#~ msgstr "%s: Can't fork gdmgreeter process" - -#~ msgid "%s: Can't open fifo!" -#~ msgstr "%s: Can't open fifo!" - -#~ msgid "%s: Can't init pipe to gdmchooser" -#~ msgstr "%s: Can't init pipe to gdmchooser" - -#~ msgid "" -#~ "Cannot start the chooser application. You will probably not be able to " -#~ "log in. Please contact the system administrator." -#~ msgstr "" -#~ "Cannot start the chooser application. You will probably not be able to " -#~ "log in. Please contact the system administrator." - -#~ msgid "%s: Error starting chooser on display %s" -#~ msgstr "%s: Error starting chooser on display %s" - -#~ msgid "%s: Can't fork gdmchooser process" -#~ msgstr "%s: Can't fork gdmchooser process" - -#~ msgid "%s: Could not open ~/.xsession-errors" -#~ msgstr "%s: Could not open ~/.xsession-errors" - -#~ msgid "%s: Execution of PreSession script returned > 0. Aborting." -#~ msgstr "%s: Execution of PreSession script returned > 0. Aborting." - -#~ msgid "Language %s does not exist; using %s" -#~ msgstr "Language %s does not exist; using %s" - -#~ msgid "System default" -#~ msgstr "System default" - -#~ msgid "%s: Could not setup environment for %s. Aborting." -#~ msgstr "%s: Could not setup environment for %s. Aborting." - -#~ msgid "%s: setusercontext () failed for %s. Aborting." -#~ msgstr "%s: setusercontext () failed for %s. Aborting." - -#~ msgid "%s: Could not become %s. Aborting." -#~ msgstr "%s: Could not become %s. Aborting." - -#~ msgid "" -#~ "No Exec line in the session file: %s. Running the GNOME failsafe session " -#~ "instead" -#~ msgstr "" -#~ "No Exec line in the session file: %s. Running the GNOME failsafe session " -#~ "instead" - -#~ msgid "" -#~ "%s: Cannot find or run the base Xsession script. Running the GNOME " -#~ "failsafe session instead." -#~ msgstr "" -#~ "%s: Cannot find or run the base Xsession script. Running the GNOME " -#~ "failsafe session instead." - -#~ msgid "" -#~ "Cannot find or run the base session script. Running the GNOME failsafe " -#~ "session instead." -#~ msgstr "" -#~ "Cannot find or run the base session script. Running the GNOME failsafe " -#~ "session instead." - -#~ msgid "" -#~ "%s: gnome-session not found for a failsafe GNOME session, trying xterm" -#~ msgstr "" -#~ "%s: gnome-session not found for a failsafe GNOME session, trying xterm" - -#~ msgid "" -#~ "Could not find the GNOME installation, will try running the \"Failsafe " -#~ "xterm\" session." -#~ msgstr "" -#~ "Could not find the GNOME installation, will try running the \"Failsafe " -#~ "xterm\" session." - -#~ msgid "" -#~ "This is the Failsafe GNOME session. You will be logged into the " -#~ "'Default' session of GNOME without the startup scripts being run. This " -#~ "should be used to fix problems in your installation." -#~ msgstr "" -#~ "This is the Failsafe GNOME session. You will be logged into the " -#~ "'Default' session of GNOME without the startup scripts being run. This " -#~ "should be used to fix problems in your installation." - -#~ msgid "" -#~ "%s: gnome-session not found for a failsafe GNOME session; trying xterm" -#~ msgstr "" -#~ "%s: gnome-session not found for a failsafe GNOME session; trying xterm" - -#~ msgid "" -#~ "Could not find the GNOME installation. Running the \"Failsafe xterm\" " -#~ "session instead." -#~ msgstr "" -#~ "Could not find the GNOME installation. Running the \"Failsafe xterm\" " -#~ "session instead." - -#~ msgid "Cannot find \"xterm\" to start a failsafe session." -#~ msgstr "Cannot find \"xterm\" to start a failsafe session." - -#~ msgid "" -#~ "This is the Failsafe xterm session. You will be logged into a terminal " -#~ "console so that you may fix your system if you cannot log in any other " -#~ "way. To exit the terminal emulator, type 'exit' and an enter into the " -#~ "window." -#~ msgstr "" -#~ "This is the Failsafe xterm session. You will be logged into a terminal " -#~ "console so that you may fix your system if you cannot log in any other " -#~ "way. To exit the terminal emulator, type 'exit' and an enter into the " -#~ "window." - -#~ msgid "" -#~ "This is the Failsafe xterm session. You will be logged into a terminal " -#~ "console and be prompted to enter the password for root so that you may " -#~ "fix your system if you cannot log in any other way. To exit the terminal " -#~ "emulator, type 'exit' and an enter into the window." -#~ msgstr "" -#~ "This is the Failsafe xterm session. You will be logged into a terminal " -#~ "console and be prompted to enter the password for root so that you may " -#~ "fix your system if you cannot log in any other way. To exit the terminal " -#~ "emulator, type 'exit' and an enter into the window." - -#~ msgid "" -#~ "The failsafe session is restricted to users who have been assigned the " -#~ "root role. If you cannot log in any other way please contact your system " -#~ "administrator" -#~ msgstr "" -#~ "The failsafe session is restricted to users who have been assigned the " -#~ "root role. If you cannot log in any other way please contact your system " -#~ "administrator" - -#~ msgid "%s: User not allowed to log in" -#~ msgstr "%s: User not allowed to log in" - -#~ msgid "The system administrator has disabled your account." -#~ msgstr "The system administrator has disabled your account." - -#~ msgid "Error! Unable to set executable context." -#~ msgstr "Error! Unable to set executable context." - -#~ msgid "%s: Could not exec %s %s %s %s %s %s" -#~ msgstr "%s: Could not exec %s %s %s %s %s %s" - -#~ msgid "%s: Could not exec %s %s %s" -#~ msgstr "%s: Could not exec %s %s %s" - -#~ msgid "Cannot start the session due to some internal error." -#~ msgstr "Cannot start the session due to some internal error." - -#~ msgid "%s: User passed auth but getpwnam (%s) failed!" -#~ msgstr "%s: User passed auth but getpwnam (%s) failed!" - -#~ msgid "%s: Execution of PostLogin script returned > 0. Aborting." -#~ msgstr "%s: Execution of PostLogin script returned > 0. Aborting." - -#~ msgid "" -#~ "Your home directory is listed as:\n" -#~ "'%s'\n" -#~ "but it does not appear to exist. Do you want to log in with the / (root) " -#~ "directory as your home directory?\n" -#~ "\n" -#~ "It is unlikely anything will work unless you use a failsafe session." -#~ msgstr "" -#~ "Your home directory is listed as:\n" -#~ "'%s'\n" -#~ "but it does not appear to exist. Do you want to log in with the / (root) " -#~ "directory as your home directory?\n" -#~ "\n" -#~ "It is unlikely anything will work unless you use a failsafe session." - -#~ msgid "%s: Home directory for %s: '%s' does not exist!" -#~ msgstr "%s: Home directory for %s: '%s' does not exist!" - -#~ msgid "" -#~ "User's $HOME/.dmrc file is being ignored. This prevents the default " -#~ "session and language from being saved. File should be owned by user and " -#~ "have 644 permissions. User's $HOME directory must be owned by user and " -#~ "not writable by other users." -#~ msgstr "" -#~ "User's $HOME/.dmrc file is being ignored. This prevents the default " -#~ "session and language from being saved. File should be owned by user and " -#~ "have 644 permissions. User's $HOME directory must be owned by user and " -#~ "not writable by other users." - -#~ msgid "" -#~ "GDM could not write to your authorization file. This could mean that you " -#~ "are out of disk space or that your home directory could not be opened for " -#~ "writing. In any case, it is not possible to log in. Please contact your " -#~ "system administrator" -#~ msgstr "" -#~ "GDM could not write to your authorization file. This could mean that you " -#~ "are out of disk space or that your home directory could not be opened for " -#~ "writing. In any case, it is not possible to log in. Please contact your " -#~ "system administrator" - -#~ msgid "%s: Error forking user session" -#~ msgstr "%s: Error forking user session" - -#~ msgid "" -#~ "Your session only lasted less than 10 seconds. If you have not logged " -#~ "out yourself, this could mean that there is some installation problem or " -#~ "that you may be out of diskspace. Try logging in with one of the " -#~ "failsafe sessions to see if you can fix this problem." -#~ msgstr "" -#~ "Your session only lasted less than 10 seconds. If you have not logged " -#~ "out yourself, this could mean that there is some installation problem or " -#~ "that you may be out of diskspace. Try logging in with one of the " -#~ "failsafe sessions to see if you can fix this problem." - -#~ msgid "View details (~/.xsession-errors file)" -#~ msgstr "View details (~/.xsession-errors file)" - -#~ msgid "GDM detected a halt or restart in progress." -#~ msgstr "GDM detected a halt or restart in progress." - -#~ msgid "Ping to %s failed; whacking display!" -#~ msgstr "Ping to %s failed; whacking display!" - -#~ msgid "%s: Fatal X error - Restarting %s" -#~ msgstr "%s: Fatal X error - Restarting %s" - -#~ msgid "" -#~ "Login sound requested on non-local display or the play software cannot be " -#~ "run or the sound does not exist" -#~ msgstr "" -#~ "Login sound requested on non-local display or the play software cannot be " -#~ "run or the sound does not exist" - -#~ msgid "%s: Failed starting: %s" -#~ msgstr "%s: Failed starting: %s" - -#~ msgid "%s: Can't fork script process!" -#~ msgstr "%s: Can't fork script process!" - -#~ msgid "%s: Failed creating pipe" -#~ msgstr "%s: Failed creating pipe" - -#~ msgid "%s: Failed executing: %s" -#~ msgstr "%s: Failed executing: %s" - -#~ msgid "" -#~ "\n" -#~ "Incorrect username or password. Letters must be typed in the correct " -#~ "case." -#~ msgstr "" -#~ "\n" -#~ "نام کاربر یا گذرواژه درست نیست. بزرگی و کوچکی حروف باید رعایت شود." - -#~ msgid "Please enter your username" -#~ msgstr "لطفاً نام کاربری‌تان را وارد کنید" - -#~ msgid "Password:" -#~ msgstr "گذرواژه:" - -#~ msgid "Couldn't authenticate user \"%s\"" -#~ msgstr "هویت کاربر «%s» تأیید نشد" - -#~ msgid "Root login disallowed on display '%s'" -#~ msgstr "ورود به سیستم برای root از صفحهٔ نمایش «%s» مجاز نیست" - -#~ msgid "The system administrator is not allowed to login from this screen" -#~ msgstr "مدیر سیستم مجاز نیست از این صفحهٔ نمایش وارد سیستم شود" - -#~ msgid "User %s not allowed to log in" -#~ msgstr "کاربر %s مجاز به ورود به سیستم نیست" - -#~ msgid "" -#~ "\n" -#~ "The system administrator has disabled your account." -#~ msgstr "" -#~ "\n" -#~ "مدیر سیستم حساب شما را از کار انداخته است." - -#~ msgid "Cannot set user group for %s" -#~ msgstr "نمی‌توان گروه کاربر را برای %s تنظیم کرد" - -#~ msgid "" -#~ "\n" -#~ "Cannot set your user group; you will not be able to log in. Please " -#~ "contact your system administrator." -#~ msgstr "" -#~ "\n" -#~ "نمی‌توان کروه کاربر شما را تنظیم کرد، شما نمی‌توانید وارد سیستم شوید. لطفاً " -#~ "با مدیر سیستم خود تماس بگیرید." - -#~ msgid "Password of %s has expired" -#~ msgstr "گذرواژهٔ %s منقضی شده است" - -#~ msgid "" -#~ "You are required to change your password.\n" -#~ "Please choose a new one." -#~ msgstr "" -#~ "لازم است گذرواژهٔ خود را تغییر دهید.\n" -#~ "لطفاً یک گذرواژهٔ جدید انتخاب کنید." - -#~ msgid "" -#~ "\n" -#~ "Cannot change your password; you will not be able to log in. Please try " -#~ "again later or contact your system administrator." -#~ msgstr "" -#~ "\n" -#~ "نمی‌توان گذرواژهٔ شما را تغییر داد، شما نمی‌توانید وارد سیستم شوید. لطفاً " -#~ "بعداً دوباره امتحان کنید یا با مدیر سیستم خود تماس بگیرید." - -#~ msgid "" -#~ "Your password has been changed but you may have to change it again. " -#~ "Please try again later or contact your system administrator." -#~ msgstr "" -#~ "گذرواژهٔ شما تغییر یافت ولی ممکن است لازم باشد دوباره آن را تغییر دهید. " -#~ "لطفاً بعداً دوباره امتحان کنید یا با مدیر سیستم خود تماس بگیرید." - -#~ msgid "" -#~ "Your password has expired.\n" -#~ "Only a system administrator can now change it" -#~ msgstr "" -#~ "گذرواژهٔ شما منقضی شده است.\n" -#~ "حالا دیگر فقط مدیر سیستم می‌تواند آن را تغییر دهد" - -#~ msgid "Internal error on passwdexpired" -#~ msgstr "خطای داخلی در passwdexpired" - -#~ msgid "" -#~ "An internal error occurred. You will not be able to log in.\n" -#~ "Please try again later or contact your system administrator." -#~ msgstr "" -#~ "یک خطای داخلی رخ داد، و شما نمی‌توانید وارد سیستم شوید.\n" -#~ "لطفاً بعداً دوباره امتحان کنید یا با مدیر سیستم خود تماس بگیرید." - -#~ msgid "Cannot get passwd structure for %s" -#~ msgstr "نمی‌توان ساختار passwd را برای %s گرفت" - -#~ msgid "You are required to change your password immediately (password aged)" -#~ msgstr "لازم است فوراً گذرواژهٔ خود را تغییر دهید (گذرواژه قدیمی شده است)" - -#~ msgid "You are required to change your password immediately (root enforced)" -#~ msgstr "لازم است فوراً گذرواژهٔ خود را تغییر دهید (اجبار از root)" - -#~ msgid "Your account has expired; please contact your system administrator" -#~ msgstr "حساب شما منقضی شده است، لطفاً با مدیر سیستم خود تماس بگیرید." - -#~ msgid "No password supplied" -#~ msgstr "گذزواژه‌ای داده نشد" - -#~ msgid "Password unchanged" -#~ msgstr "گذرواژه تغییری نکرد" - -#~ msgid "Can not get username" -#~ msgstr "نمی‌توان نام کاربر را گرفت" - -#~ msgid "Retype new UNIX password:" -#~ msgstr "گذرواژهٔ جدید یونیکس را دوباره بنویسید:" - -#~ msgid "Enter new UNIX password:" -#~ msgstr "گذرواژهٔ جدید یونیکس را وارد کنید:" - -#~ msgid "(current) UNIX password:" -#~ msgstr "گذرواژهٔ یونیکس (فعلی):" - -#~ msgid "Error while changing NIS password." -#~ msgstr "خطا در هنگام تغییر دادن گذرواژهٔ NIS." - -#~ msgid "You must choose a longer password" -#~ msgstr "شما باید گذرواژهٔ بلندتری انتخاب کنید" - -#~ msgid "Password has been already used. Choose another." -#~ msgstr "گذرواژه قبلاً استفاده شده است. یکی دیگر انتخاب کنید." - -#~ msgid "You must wait longer to change your password" -#~ msgstr "شما باید مدت بیشتری صبر کنید تا بتوانید گذرواژهٔ خود را تغییر دهید" - -#~ msgid "Sorry, passwords do not match" -#~ msgstr "گذرواژه‌ها یکسان نیستند" - -#~ msgid "Cannot setup pam handle with null display" -#~ msgstr "Cannot setup pam handle with null display" - -#~ msgid "Can't set PAM_TTY=%s" -#~ msgstr "Can't set PAM_TTY=%s" - -#~ msgid "Can't set PAM_RHOST=%s" -#~ msgstr "Can't set PAM_RHOST=%s" - -#~ msgid "" -#~ "\n" -#~ "The system administrator is not allowed to login from this screen" -#~ msgstr "" -#~ "\n" -#~ "مدیر سیستم مجاز نیست از این صفحهٔ نمایش وارد سیستم شود" - -#~ msgid "Authentication token change failed for user %s" -#~ msgstr "تغییر نشانهٔ تأیید هویت برای کاربر %s شکست خورد" - -#~ msgid "" -#~ "\n" -#~ "The change of the authentication token failed. Please try again later or " -#~ "contact the system administrator." -#~ msgstr "" -#~ "\n" -#~ "تغییر نشانهٔ تأیید هویت شکست خورد. لطفاً بعداً دوباره امتحان کنید یا با مدیر " -#~ "سیستم خود تماس بگیرید." - -#~ msgid "User %s no longer permitted to access the system" -#~ msgstr "کاربر %s دیگر مجاز نیست به سیستم دسترسی داشته باشد" - -#~ msgid "User %s not permitted to gain access at this time" -#~ msgstr "در حال حاضر کاربر %s مجاز به دستیابی به سیستم نیست" - -#~ msgid "" -#~ "\n" -#~ "The system administrator has disabled access to the system temporarily." -#~ msgstr "" -#~ "\n" -#~ "مدیر سیستم دسترسی شما به سیستم را موقتاً از کار انداخته است." - -#~ msgid "Couldn't open session for %s" -#~ msgstr "نمی‌توان برای %s نشست باز کرد" - -#~ msgid "" -#~ "\n" -#~ "Authentication failed. Letters must be typed in the correct case." -#~ msgstr "" -#~ "\n" -#~ "تأیید هویت شکست خورد. بزرگی و کوچکی حروف باید رعایت شود." - -#~ msgid "" -#~ "\n" -#~ "The system administrator has disabled your access to the system " -#~ "temporarily." -#~ msgstr "" -#~ "\n" -#~ "مدیر سیستم موقتاً دسترسی شما به سیستم را از کار انداخته است." - -#~ msgid "Can't find PAM configuration for GDM." -#~ msgstr "نمی‌توان پیکربندی PAM برای GDM را پیدا کرد." - -#~ msgid "%s: Could not bind to XDMCP socket!" -#~ msgstr "%s: Could not bind to XDMCP socket!" - -#~ msgid "%s: Unknown opcode from host %s" -#~ msgstr "%s: Unknown opcode from host %s" - -#~ msgid "" -#~ "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-" -#~ "authfile %s': %s" -#~ msgstr "" -#~ "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-" -#~ "authfile %s': %s" - -#~ msgid "%s: No XDMCP support" -#~ msgstr "%s: No XDMCP support" - -#~ msgid "Xnest command line" -#~ msgstr "خط فرمان Xnest" - -#~ msgid "STRING" -#~ msgstr "رشته" - -#~ msgid "Extra options for Xnest" -#~ msgstr "گزینه‌های اضافی Xnest" - -#~ msgid "OPTIONS" -#~ msgstr "گزینه‌ها" - -#~ msgid "Run in background" -#~ msgstr "اجرا در پس‌زمینه" - -#~ msgid "Just run Xnest, no query (no chooser)" -#~ msgstr "فقط اجرای Xnest، بدون پرس‌وجو (بدون انتخاب‌گر)" - -#~ msgid "Do direct query instead of indirect (chooser)" -#~ msgstr "انجام پرس‌وجوی مستقیم به جای غیر مستقیم (انتخاب‌گر)" - -#~ msgid "Don't check for running GDM" -#~ msgstr "وجود GDM در حال اجرا بررسی نشود" - -#~ msgid "- Nested gdm login chooser" -#~ msgstr "- انتخاب‌گر ورود به سیستم GDM تو در تو" - -#~ msgid "- Nested gdm login" -#~ msgstr "- ورود به سیستم GDM تو در تو" - -#~ msgid "Please ask your system administrator to install it." -#~ msgstr "لطفاً از مدیر سیستم خود بخواهید آن را نصب کند." - -#~ msgid "Indirect XDMCP is not enabled" -#~ msgstr "‏XDMCP غیر مستقیم به کار انداخته نشده است" - -#~ msgid "Please ask your system administrator to enable this feature." -#~ msgstr "لطفاً از مدیر سیستم خود بخواهید این امکان را به کار بیندازد." - -#~ msgid "XDMCP is not enabled" -#~ msgstr "‏XDMCP به کار انداخته نشده است" - -#~ msgid "Please ask your system administrator to start it." -#~ msgstr "لطفاً از مدیر سیستم خود بخواهید آن را راه‌اندازی کند." - -#~ msgid "Could not find a free display number" -#~ msgstr "پیدا کردن شمارهٔ یک نمایش آزاد ممکن نبود" - -#~ msgid "Please wait: scanning local network..." -#~ msgstr "لطفاً صبر کنید: در حال پویش شبکه محلی..." - -#~ msgid "No serving hosts were found." -#~ msgstr "هیچ میزبان در حال کاری پیدا نشد." - -#~ msgid "Choose a ho_st to connect to:" -#~ msgstr "یک _میزبان انتخاب کنید تا به آن متصل شوید:" - -#~ msgid "" -#~ "The host \"%s\" is not willing to support a login session right now. " -#~ "Please try again later." -#~ msgstr "" -#~ "میزبان «%s» در حال حاضر نمی‌خواهد یک نشست ورود به سیستم را پشتیبانی کند. " -#~ "لطفاً بعداً دوباره امتحان کنید." - -#~ msgid "Cannot connect to remote server" -#~ msgstr "نمی‌توان به کارگزار متصل شد" - -#~ msgid "" -#~ "Did not receive any response from host \"%s\" in %d seconds. Perhaps the " -#~ "host is not turned on, or is not willing to support a login session right " -#~ "now. Please try again later." -#~ msgstr "" -#~ "در %2$Id ثانیه پاسخی از میزبان «%1$s» دریافت نشد. شاید میزبان روشن نیست، " -#~ "یا در حال حاضر نمی‌خواهد یک نشست ورود به سیستم را پشتیبانی کند. لطفاً بعداً " -#~ "دوباره امتحان کنید." - -#~ msgid "Did not receive response from server" -#~ msgstr "پاسخی از کارگزار دریافت نشد" - -# c-format -#~ msgid "Cannot find the host \"%s\". Perhaps you have mistyped it." -#~ msgstr "میزبان «‎%s» پیدا نمی‌شود. شاید آن را اشتباه وارد کرده‌اید." - -#~ msgid "Cannot find host" -#~ msgstr "میزبان پیدا نمی‌شود" - -#~ msgid "" -#~ "The main area of this application shows the hosts on the local network " -#~ "that have \"XDMCP\" enabled. This allows users to login remotely to other " -#~ "computers as if they were logged on using the console.\n" -#~ "\n" -#~ "You can rescan the network for new hosts by clicking \"Refresh\". When " -#~ "you have selected a host click \"Connect\" to open a session to that " -#~ "computer." -#~ msgstr "" -#~ "محوطهٔ اصلی این برنامه میزبان‌های موجود در شبکهٔ محلی نشان را می‌دهد که " -#~ "«XDMCP» را به کار انداخته‌اند. این گزینه به کاربران اجازه می‌دهد از دوردست " -#~ "وارد رایانه‌های دیگر شوند، درست مثل این که از طریق پیشانه وارد سیستم شده " -#~ "باشند.\n" -#~ "\n" -#~ "شما می‌توانید برای یافتن میزبان جدید با کلیک کردن روی «نوسازی» شبکه را " -#~ "بازپویش کنید. وقتی میزبان را انتخاب کردید روی «اتصال» کلیک کنید تا یک نشست " -#~ "به آن رایانه باز شود." - -#~ msgid "Socket for xdm communication" -#~ msgstr "سوکت برای ارتباط xdm" - -#~ msgid "SOCKET" -#~ msgstr "سوکت" - -#~ msgid "Client address to return in response to xdm" -#~ msgstr "نشانی کارگیر که در پاسخ به xdm بازگردانده می‌شود" - -#~ msgid "ADDRESS" -#~ msgstr "نشانی" - -#~ msgid "Connection type to return in response to xdm" -#~ msgstr "نوع اتصال که در پاسخ به xdm بازگردانده می‌شود" - -#~ msgid "TYPE" -#~ msgstr "نوع" - -#~ msgid "" -#~ "The chooser version (%s) does not match the daemon version (%s). You " -#~ "have probably just upgraded GDM. Please restart the GDM daemon or the " -#~ "computer." -#~ msgstr "" -#~ "نسخهٔ انتخاب‌گر (%s) با نسخهٔ شبح (%s) مطابقت ندارد. احتمالاً شما همین الان " -#~ "GDM را ارتقا داده‌اید. لطفاً شبح GDM یا رایانه را مجدداً راه‌اندازی کنید." - -#~ msgid "Cannot run chooser" -#~ msgstr "نمی‌توان انتخاب‌گر را اجرا کرد" - -#~ msgid "A_dd host: " -#~ msgstr "ا_ضافه کردن میزبان: " - -#~ msgid "C_onnect" -#~ msgstr "ات_صال" - -#~ msgid "Exit the application" -#~ msgstr "خروج از برنامه" - -#~ msgid "Login Host Chooser" -#~ msgstr "انتخاب‌گر میزبان ورود به سیستم" - -#~ msgid "Open a session to the selected host" -#~ msgstr "باز کردن یک نشست به میزبان انتخاب‌شده" - -#~ msgid "Probe the network" -#~ msgstr "کاوش شبکه" - -#~ msgid "Query and add this host to the above list" -#~ msgstr "پرس‌وجو و اضافه کردن این میزبان به فهرست بالا" - -#~ msgid "Status" -#~ msgstr "وضعیت" - -#~ msgid "_Add" -#~ msgstr "ا_ضافه کردن" - -#~ msgid "" -#~ "You might in fact be using a different display manager, such as KDM (KDE " -#~ "Display Manager) or xdm. If you still wish to use this feature, either " -#~ "start GDM yourself or ask your system administrator to start GDM." -#~ msgstr "" -#~ "شاید شما از یک کدیر نمایش دیگر مثل KDM (مدیر نمایش KDE) استفاده می‌کنید. " -#~ "اگر با این وجود می‌خواهید از این امکانات استفاده کنید، خودتان GDM را " -#~ "راه‌اندازی کنید یا این که از مدیر سیستم خود بخواهید که GDM را راه‌اندازی " -#~ "کند." - -#~ msgid "Cannot communicate with GDM (The GNOME Display Manager)" -#~ msgstr "نمی‌توان با GDM تماس برقرار کرد (مدیر نمایش گنوم)" - -#~ msgid "Perhaps you have an old version of GDM running." -#~ msgstr "شاید نسخه‌ای قدیمی از GDM در حال اجراست." - -#~ msgid "" -#~ "Cannot communicate with GDM. Perhaps you have an old version running." -#~ msgstr "نمی‌توان با GDM تماس برقرار کرد، شاید نسخه‌ای قدیمی در حال اجراست." - -#~ msgid "The allowed limit of flexible X servers reached." -#~ msgstr "حد مجاز کارگزارهای انعطاف‌پذیر X سر رسید." - -#~ msgid "There were errors trying to start the X server." -#~ msgstr "هنگام تلاش برای آغاز کارگزار X خطاهایی رخ داد." - -#~ msgid "The X server failed. Perhaps it is not configured well." -#~ msgstr "کارگزار X شکست خورد. احتمالاً درست پیکربندی نشده است." - -#~ msgid "Too many X sessions running." -#~ msgstr "تعداد نشست‌های X در حال اجرا زیاد است." - -#~ msgid "" -#~ "The nested X server (Xnest) cannot connect to your current X server. You " -#~ "may be missing an X authorization file." -#~ msgstr "" -#~ "برقراری اتصال کارگزار X تودرتو (Xnest) با کارگزار X فعلی ممکن نیست. ممکن " -#~ "است شما یک پروندهٔ اعطای اختیار کم داشته باشید." - -#~ msgid "" -#~ "The nested X server (Xnest) is not available, or GDM is badly " -#~ "configured.\n" -#~ "Please install the Xnest package in order to use the nested login." -#~ msgstr "" -#~ "کارگزار X تودرتو (Xnest) وجود ندارد یا GDM درست پیکربندی نشده است.\n" -#~ "لطفاً برای استفاده از ورود به سیستم تودرتو بستهٔ Xnest را نصب کنید" - -#~ msgid "The X server is not available. GDM may be misconfigured." -#~ msgstr "کارگزار X وجود ندارد، ممکن است GDM درست پیکربندی نشده باشد." - -#~ msgid "" -#~ "Trying to set an unknown logout action, or trying to set a logout action " -#~ "which is not available." -#~ msgstr "" -#~ "در حال تلاش برای تنظیم یک کنش خروچ از سیستم ناشناخته، یا تلاش برای تنظیم " -#~ "یک کنش خروج از سیستم که موجود نیست." - -#~ msgid "Virtual terminals not supported." -#~ msgstr "پایانهٔ مجازی پشتیبانی نمی‌شود." - -#~ msgid "Trying to change to an invalid virtual terminal number." -#~ msgstr "در حال تلاش برای تغییر شمارهٔ پایانهٔ مجازی نامعتبر." - -#~ msgid "Trying to update an unsupported configuration key." -#~ msgstr "در حال تلاش برای به‌هنگام‌سازی یک کلید پیکربندی پشتیبانی نشده." - -#~ msgid "" -#~ "You do not seem to have the authentication needed for this operation. " -#~ "Perhaps your .Xauthority file is not set up correctly." -#~ msgstr "" -#~ "به نظر نمی‌آید شما اجازه‌های لازم برای این عملیات را داشته باشید. شاید " -#~ "پروندهٔ ‎.Xauthority شما درست برپاسازی نشده است." - -#~ msgid "Too many messages were sent to GDM and it hung up on us." -#~ msgstr "" -#~ "تعداد پیغام‌های ارسالی به GDM آن قدر زیاد بود که دیگر به ما جواب نمی‌دهد." - -#~ msgid "%d second" -#~ msgid_plural "%d seconds" -#~ msgstr[0] "%Id ثانیه" - -#~ msgid "Usage: %s [-b][-v] and one of the following:\n" -#~ msgstr "Usage: %s [-b][-v] and one of the following:\n" - -#~ msgid "\t-a display\n" -#~ msgstr "\t-a display\n" - -#~ msgid "\t-r display\n" -#~ msgstr "\t-r display\n" - -#~ msgid "\t-d display\n" -#~ msgstr "\t-d display\n" - -#~ msgid "\t-l [server_name]\n" -#~ msgstr "\t-l [server_name]\n" - -#~ msgid "\t-t maximum tries to connect (default 15)\n" -#~ msgstr "\t-t maximum tries to connect (default 15)\n" - -#~ msgid "\t-s sleep value (default 8)\n" -#~ msgstr "\t-s sleep value (default 8)\n" - -#~ msgid "Server busy, will sleep.\n" -#~ msgstr "Server busy, will sleep.\n" - -#~ msgid "" -#~ "Connection to daemon failed, sleeping for %d seconds. Retry %d of %d\n" -#~ msgstr "" -#~ "Connection to daemon failed, sleeping for %d seconds. Retry %d of %d\n" - -#~ msgid "Failed to connect to server after %d retries\n" -#~ msgstr "Failed to connect to server after %d retries\n" - -#~ msgid "Log in as another user inside a nested window" -#~ msgstr "ورود به سیستم به عنوان یک کاربر دیگر در یک پنجرهٔ تودرتو" - -#~ msgid "New Login in a Nested Window" -#~ msgstr "ورود جدید به سیستم در یک پنجرهٔ تودرتو" - -#~ msgid "Cannot change display" -#~ msgstr "نمی‌توان نمایش را تغییر داد" - -#~ msgid "Nobody" -#~ msgstr "هیچ‌کس" - -#~ msgid "Display %s on virtual terminal %d" -#~ msgstr "نمایش %s روی پایانهٔ مجازی %Id" - -#~ msgid "Nested display %s on virtual terminal %d" -#~ msgstr "صفحه نمایش تودرتوی %s روی پایانهٔ مجازی %Id" - -#~ msgid "Open Displays" -#~ msgstr "باز کردن نمایش‌ها" - -#~ msgid "_Open New Display" -#~ msgstr "_باز کردن نمایش جدید" - -#~ msgid "Change to _Existing Display" -#~ msgstr "تعویض به نمایش _موجود" - -#~ msgid "" -#~ "There are some displays already open. You can select one from the list " -#~ "below or open a new one." -#~ msgstr "" -#~ "تعدادی صفحهٔ نمایش باز است. شما می‌توانید یکی را از فهرست زیر انتخاب کنید " -#~ "یا این که یک نمایش جدید باز کنید." - -#~ msgid "Choose server" -#~ msgstr "انتخاب کارگزار" - -#~ msgid "Choose the X server to start" -#~ msgstr "کارگزار X را برای آغاز انتخاب کنید" - -#~ msgid "Standard server" -#~ msgstr "کارگزار استاندارد" - -#~ msgid "You do not seem to have the authentication needed for this operation" -#~ msgstr "" -#~ "به نظر نمی‌آید شما تأیید اجازه‌های لازم برای این عملیات را داشته باشید" - -#~ msgid "Perhaps your .Xauthority file is not set up correctly." -#~ msgstr "شاید پروندهٔ .Xauthority شما درست برپاسازی نشده باشد." - -#~ msgid "You do not seem to be logged in on the console" -#~ msgstr "به نظر نمی‌آید در پیشانه وارد سیستم شده باشید" - -#~ msgid "Starting a new login only works correctly on the console." -#~ msgstr "آغاز یک نشست ورود جدید به سیستم فقط در یک پیشانه درست عمل می‌کند." - -#~ msgid "Log in as another user without logging out" -#~ msgstr "ورود به سیستم به‌عنوان یک کاربر دیگر بدون خروج از سیستم" - -#~ msgid "A-M|Afrikaans" -#~ msgstr "الف‐س|آفریکانس" - -#~ msgid "A-M|Albanian" -#~ msgstr "الف‐س|آلبانیایی" - -#~ msgid "A-M|Amharic" -#~ msgstr "الف‐س|امهری" - -#~ msgid "A-M|Arabic (Egypt)" -#~ msgstr "ش‐ی|عربی (مصر)" - -#~ msgid "A-M|Arabic (Lebanon)" -#~ msgstr "ش‐ی|عربی (لبنان)" - -#~ msgid "A-M|Armenian" -#~ msgstr "الف‐س|ارمنی" - -#~ msgid "A-M|Azerbaijani" -#~ msgstr "الف‐س|آذربایجانی" - -#~ msgid "A-M|Basque" -#~ msgstr "الف‐س|باسکی" - -#~ msgid "A-M|Belarusian" -#~ msgstr "الف‐س|بلوروسی" - -#~ msgid "A-M|Bengali" -#~ msgstr "الف‐س|بنگالی" - -#~ msgid "A-M|Bengali (India)" -#~ msgstr "الف‐س|بنگالی (هند)" - -#~ msgid "A-M|Bulgarian" -#~ msgstr "الف‐س|بلغاری" - -#~ msgid "A-M|Bosnian" -#~ msgstr "الف‐س|بوسنیایی" - -#~ msgid "A-M|Catalan" -#~ msgstr "ش‐ی|کاتالونیایی" - -#~ msgid "A-M|Chinese (China Mainland)" -#~ msgstr "الف‐س|چینی (سرزمین اصلی)" - -#~ msgid "A-M|Chinese (Hong Kong)" -#~ msgstr "الف‐س|چینی (هنگ‌کنگ)" - -#~ msgid "A-M|Chinese (Singapore)" -#~ msgstr "الف‐س|چینی (سنگاپور)" - -#~ msgid "A-M|Chinese (Taiwan)" -#~ msgstr "الف‐س|چینی (تایوان)" - -#~ msgid "A-M|Croatian" -#~ msgstr "ش‐ی|کرواتی" - -#~ msgid "A-M|Czech" -#~ msgstr "الف‐س|چکی" - -#~ msgid "A-M|Danish" -#~ msgstr "الف‐س|دانمارکی" - -#~ msgid "A-M|Dutch" -#~ msgstr "ش‐ی|هلندی" - -#~ msgid "A-M|English (USA)" -#~ msgstr "الف‐س|انگلیسی(ایالات متحده)" - -#~ msgid "A-M|English (Australia)" -#~ msgstr "الف‐س|انگلیسی (استرالیا)" - -#~ msgid "A-M|English (UK)" -#~ msgstr "الف‐س|انگلیسی(بریتانیا)" - -#~ msgid "A-M|English (Canada)" -#~ msgstr "الف‐س|انگلیسی (کانادا)" - -#~ msgid "A-M|English (Ireland)" -#~ msgstr "الف‐س|انگلیسی (ایرلند)" - -#~ msgid "A-M|English (Denmark)" -#~ msgstr "الف‐س|انگلیسی (دانمارک)" - -#~ msgid "A-M|English (South Africa)" -#~ msgstr "الف‐س|انگلیسی (آفریقای جنوبی)" - -#~ msgid "A-M|Estonian" -#~ msgstr "الف‐س|استونیایی" - -#~ msgid "A-M|Finnish" -#~ msgstr "ش‐ی|فنلاندی" - -#~ msgid "A-M|French" -#~ msgstr "ش‐ی|فرانسوی" - -#~ msgid "A-M|French (Belgium)" -#~ msgstr "ش‐ی|فرانسوی(بلژیک)" - -#~ msgid "A-M|French (Switzerland)" -#~ msgstr "الف‐س|فرانسوی(سوئیس)" - -#~ msgid "A-M|Galician" -#~ msgstr "الف‐س|گالیسیایی" - -#~ msgid "A-M|German" -#~ msgstr "الف‐س|آلمانی" - -#~ msgid "A-M|German (Austria)" -#~ msgstr "الف‐س|آلمانی (اتریش)" - -#~ msgid "A-M|German (Switzerland)" -#~ msgstr "الف‐س|آلمانی (سوئیس)" - -#~ msgid "A-M|Greek" -#~ msgstr "ش‐ی|یونانی" - -#~ msgid "A-M|Gujarati" -#~ msgstr "ش‐ی|گجراتی" - -#~ msgid "A-M|Hebrew" -#~ msgstr "ش‐ی|عبری" - -#~ msgid "A-M|Hindi" -#~ msgstr "ش‐ی|هندی" - -#~ msgid "A-M|Hungarian" -#~ msgstr "ش‐ی|مجاری" - -#~ msgid "A-M|Icelandic" -#~ msgstr "الف‐س|ایسلندی" - -#~ msgid "A-M|Indonesian" -#~ msgstr "الف‐س|اندونزیایی" - -#~ msgid "A-M|Interlingua" -#~ msgstr "ش‐ی|میان‌زبان" - -#~ msgid "A-M|Irish" -#~ msgstr "الف‐س|ایرلندی" - -#~ msgid "A-M|Italian" -#~ msgstr "الف‐س|ایتالیایی" - -#~ msgid "A-M|Japanese" -#~ msgstr "الف‐س|ژاپنی" - -#~ msgid "A-M|Kannada" -#~ msgstr "ش‐ی|کناده‌ای" - -#~ msgid "A-M|Kinyarwanda" -#~ msgstr "ش‐ی|کینیارواندایی" - -#~ msgid "A-M|Korean" -#~ msgstr "ش‐ی|کره‌ای" - -#~ msgid "A-M|Latvian" -#~ msgstr "ش‐ی|لتونیایی" - -#~ msgid "A-M|Lithuanian" -#~ msgstr "ش‐ی|لیتوانیایی" - -#~ msgid "A-M|Macedonian" -#~ msgstr "ش‐ی|مقدونی" - -#~ msgid "A-M|Malay" -#~ msgstr "ش‐ی|مالزیایی" - -#~ msgid "A-M|Malayalam" -#~ msgstr "ش‐ی|مالایالی" - -#~ msgid "A-M|Marathi" -#~ msgstr "ش‐ی|مهاراتی" - -#~ msgid "A-M|Mongolian" -#~ msgstr "ش‐ی|مغولی" - -#~ msgid "N-Z|Northern Sotho" -#~ msgstr "ش‐ی|سوتویی شمالی" - -#~ msgid "N-Z|Norwegian (bokmal)" -#~ msgstr "ش‐ی|نروژی (بوکسمال)" - -#~ msgid "N-Z|Norwegian (nynorsk)" -#~ msgstr "ش‐ی|نروژی (نروژی جدید)" - -#~ msgid "N-Z|Oriya" -#~ msgstr "الف‐س|اوریا" - -#~ msgid "N-Z|Panjabi" -#~ msgstr "الف‐س|پنجابی" - -#~ msgid "N-Z|Persian" -#~ msgstr "ش‐ی|فارسی" - -#~ msgid "N-Z|Polish" -#~ msgstr "ش‐ی|لهستانی" - -#~ msgid "N-Z|Portuguese" -#~ msgstr "الف‐س|پرتغالی" - -#~ msgid "N-Z|Portuguese (Brazilian)" -#~ msgstr "الف‐س|پرتغالی (برزیلی)" - -#~ msgid "N-Z|Romanian" -#~ msgstr "الف‐س|رومانیایی" - -#~ msgid "N-Z|Russian" -#~ msgstr "الف‐س|روسی" - -#~ msgid "N-Z|Serbian" -#~ msgstr "ش‐ی|صربی" - -#~ msgid "N-Z|Serbian (Latin)" -#~ msgstr "ش‐ی|صربی(لاتینی)" - -#~ msgid "N-Z|Serbian (Jekavian)" -#~ msgstr "ش‐ی|صربی (" - -#~ msgid "N-Z|Slovak" -#~ msgstr "الف‐س|اسلواکی" - -#~ msgid "N-Z|Slovenian" -#~ msgstr "الف‐س|اسلووینیایی" - -#~ msgid "N-Z|Spanish" -#~ msgstr "الف‐س|اسپانیایی" - -#~ msgid "N-Z|Spanish (Mexico)" -#~ msgstr "الف‐س|اسپانیایی (مکزیک)" - -#~ msgid "N-Z|Swedish" -#~ msgstr "الف‐س|سوئدی" - -#~ msgid "N-Z|Swedish (Finland)" -#~ msgstr "الف‐س|سوئدی (فنلاند)" - -#~ msgid "N-Z|Tamil" -#~ msgstr "الف‐س|تامیلی" - -#~ msgid "N-Z|Telugu" -#~ msgstr "الف‐س|تلوگویی" - -#~ msgid "N-Z|Thai" -#~ msgstr "الف‐س|تایلندی" - -#~ msgid "N-Z|Turkish" -#~ msgstr "الف‐س|ترکی" - -#~ msgid "N-Z|Ukrainian" -#~ msgstr "الف‐س|اوکراینی" - -#~ msgid "N-Z|Vietnamese" -#~ msgstr "ش‐ی|ویتنامی" - -#~ msgid "N-Z|Walloon" -#~ msgstr "ش‐ی|والونی" - -#~ msgid "N-Z|Welsh" -#~ msgstr "ش‐ی|ویلزی" - -#~ msgid "N-Z|Yiddish" -#~ msgstr "ش‐ی|یدی" - -#~ msgid "N-Z|Zulu" -#~ msgstr "الف‐س|زولویی" - -#~ msgid "Other|POSIX/C English" -#~ msgstr "غیره|انگلیسی POSIC/C" - -#~ msgid "A-M" -#~ msgstr "الف‐س" - -#~ msgid "N-Z" -#~ msgstr "ش‐ی" - -#~ msgid "Cannot run command '%s': %s." -#~ msgstr "نمی‌توان فرمان «%s» را اجرا کرد: %s." - -#~ msgid "Cannot start background application" -#~ msgstr "نمی‌توان برنامهٔ پس‌زمینه را آغاز کرد" - -#~ msgid "User %u will login in %t" -#~ msgstr "کاربر %u در عرض %t ثانیه وارد سیستم می‌شود" - -#~ msgid "Are you sure you want to restart the computer?" -#~ msgstr "آیا مطمئنید که می‌خواهید رایانه را مجدداً راه‌اندازی کنید؟" - -#~ msgid "_Restart" -#~ msgstr "_راه‌اندازی مجدد" - -#~ msgid "Are you sure you want to Shut Down the computer?" -#~ msgstr "آیا مطمئنید که می‌خواهید رایانه را خاموش کنید؟" - -#~ msgid "Are you sure you want to suspend the computer?" -#~ msgstr "آیا مطمئنید که می‌خواهید رایانه را به حالت تعیلق در‌آورید؟" - -#~ msgid "System Default" -#~ msgstr "پیش‌فرض سیستم" - -#~ msgid "Do you wish to make %s the default for future sessions?" -#~ msgstr "آیا می‌خواهید که %s پیش‌فرض نشست‌های بعدی شما قرار گیرد؟" - -#~ msgid "You have chosen %s for this session, but your default setting is %s." -#~ msgstr "شما %s را برای این نشست انتخاب کردید، ولی پیش‌فرض شما %s است." - -#~ msgid "Make _Default" -#~ msgstr "_قرار دادن به عنوان پیش‌فرض" - -#~ msgid "Just For _This Session" -#~ msgstr "فقط برای _این تشست" - -#~ msgid "_Username:" -#~ msgstr "_نام کاربر:" - -#~ msgid "%s session selected" -#~ msgstr "نشست %s انتخاب شد" - -#~ msgid "_Last" -#~ msgstr "آ_خرین" - -#~ msgid "%s language selected" -#~ msgstr "زبان %s انتخاب شد" - -#~ msgid "_System Default" -#~ msgstr "پیش‌فرض _سیستم" - -#~ msgid "_Password:" -#~ msgstr "_گذرواژه:" - -#~ msgid "Please insert 25 cents to log in." -#~ msgstr "برای ورود به سیستم لطفاً دو سکهٔ ۵۰ تومانی بیاندازید." - -#~ msgid "Finger" -#~ msgstr "‏Finger" - -#~ msgid "GDM Login" -#~ msgstr "ورود به سیستم GDM" - -#~ msgid "_Configure Login Manager..." -#~ msgstr "_پیکربندی مدیر ورود به سیستم..." - -#~ msgid "_Actions" -#~ msgstr "کن_ش‌ها" - -#~ msgid "_Theme" -#~ msgstr "_تم" - -#~ msgid "_Quit" -#~ msgstr "_ترک" - -#~ msgid "D_isconnect" -#~ msgstr "_قطع اتصال" - -#~ msgid "Welcome" -#~ msgstr "خوش آمدید" - -#~ msgid "" -#~ "The greeter version (%s) does not match the daemon version. You have " -#~ "probably just upgraded GDM. Please restart the GDM daemon or the computer." -#~ msgstr "" -#~ "نسخهٔ خوش‌آمدگو (%s) با نسخهٔ شبح مطابقت ندارد. احتمالاً شما همین الان GDM را " -#~ "ارتقا داده‌اید. لطفاً شبح GDM یا رایانه را مجدداً راه‌اندازی کنید." - -#~ msgid "Cannot start the greeter" -#~ msgstr "نمی‌توان خوش‌آمدگو را آغاز کرد" - -#~ msgid "" -#~ "The greeter version (%s) does not match the daemon version (%s). You " -#~ "have probably just upgraded GDM. Please restart the GDM daemon or the " -#~ "computer." -#~ msgstr "" -#~ "نسخهٔ خوش‌آمدگو (%s) با نسخهٔ شبح (%s) مطابقت ندارد. احتمالاً شما همین الان " -#~ "GDM را ارتقا داده‌اید. لطفاً شبح GDM یا رایانه را مجدداً راه‌اندازی کنید." - -#~ msgid "Restart GDM" -#~ msgstr "راه‌اندازی مجدد GDM" - -#~ msgid "Restart computer" -#~ msgstr "راه‌اندازی مجدد رایانه" - -#~ msgid "Could not set signal mask!" -#~ msgstr "نمی‌توان نقاب سیگنال را تنظیم کرد!" - -#~ msgid "Session directory is missing" -#~ msgstr "شاخهٔ نشست گم شده است" - -#~ msgid "" -#~ "Your session directory is missing or empty! There are two available " -#~ "sessions you can use, but you should log in and correct the GDM " -#~ "configuration." -#~ msgstr "" -#~ "شاخهٔ نشست شما گم شده است یا خالی است! در حال حاضر دو نشست برای استفاده " -#~ "موجود است، ولی شما باید وارد سیستم شوید و پیکربندی GDM را اصلاح کنید." - -#~ msgid "Configuration is not correct" -#~ msgstr "پیکربندی صحیح نیست" - -#~ msgid "" -#~ "The configuration file contains an invalid command line for the login " -#~ "dialog, so running the default command. Please fix your configuration." -#~ msgstr "" -#~ "پروندهٔ پیکربندی حاوی یک سطر فرمان نامعتبر برای محاورهٔ ورود به سیستم است، " -#~ "بنابراین فرمان پیش‌فرض اجرا می‌شود. لطفاً پیکربندی خود را ترمیم کنید." - -#~ msgid "File %s cannot be opened for writing." -#~ msgstr "نمی‌توان پروندهٔ %s را برای نوشتن باز کرد." - -#~ msgid "Cannot open file" -#~ msgstr "نمی‌توان پرونده را باز کرد" - -#~ msgid "Images" -#~ msgstr "تصاویر" - -#~ msgid "All Files" -#~ msgstr "همهٔ پرونده‌ها" - -#~ msgid "" -#~ "Change the picture that will show in the GDM (login manager) face browser" -#~ msgstr "" -#~ "تغییر عکسی که در مرورگر چهرهٔ GDM (مدیر ورود به سیستم) نشان داده می‌شود" - -#~ msgid "Login Photo" -#~ msgstr "عکس ورود به سیستم" - -#~ msgid "User Image" -#~ msgstr "تصویر کاربر" - -#~ msgid "Failsafe _GNOME" -#~ msgstr "_گنوم محافظ‌دار" - -#~ msgid "" -#~ "This is a failsafe session that will log you into GNOME. No startup " -#~ "scripts will be read and it is only to be used when you can't log in " -#~ "otherwise. GNOME will use the 'Default' session." -#~ msgstr "" -#~ "این یک نشست محافظ‌دار است که شما را وارد گنوم می‌کند. هیچ کدنوشتهٔ " -#~ "راه‌اندازی‌ای خوانده نخواهد شد و این نشست فقط در حالتی استفاده می‌شود که شما " -#~ "نتوانید به طریق دیگر وارد سیستم شوید. گنوم از نشست پیش‌فرض استفاده خواهد " -#~ "کرد." - -#~ msgid "Failsafe _Terminal" -#~ msgstr "_پایانهٔ محافظ‌دار" - -#~ msgid "" -#~ "This is a failsafe session that will log you into a terminal. No startup " -#~ "scripts will be read and it is only to be used when you can't log in " -#~ "otherwise. To exit the terminal, type 'exit'." -#~ msgstr "" -#~ "این یک نشست محافظ‌دار است که شما را وارد یک پایانه می‌کند. هیچ کدنوشتهٔ " -#~ "راه‌اندازی‌ای خوانده نخواهد شد و این نشست فقط در حالتی استفاده می‌شود که شما " -#~ "نتوانید به طریق دیگر وارد سیستم شوید. گنوم از نشست پیش‌فرض استفاده خواهد " -#~ "کرد." - -#~ msgid "Your preferred session type %s is not installed on this computer." -#~ msgstr "نوع نشست مرجح شما %s روی این رایانه نصب نشده است." - -# ,c-format -#~ msgid "" -#~ "If you wish to make %s the default for future sessions, run the " -#~ "'switchdesk' utility (System->Desktop Switching Tool from the panel menu)." -#~ msgstr "" -#~ "اگر می‌خواهید %s برای نشست‌های بعدی پیش‌فرض قرار داده شود، برنامهٔ " -#~ "«switchdesk» را اجرا کنید (سیستم->ابزار تعویض رومیزی از منوی تابلو)." - -#~ msgid "" -#~ "An error occurred while trying to contact the login screens. Not all " -#~ "updates may have taken effect." -#~ msgstr "" -#~ "An error occurred while trying to contact the login screens. Not all " -#~ "updates may have taken effect." - -#~ msgid "Themed" -#~ msgstr "دارای تم" - -#~ msgid "Plain" -#~ msgstr "ساده" - -#~ msgid "Plain with face browser" -#~ msgstr "ساده با مرورگر چهره" - -#~ msgid "Autologin or timed login to the root account is not allowed." -#~ msgstr "ورود خودکار یا مدت‌دار به حساب root مجاز نیست." - -#~ msgid "The \"%s\" user already exists in the include list." -#~ msgstr "کاربر «%s» قبلاً در فهرست وجود دارد." - -#~ msgid "Cannot add user" -#~ msgstr "نمی‌توان کاربر را اضافه کرد" - -#~ msgid "The \"%s\" user already exists in the exclude list." -#~ msgstr "کاربر «%s» از قبل در فهرست وجود دارد." - -#~ msgid "The \"%s\" user does not exist." -#~ msgstr "کاربر «%s» وجود ندارد." - -#~ msgid "Sounds" -#~ msgstr "صداها" - -#~ msgid "None" -#~ msgstr "هیچ‌کدام" - -#~ msgid "Archive is not of a subdirectory" -#~ msgstr "آرشیو متعلق به یک زیرشاخه نیست" - -#~ msgid "Archive is not of a single subdirectory" -#~ msgstr "آرشیو متعلق به یک زیرشاخهٔ تکی نیست" - -#~ msgid "File not a tar.gz or tar archive" -#~ msgstr "پرونده یک آرشیو tar.gz یا tar نیست" - -#~ msgid "Archive does not include a GdmGreeterTheme.info file" -#~ msgstr "آرشیو حاوی پروندهٔ GdmGreeterTheme.info نیست" - -#~ msgid "File does not exist" -#~ msgstr "پرونده وجود ندارد" - -#~ msgid "Not a theme archive" -#~ msgstr "یک آرشیو تم نیست" - -#~ msgid "" -#~ "Theme directory '%s' seems to be already installed. Install again anyway?" -#~ msgstr "" -#~ "به نظر می‌آید شاخهٔ تم «%s» قبلاً نصب شده است. با این وجود دوباره نصب شود؟" - -#~ msgid "Some error occurred when installing the theme" -#~ msgstr "هنگام نصب تم خطایی رخ داد" - -#~ msgid "No file selected" -#~ msgstr "پرونده‌ای انتخاب نشد" - -#~ msgid "Select Theme Archive" -#~ msgstr "آرشیو تم را انتخاب کنید" - -#~ msgid "_Install" -#~ msgstr "ن_صب" - -#~ msgid "Remove the \"%s\" theme?" -#~ msgstr "تم «%s» حذف شود؟" - -#~ msgid "If you choose to remove the theme, it will be permanently lost." -#~ msgstr "اگر تم را حذف کنید، برای همیشه آن را از دست خواهید داد." - -#~ msgid "_Remove Theme" -#~ msgstr "_حذف تم" - -#~ msgid "Install the theme from '%s'?" -#~ msgstr "تم جدید از «%s» نصب شود؟" - -#~ msgid "Select install to add the theme from the file '%s'." -#~ msgstr "برای اضافه کردن تم از پروندهٔ «%s» نصب را انتخاب کنید." - -# ,c-format -#~ msgid "" -#~ "This configuration window changes settings for the GDM daemon, which is " -#~ "the graphical login screen for GNOME. Changes that you make will take " -#~ "effect immediately.\n" -#~ "\n" -#~ "Note that not all configuration options are listed here. You may want to " -#~ "edit %s if you cannot find what you are looking for.\n" -#~ "\n" -#~ "For complete documentation see the GNOME help browser under the \"Desktop" -#~ "\" category." -#~ msgstr "" -#~ "این پنجرهٔ پیکربندی تنظیمات شبح GDM را تغییر می‌دهد، که صفحهٔ گرافیکی ورود " -#~ "به سیستم برای گنوم است. تغییراتی که ایجاد می‌کنید بلافاصله اثر خواهند " -#~ "کرد.\n" -#~ "\n" -#~ "توجه داشته باشید که همهٔ گزینه‌های پیکربندی اینجا فهرست نشده‌اند. اگر چیزی " -#~ "را که دنبال آن هستید پیدا نکردید، می‌توانید %s را ویرایش کنید.\n" -#~ "\n" -#~ "برای دستیابی به مستندات کامل مرورگر راهنمای گنوم تحت مقولهٔ «رومیزی» را " -#~ "ببینید." - -#~ msgid "Apply the changes to users before closing?" -#~ msgstr "پیش از بستن تغییرات کاربر اِعمال شود؟" - -#~ msgid "" -#~ "If you don't apply, the changes made on the Users tab will be disregarded." -#~ msgstr "" -#~ "اگر اِعمال نکنید، تغییرات داده شده در زبانهٔ کاربران نادیده گرفته خواهد شد." - -#~ msgid "Close _without Applying" -#~ msgstr "بستن ب_دون اِعمال" - -#~ msgid "Could not access GDM configuration file.\n" -#~ msgstr "دسترسی به پروندهٔ پیکربندی GDM ممکن نیست.\n" - -#~ msgid "You must be the root user to configure GDM." -#~ msgstr "برای پیکربندی GDM باید کاربر root باشید." - -#~ msgid "Configure the login window (GNOME Display Manager)" -#~ msgstr "پیکربندی صفحهٔ نمایش ورود به سیستم (مدیر نمایش گنوم)" - -#~ msgid "Login Window Preferences" -#~ msgstr "ترجیحات پنجرهٔ ورود به سیستم" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "A_dd..." -#~ msgstr "ا_ضافه کردن..." - -#~ msgid "A_llow remote system administrator login" -#~ msgstr "م_جاز بودن ورود مدیر به سیستم از دورست" - -#~ msgid "A_pply User Changes" -#~ msgstr "اِ_عمال تغییرات کاربر" - -#~ msgid "Add / Modify Servers To Start" -#~ msgstr "اضافه کردن/تغییر دادن کارگزارهایی که آغاز شوند" - -#~ msgid "Add S_erver..." -#~ msgstr "اضافه کردن کارگزار..." - -#~ msgid "Add User" -#~ msgstr "اضافه کردن کاربر" - -#~ msgid "Allo_w remote timed logins" -#~ msgstr "مجاز بودن ورود به سیستم _مدت‌دار از دورست" - -#~ msgid "Author:" -#~ msgstr "مؤلف:" - -#~ msgid "Background" -#~ msgstr "پس‌زمینه" - -#~ msgid "C_ommand:" -#~ msgstr "_فرمان:" - -#~ msgid "C_ustom:" -#~ msgstr "س_فارشی:" - -#~ msgid "Co_lor:" -#~ msgstr "رنگ_:" - -#~ msgid "Color depth:" -#~ msgstr "عمق رنگ:" - -#~ msgid "Configure _X Server..." -#~ msgstr "_پیکربندی کارگزار X..." - -#~ msgid "Configure _XDMCP..." -#~ msgstr "_پیکربندی XDMCP..." - -#~ msgid "Copyright:" -#~ msgstr "حق نسخه‌برداری:" - -#~ msgid "Displays per _host:" -#~ msgstr "نمایش در _میزبان" - -#~ msgid "E_nable debug messages to system log" -#~ msgstr "به کار انداختن پیغام‌های ا_شکال‌زدایی در ثبت وقایع سیستم" - -#~ msgid "Example: /usr/X11R6/bin/X" -#~ msgstr "مثال: ‎/usr/X11R6/bin/X" - -#~ msgid "Honor _indirect requests" -#~ msgstr "توجه به درخواست‌های _غیرمستقیم" - -#~ msgid "I_mage:" -#~ msgstr "ت_صویر:" - -#~ msgid "L_ogin retry delay:" -#~ msgstr "تأ_خیر تلاش مجدد برای ورود به سیستم:" - -#~ msgid "La_unch:" -#~ msgstr "_راه‌اندازی:" - -#~ msgid "Listen on _UDP port: " -#~ msgstr "_گوش دادن به درگاه UDP: " - -#~ msgid "Local" -#~ msgstr "محلی " - -#~ msgid "Login _failed:" -#~ msgstr "ورودهای شکست خورده به سیستم:" - -#~ msgid "Login _successful:" -#~ msgstr "ورودهای موفق به سیستم:" - -#~ msgid "Logo" -#~ msgstr "نشان" - -#~ msgid "Maximum _pending requests:" -#~ msgstr "حداکثر درخواست‌های مع_لق:" - -#~ msgid "Maximum _remote sessions:" -#~ msgstr "حداکثر نشست‌های _دوردست:" - -#~ msgid "Maximum _wait time:" -#~ msgstr "حداکثر زمان _انتظار:" - -#~ msgid "Maximum indirect w_ait time:" -#~ msgstr "حداکثر زمان ا_نتظار غیرمستقیم:" - -#~ msgid "Maximum p_ending indirect requests:" -#~ msgstr "حداکثر تعداد درخواست‌های نامستقیم م_علق:" - -#~ msgid "Menu Bar" -#~ msgstr "نوار منو" - -#~ msgid "Op_tions:\t" -#~ msgstr "_گزینه‌ها:\t" - -#~ msgid "Pick Background Color" -#~ msgstr "رنگ پس‌زمینه را انتخاب کنید" - -#~ msgid "Pin_g interval:" -#~ msgstr "با_زهٔ زمانی ping:" - -#~ msgid "R_emove" -#~ msgstr "_حذف " - -#~ msgid "Re_move Server" -#~ msgstr "ح_ذف کارگزار" - -#~ msgid "Refresh rate:" -#~ msgstr "آهنگ نوسازی:" - -#~ msgid "Remote" -#~ msgstr "دوردست" - -#~ msgid "Resolution:" -#~ msgstr "تفکیک‌پذیری:" - -#~ msgid "Security" -#~ msgstr "امنیت" - -#~ msgid "Select Background Image" -#~ msgstr "تصویر پس‌زمینه را انتخاب کنید" - -#~ msgid "Select Logo Image" -#~ msgstr "تصویرِ نشان را کنید" - -#~ msgid "Select Sound File" -#~ msgstr "پروندهٔ صوتی را انتخاب کنید" - -#~ msgid "Server Settings" -#~ msgstr "تنظیمات کارگزار" - -#~ msgid "Server _name:" -#~ msgstr "_نام کارگزار:" - -#~ msgid "Servers To Start" -#~ msgstr "کارگزارهایی که آغاز شوند" - -#~ msgid "Sho_w Actions menu" -#~ msgstr "نشان دادن منوی _کنش‌ها" - -#~ msgid "Themes" -#~ msgstr "_تم‌ها" - -#~ msgid "U_ser:" -#~ msgstr "_کاربر:" - -#~ msgid "Welcome Message" -#~ msgstr "پیغام خوش‌آمدگویی" - -#~ msgid "_Add..." -#~ msgstr "ا_ضافه کردن..." - -#~ msgid "_Add/Modify..." -#~ msgstr "ا_ضافه کردن/تغییر دادن ..." - -#~ msgid "_Background color:" -#~ msgstr "رنگ _پس‌زمینه:" - -#~ msgid "_Default: \"Welcome to %n\"" -#~ msgstr "_پیش‌فرض: «به %n خوش آمدید»" - -#~ msgid "_Default: \"Welcome\"" -#~ msgstr "_پیش‌فرض: «خوش آمدید»" - -#~ msgid "_Deny TCP connections to Xserver" -#~ msgstr "_رد اتصالات TCP به کارگزار X" - -#~ msgid "_Enable Automatic Login" -#~ msgstr "به کار انداختن ورود خودکار به سیستم" - -#~ msgid "_Image:" -#~ msgstr "ت_صویر:" - -#~ msgid "_Pause before login:" -#~ msgstr "مدت زمان مکث قبل از ورود به سیستم:" - -#~ msgid "_Remove" -#~ msgstr "_حذف" - -#~ msgid "_Remove..." -#~ msgstr "_حذف..." - -#~ msgid "_Server:" -#~ msgstr "کارگزار:" - -#~ msgid "_Servers:" -#~ msgstr "_کارگزارهای:" - -#~ msgid "_Style:" -#~ msgstr "_سبک:" - -#~ msgid "_Theme:" -#~ msgstr "_تم:" - -#~ msgid "_User:" -#~ msgstr "_نام کاربر:" - -#~ msgid "dummy" -#~ msgstr "ساختگی" - -#~ msgid "seconds" -#~ msgstr "ثانیه" - -#~ msgid "Too many users to list here..." -#~ msgstr "تعداد کاربران بیش از آن است که در اینجا فهرست شوند..." - -#~ msgid "Restart Machine" -#~ msgstr "راه‌اندازی مجدد رایانه" - -#~ msgid "There was an error loading the theme %s" -#~ msgstr "هنگام بارکردن تم %s خطایی رخ داد" - -#~ msgid "The greeter theme is corrupt" -#~ msgstr "تم خوش‌آمدگوی گرافیکی مخدوش است" - -#~ msgid "" -#~ "The theme does not contain definition for the username/password entry " -#~ "element." -#~ msgstr "تم فاقد تعریف برای عناصر ورودی نام کاربر/گذرواژه است." - -#~ msgid "" -#~ "There was an error loading the theme, and the default theme could not be " -#~ "loaded. Attempting to start the standard greeter" -#~ msgstr "" -#~ "هنگام بارکردن تم خطایی رخ داد، و بارکردن تم پیش‌فرض نبز ممکن نیست. تلاش " -#~ "می‌شود که خوش‌آمدگوی استاندارد راه‌اندازی شود" - -#~ msgid "" -#~ "The GTK+ greeter could not be started. This display will abort and you " -#~ "may have to login another way and fix the installation of GDM" -#~ msgstr "" -#~ "راه‌اندازی خوش‌آمدگوی استاندارد ممکن نیست. نمایش قطع خواهد شد و احتمالاً شما " -#~ "مجبور خواهید بود از طریقی دیگر وارد سیستم شوید و نصب GDM را درست کنید" - -#~ msgid "" -#~ "Your session directory is missing or empty! There are two available " -#~ "sessions you can use, but you should log in and correct the gdm " -#~ "configuration." -#~ msgstr "" -#~ "شاخهٔ نشست شما گم شده است یا خالی است! در حال حاضر دو نشست برای استفاده " -#~ "موجود است، ولی شما باید وارد سیستم شوید و پیکربندی gdm را اصلاح کنید." - -#~ msgid "Last Language" -#~ msgstr "_زبان دفعهٔ گذشته" - -#~ msgid "Select a Language" -#~ msgstr "یک زبان انتخاب کنید" - -#~ msgid "Change _Language" -#~ msgstr "ت_غییر زبان" - -#~ msgid "_Select the language for your session to use:" -#~ msgstr "زبانی _برای استفاده در طول نشست انتخاب کنید:" - -#~ msgid "Select _Language..." -#~ msgstr "انتخاب _زبان..." - -#~ msgid "Select _Session..." -#~ msgstr "انتخاب _نشست..." - -#~ msgid "" -#~ "Answer questions here and press Enter when done. For a menu press F10." -#~ msgstr "" -#~ "به سئوالات اینجا پاسخ دهید و در آخر کلید ورود را فشار دهید. برای مشاهدهٔ " -#~ "منو F10 را فشار دهید." - -#~ msgid "Sus_pend" -#~ msgstr "_معلق کردن" - -#~ msgid "Confi_gure" -#~ msgstr "_پیکربندی" - -#~ msgid "Op_tions" -#~ msgstr "_گزینه‌ها" - -#~ msgid "_OK" -#~ msgstr "_تأیید" - -#~ msgid "Change _Session" -#~ msgstr "ت_غییر نشست" - -#~ msgid "Sessions" -#~ msgstr "‌نشست‌ها" - -#~ msgid "_Last session" -#~ msgstr "_نشست گذشته" - -#~ msgid "Log in using the session that you have used last time you logged in" -#~ msgstr "" -#~ "ورود به سیستم با استفاده از نشستی که در آخرین ورود به سیستم به کار بردید" - -#~ msgid "Confi_gure Login Manager..." -#~ msgstr "_پیکربندی مدیر ورود به سیستم..." - -#~ msgid "Shut _down the computer" -#~ msgstr "_خاموش کردن رایانه" - -#~ msgid "Shut Down your computer so that you may turn it off." -#~ msgstr "رایانه‌تان را خاموش کنید تا بتوانید جریان برق آن را قطع کنید." - -#~ msgid "_Restart the computer" -#~ msgstr "_راه‌اندازی مجدد رایانه" - -#~ msgid "Restart your computer" -#~ msgstr "رایانه‌تان را مجدداً راه‌اندازی کنید" - -#~ msgid "Sus_pend the computer" -#~ msgstr "_معلق کردن رایانه" - -#~ msgid "Suspend your computer" -#~ msgstr "رایانهٔ خود را به حالت معلق درآورید" - -#~ msgid "Run _XDMCP chooser" -#~ msgstr "اجرا کردن انتخاب‌گر XDMCP" - -#~ msgid "" -#~ "Run an XDMCP chooser which will allow you to log into available remote " -#~ "computers, if there are any." -#~ msgstr "" -#~ "اجرای انتخاب‌گر XDMCP به شما این امکان را می‌دهد که وارد سیستم رایانه‌های " -#~ "دوردست شوید، البته اگر رایانه‌ای وجود داشته باشد." - -#~ msgid "Confi_gure the login manager" -#~ msgstr "_پیکربندی مدیر ورود به سیستم" - -#~ msgid "" -#~ "Configure GDM (this login manager). This will require the root password." -#~ msgstr "" -#~ "پیکربندی GDM (این مدیر ورود به سیستم). این کار نیاز به گذرواژهٔ root دارد." - -#~ msgid "(c) 2002 Bond, James Bond" -#~ msgstr "(c) 2002 Bond, James Bond" - -#~ msgid "Bond, James Bond" -#~ msgstr "باند، جیمز باند" - -#~ msgid "Circles" -#~ msgstr "دایره‌ها" - -#~ msgid "Theme with blue circles" -#~ msgstr "تمی با دایره‌های آبی" - -#~ msgid "(c) 2002 GNOME" -#~ msgstr "‏(c) 2002 GNOME" - -#~ msgid "GNOME Art variation of Circles with a Face Browser" -#~ msgstr "واریاسیون گنوم آرت از دایره‌ها با یک مرورگر چهره" - -#~ msgid "GNOME Artists" -#~ msgstr "هنرمندان گنوم" - -#~ msgid "Happy GNOME with Browser" -#~ msgstr "گنوم خوشبخت با مرورگر" - -#~ msgid "GNOME Art variation of Circles" -#~ msgstr "واریاسیون گنوم آرت از دایره‌ها" - -#~ msgid "Happy GNOME" -#~ msgstr "گنوم خوشبخت" - -#~ msgid "" -#~ "Error while trying to run (%s)\n" -#~ "which is linked to (%s)" -#~ msgstr "" -#~ "خطا در هنکام تلاش برای اجرای (%s)\n" -#~ "که با (%s) پیوند دارد" - -#~ msgid "Cannot open gestures file: %s" -#~ msgstr "" -#~ "نمی‌توان پروندهٔ ژست‌ها را باز کرد: %s\n" -#~ ")" - -#~ msgid "DMX display to migrate to" -#~ msgstr "نمایش DMX که باید به آن کوچ کرد" - -#~ msgid "DISPLAY" -#~ msgstr "نمایش" - -#~ msgid "Backend display name" -#~ msgstr "نام نمایش پسانه" - -#~ msgid "Xauthority file for destination display" -#~ msgstr "پروندهٔ Xauthority برای نمایش مقصد" - -#~ msgid "AUTHFILE" -#~ msgstr "AUTHFILE" - -#~ msgid "Xauthority file for backend display" -#~ msgstr "پروندهٔ Xauthority برای نمایش پسانه" - -#~ msgid "Failed to open display \"%s\"\n" -#~ msgstr "باز کردن نمایش «%s» شکست خورد\n" - -#~ msgid "- migrate a backend display from one DMX display to another" -#~ msgstr "‐ کوچ دادن یک نمایش پسانه به از یک نمایش DMX به نمایش دیگر" - -#~ msgid "You must specify a destination DMX display using %s\n" -#~ msgstr "باید با استفاده از %s یک نمایش DMX مقصد مشخص کنید\n" - -#~ msgid "You must specify a backend display by using %s\n" -#~ msgstr "باید با استفاده از %s یک نمایش پسانه مشخص کنید\n" - -#~ msgid "DMXAddScreen \"%s\" failed on \"%s\"\n" -#~ msgstr "‏DMXAddScreen ‏«%s» روی «%s» شکست خورد\n" - -#~ msgid "gdmaskpass only runs as root\n" -#~ msgstr "‏gdmaskpass فقط به عنوان root اجرا می‌شود\n" - -#~ msgid "Authentication failure!\n" -#~ msgstr "شکست تأیید هویت!\n" - -#~ msgid "(memory buffer)" -#~ msgstr "(میانگیر حافظه)" - -#~ msgid "" -#~ "An error occurred while loading user interface element %s%s from file %" -#~ "s. Possibly the glade interface description was corrupted. %s cannot " -#~ "continue and will exit now. You should check your installation of %s or " -#~ "reinstall %s." -#~ msgstr "" -#~ "هنگام بار کردن عنصر %s%s واسط کاربر از پروندهٔ %s خطایی رخ داد. احتمالاً " -#~ "شرح واسط glade خراب بوده است. %s نمی‌تواند به کارش ادامه دهد و هم‌اکنون " -#~ "خارج خواهد شد. باید نصب %s را بررسی کرده یا %s را مجدداً نصب کنید." - -#~ msgid "Cannot load user interface" -#~ msgstr "بار کردن واسط کاربر ممکن نیست" - -#~ msgid "" -#~ "Glade file is on crack! Make sure the correct file is installed!\n" -#~ "file: %s widget: %s" -#~ msgstr "" -#~ "پروندهٔ glade خراب است! اطمینان حاصل کنید که پروندهٔ صحیح نصب شده است!\n" -#~ "پرونده: %s ویجت: %s" - -#~ msgid "" -#~ "An error occurred while loading the user interface element %s%s from file " -#~ "%s. CList type widget should have %d column. Possibly the glade interface " -#~ "description was corrupted. %s cannot continue and will exit now. You " -#~ "should check your installation of %s or reinstall %s." -#~ msgid_plural "" -#~ "An error occurred while loading the user interface element %s%s from file " -#~ "%s. CList type widget should have %d columns. Possibly the glade " -#~ "interface description was corrupted. %s cannot continue and will exit " -#~ "now. You should check your installation of %s or reinstall %s." -#~ msgstr[0] "" -#~ "هنگام بار کردن عنصر %s%s واسط کاربر از پروندهٔ %s خطایی رخ داد. ویجت‌های " -#~ "نوع clist باید %Id ستون داشته باشند. احتمالاً شرح واسط glade خراب بوده " -#~ "است. %s نمی‌تواند به کارش ادامه دهد و هم‌اکنون خارج خواهد شد. باید نصب %s " -#~ "را بررسی کرده یا %s را مجدداً نصب کنید." - -#~ msgid "" -#~ "Glade file is on crack! Make sure the correct file is installed!\n" -#~ "file: %s widget: %s expected clist columns: %d" -#~ msgstr "" -#~ "پروندهٔ glade خراب است! اطمینان حاصل کنید که پروندهٔ صحیح نصب شده است!\n" -#~ "پرونده: %s ویجت: %s ستون‌های clist مورد انتظار: %Id" - -#~ msgid "" -#~ "An error occurred while loading the user interface from file %s. " -#~ "Possibly the glade interface description was not found. %s cannot " -#~ "continue and will exit now. You should check your installation of %s or " -#~ "reinstall %s." -#~ msgstr "" -#~ "هنگام بار کردن واسط کاربر از پروندهٔ %s خطایی رخ داد. احتمالاً شرح واسط " -#~ "glade پیدا نشده. %s نمی‌تواند به کارش ادامه دهد و هم‌اکنون خارج خواهد شد. " -#~ "باید نصب %s را بررسی کرده یا %s را مجدداً نصب کنید." - -#~ msgid "No interface could be loaded. This is BAD! (file: %s)" -#~ msgstr "هیج واسطی را نمی‌توان بار کرد. این خیلی بد است! (پرونده: %s)" - -# -#~ msgid "Too many alias levels for a locale; may indicate a loop" -#~ msgstr "" -#~ "سطح‌های اسم مستعار برای شرایط محلی خیلی زیادند، ممکن است به خاطر وجود دور " -#~ "باشد" - -#~ msgid "I will now try to restart the X server again." -#~ msgstr "I will now try to restart the X server again." - -#~ msgid "" -#~ "Would you like me to try to run the mouse configuration program? Note " -#~ "that you will need the root password for this." -#~ msgstr "" -#~ "Would you like me to try to run the mouse configuration program? Note " -#~ "that you will need the root password for this." - -#~ msgid "%s: No configuration file: %s. Using defaults." -#~ msgstr "‏%s: هیچ پروندهٔ پیکربندی‌ای پیدا نشد: %s. از پیش‌فرض‌ها استفاده می‌شود." - -#~ msgid "%s: Root cannot be autologged in, turing off automatic login" -#~ msgstr "" -#~ "%s: Root cannot be logged in automatically, turning off automatic login" - -#~ msgid "%s: Root cannot be autologged in, turing off timed login" -#~ msgstr "%s: Root cannot be autologged in, turing off timed login" - -#~ msgid "%s: TimedLoginDelay less than 5, so I will just use 5." -#~ msgstr "%s: TimedLoginDelay less than 5, so I will just use 5." - -#~ msgid "%s: Display number %d in use! I will use %d" -#~ msgstr "%s: Display number %d in use! I will use %d" - -#~ msgid "" -#~ "I cannot start the X server (your graphical interface). It is likely " -#~ "that it is not set up correctly. You will need to log in on a console and " -#~ "rerun the X configuration program. Then restart GDM." -#~ msgstr "" -#~ "I cannot start the X server (your graphical interface). It is likely " -#~ "that it is not set up correctly. You will need to log in on a console and " -#~ "rerun the X configuration program. Then restart GDM." - -#~ msgid "Master rebooting..." -#~ msgstr "Master rebooting..." - -#~ msgid "" -#~ "Error on option %s: %s.\n" -#~ "Run '%s --help' to see a full list of available command line options.\n" -#~ msgstr "" -#~ "Error on option %s: %s.\n" -#~ "Run '%s --help' to see a full list of available command line options.\n" - -#~ msgid "" -#~ "The session you selected does not look valid. I will run the GNOME " -#~ "failsafe session for you." -#~ msgstr "" -#~ "The session you selected does not look valid. I will run the GNOME " -#~ "failsafe session for you." - -#~ msgid "" -#~ "%s: Cannot find or run the base Xsession script, will try GNOME failsafe" -#~ msgstr "" -#~ "%s: Cannot find or run the base Xsession script, will try GNOME failsafe" - -#~ msgid "Please make sure the Caps Lock key is not enabled." -#~ msgstr "لطفاً مطمئن شوید که کلید قفل تبدیل روشن نیست." - -#~ msgid "" -#~ "Please ask your system administrator to enable it in the GDM configurator " -#~ "program." -#~ msgstr "" -#~ "لطفاً از مدیر سیستم خود بخواهید این امکان را در برنامهٔ پیکربندی gdm به کار " -#~ "بیاندازد." - -#~ msgid "*" -#~ msgstr "*" - -#~ msgid "Can't open default host icon: %s" -#~ msgstr "نمی‌توان شمایل پیش‌فرض میزبان را باز کرد: %s" - -#~ msgid "" -#~ "You might in fact be using a different display manager, such as KDM (KDE " -#~ "Display Manager) or xdm." -#~ msgstr "" -#~ "ممکن است شما در واقع در حال استفاده از مدیر نمایش متفاوتی، نظیر KDM (مدیر " -#~ "نمایش KDE) یا xdm باشید." - -#~ msgid "A-M|Chinese (simplified)" -#~ msgstr "الف‐س|چینی (ساده شده)" - -#~ msgid "A-M|English" -#~ msgstr "الف‐س|انگلیسی" - -#~ msgid "User %s will login in %d seconds" -#~ msgstr "کاربر %s در عرض %Id ثانیه وارد سیستم می‌شود" - -#~ msgid "%s: String too long!" -#~ msgstr "‏%s: رشته خیلی بلند است!" - -#~ msgid "%sWelcome to %s%s" -#~ msgstr "‏%sبه %s خوش‌آمدید%s" - -#~ msgid "Could not fork a new process!" -#~ msgstr "انشعاب فراروند جدید ممکن نیست!" - -#~ msgid "You likely won't be able to log in either." -#~ msgstr "به احتمال زیاد نخواهید توانست وارد سیستم شوید." - -#~ msgid "TimedLoginDelay was less than 5. I'll just use 5." -#~ msgstr "‏TimedLoginDelay کمتر از ۵ بود. از ۵ استفاده می‌شود" - -#~ msgid "Failsafe Gnome" -#~ msgstr "_گنوم محافظ‌دار" - -#~ msgid "Failsafe xterm" -#~ msgstr "پا_یانهٔ X محافظ‌دار" - -#~ msgid "%s: Session directory %s not found!" -#~ msgstr "%s: شاخهٔ نشست %s پیدا نشد!" - -#~ msgid "Yaikes, nothing found in the session directory." -#~ msgstr "Yaikes, nothing found in the session directory." - -#~ msgid "No default session link found. Using Failsafe GNOME.\n" -#~ msgstr "هیچ پیوند نشست پیش‌فرضی پیدا نشد. از گنوم محافظ‌دار استفاده می‌شود.\n" - -#~ msgid "Log in using the language that you have used last time you logged in" -#~ msgstr "" -#~ "ورود به سیستم با استفاده از زبانی که در آخرین ورود به سیستم به کار بردید" - -#~ msgid "Log in using the default system language" -#~ msgstr "ورود به سیستم با استفاده از زبان پیش‌فرض سیستم" - -#~ msgid "Doubleclick on the user to log in" -#~ msgstr "برای ورود به سیستم روی کاربر دوبارکلیک کنید" - -#~ msgid "_XDMCP Chooser..." -#~ msgstr "ا_نتخاب‌گر XDMCP..." - -#~ msgid "Reboot your computer" -#~ msgstr "رایانه‌تان را مجدداً راه‌اندازی کنید" - -#~ msgid "Shut down the system so that you may safely turn off the computer." -#~ msgstr "خاموش کردن سیستم طوری که آسیبی نبیند." - -#~ msgid "Can't open DefaultImage: %s. Suspending face browser!" -#~ msgstr "نمی‌توان تصویر پیش‌فرض را باز کرد: %s. مرورگر چهره معلق می‌شود!" - -#~ msgid "Reboot" -#~ msgstr "راه‌اندازی مجدد" - -#~ msgid "No configuration was found" -#~ msgstr "هیچ پیکربندی‌ای پیدا نشد" - -#~ msgid "" -#~ "The configuration was not found. GDM is using defaults to run this " -#~ "session. You should log in and create a configuration file with the GDM " -#~ "configuration program." -#~ msgstr "" -#~ "پیکربندی پیدا نشد. GDM برای اجرای این نشست از پیش‌فرض‌ها استفاده می‌کند. شما " -#~ "باید وارد سیستم شوید و با استفاده از برنامهٔ پیکربندی GDM یک پروندهٔ " -#~ "پیکربندی ایجاد کنید." - -#~ msgid "The face browser is not configured" -#~ msgstr "مرورگر چهره پیکربندی نشده است" - -#~ msgid "" -#~ "The face browser is not configured in the GDM configuration. Please ask " -#~ "your system administrator to enable it in the GDM configurator program." -#~ msgstr "" -#~ "مرورگر چهره در پیکربندی GDM شما تعریف نشده است. لطفاً از مدیر سیستم‌تان " -#~ "بخواهید آن را در برنامهٔ پیکربندی GDM به کار بیاندازد." - -#~ msgid "Select a photograph to show in the facebrowser:" -#~ msgstr "عکسی برای نشان دادن در مرورگر چهره انتخاب کنید" - -#~ msgid "Browse" -#~ msgstr "مرور" - -#~ msgid "No picture selected." -#~ msgstr "عکسی انتخاب نشده است." - -#~ msgid "Picture is too large" -#~ msgstr "عکس خیلی بزرگ است" - -#~ msgid "" -#~ "The system administrator disallowed pictures larger than %d bytes to show " -#~ "in the face browser" -#~ msgstr "" -#~ "مدیر سیستم نشان دادن عکس‌های بزرگتر از %Id بایت در مرورگر چهره را ممنوع " -#~ "کرده است" - -#~ msgid "" -#~ "File %s cannot be open for reading\n" -#~ "Error: %s" -#~ msgstr "" -#~ "نمی‌توان پروندهٔ %s را برای خواندن باز کرد\n" -#~ "خطا: %s" - -#~ msgid "Greeter" -#~ msgstr "خوش‌آمدگو" - -#~ msgid "_Welcome string: " -#~ msgstr "رشتهٔ _خوش‌آمدگویی: " - -#~ msgid "Re_mote welcome string: " -#~ msgstr "رشتهٔ خوش‌آمدگویی _دوردست: " - -#~ msgid "Standard greeter" -#~ msgstr "خوش‌آمدگوی استاندارد" - -#~ msgid "Graphical greeter" -#~ msgstr "خوش‌آمدگوی گرافیکی" - -#~ msgid "" -#~ "String to be shown in the greeter as welcome. You can insert %n in here " -#~ "and it will be replaced by the name of your computer." -#~ msgstr "" -#~ "رشته‌ای که در خوش‌آمدگو به عنوان خوش‌آمد نشان داده می‌شود. شما می‌توانید در " -#~ "اینجا %n درج کنید که به جای آن نام رایانه شما جایگزین می‌گردد." - -#~ msgid "" -#~ "String to be shown in the greeter for people logging in remotely with " -#~ "XDMCP. You can insert %n in here and it will be replaced by the name of " -#~ "your computer." -#~ msgstr "" -#~ "رشته‌ای که در خوش‌آمدگو به افرادی که از دوردست با استفاده از XDMCP وارد " -#~ "سیستم می‌شوند نشان داده می‌شود. شما می‌توانید در اینجا %n درج کنید که به جای " -#~ "آن نام رایانه شما جایگزین می‌گردد." - -#~ msgid "Always use 24 hour cloc_k format" -#~ msgstr "همیشه از قالب ساعت ۲۴ ساعته استفاده شود" - -#~ msgid "_Automatic login username:" -#~ msgstr "نام کاربر ورود _خودکار:" - -#~ msgid "_Login a user automatically on first bootup" -#~ msgstr "_ورود خودکار یکی از کاربران به سیستم در اولین راه‌اندازی" - -#~ msgid "Timed login us_ername:" -#~ msgstr "نام کاربر ورود _مدت‌دار به سیستم:" - -#~ msgid "Login a user automa_tically after a specified number of seconds" -#~ msgstr "ورود خودکار _کاربر به سیستم پس از سپری شدن تعداد ثانیه‌های مشخص" - -#~ msgid "General" -#~ msgstr "عمومی" - -#~ msgid "Miscellaneous" -#~ msgstr "متفرقه" - -#~ msgid "Show choosable user images (_face browser)" -#~ msgstr "نشان دادن تصاویر قابل انتخاب کاربران (مرورگر _چهره)" - -#~ msgid "_No background" -#~ msgstr "_بدون پس‌زمینه" - -#~ msgid "_Scale background image to fit" -#~ msgstr "_کشیدگی متناسب تصویر پس‌زمینه برای جا شدن" - -#~ msgid "_Only color on remote displays" -#~ msgstr "_فقط رنگ در نمایش‌های دوردست" - -#~ msgid "Pick a color" -#~ msgstr "یک رنگ انتخاب کنید" - -#~ msgid "Preview:" -#~ msgstr "پیش‌نمایش:" - -#~ msgid "Description:" -#~ msgstr "شرح:" - -#~ msgid "" -#~ "description\n" -#~ "widget" -#~ msgstr "" -#~ "شرح\n" -#~ "ویجت" - -#~ msgid "author" -#~ msgstr "مؤلف" - -#~ msgid "copyright" -#~ msgstr "حق نسخه‌برداری" - -#~ msgid "_Delete theme" -#~ msgstr "_حذف تم" - -#~ msgid "Allow _root to login with GDM" -#~ msgstr "ا_جازه دادن به root برای ورود به سیستم با GDM" - -#~ msgid "Allow root to login r_emotely with GDM" -#~ msgstr "اجازه دادن به root برای ورود به سیستم از _دوردست با GDM" - -#~ msgid "" -#~ "Show the \"Actions\" menu (formerly known as the \"System\" menu). If " -#~ "not set, none of the system commands will be available (this includes " -#~ "reboot, shutdown, configure, chooser)" -#~ msgstr "" -#~ "نشان دادن منوی «کنش‌ها» (در گذشته به عنوان منوی «سیستم» شناخته می‌شد). اگر " -#~ "برقرار نباشد هیچ یک از فرمان‌های سیستم موجود نخواهند بود (این شامل " -#~ "راه‌اندازی مجدد، پیکربندی و انتخاب‌گر نیز می‌شود)" - -#~ msgid "Allow c_onfiguration from the login screen" -#~ msgstr "مجاز بودن _پیکربندی از صفحهٔ ورود به سیستم" - -#~ msgid "Allo_w running XDMCP chooser from the login screen" -#~ msgstr "مجا_ز بودن اجرای انتخاب‌گر XDMCP از صفحهٔ ورود به سیستم" - -#~ msgid "" -#~ "Always disallow TCP connections to _X server (disables all remote " -#~ "connections)" -#~ msgstr "" -#~ "_رد کردن همیشگی اتصال TCP به کارگزار X (همهٔ اتصالات دوردست از کار می‌افتند)" - -#~ msgid "Retry _delay (seconds) :" -#~ msgstr "تأخیر تلاش مجدد (به _ثانیه) :" - -#~ msgid "Make a _sound when login window is ready" -#~ msgstr "پخش _صدا هنگامی که پنجرهٔ ورود به سیستم آماده شد" - -#~ msgid "_Test sound" -#~ msgstr "آ_زمایش صدا" - -#~ msgid "" -#~ "No XDMCP support in the binary. To enable XDMCP support you must " -#~ "recompile GDM with the XDMCP libraries." -#~ msgstr "" -#~ "پشتیبانی XDMCP در پروندهٔ دودویی وجود ندارد. برای به کار انداختن پشتیبانی " -#~ "شما باید GDM را همراه با کتابخانه‌های XDMCP مجدداً ترجمه کنید." - -#~ msgid "Enable _XDMCP" -#~ msgstr "به _کار انداختن XDMCP" - -#~ msgid "Ping interval (seconds):" -#~ msgstr "بازهٔ زمانی ping (به ثانیه):" - -#~ msgid "XDMCP" -#~ msgstr "XDMCP" - -#~ msgid "Details: %s" -#~ msgstr "جزئیات: %s" - -#~ msgid "Select new theme archive to install" -#~ msgstr "یک آرشیو تم جدید برای نصب انتخات کنید" - -#~ msgid "Do you really wish to remove theme '%s' from the system?" -#~ msgstr "آیا واقعاً می‌خواهید تم %s را از سیستم حذف کنید؟" - -#~ msgid "" -#~ "The greeter version (%s) does not match the daemon version.\n" -#~ "You have probably just upgraded gdm.\n" -#~ "Please restart the gdm daemon or reboot the computer." -#~ msgstr "" -#~ "نسخهٔ خوش‌آمدگو (%s) با نسخهٔ شبح مطابقت ندارد.\n" -#~ "احتمالاً شما همین حالا gdm را ارتقا داده‌اید.\n" -#~ " لطفاً شبح gdm یا رایانه را مجدداً راه‌اندازی کنید." - -#~ msgid "" -#~ "The greeter version (%s) does not match the daemon version (%s).\n" -#~ "You have probably just upgraded gdm.\n" -#~ "Please restart the gdm daemon or reboot the computer." -#~ msgstr "" -#~ "نسخهٔ خوش‌آمدگو (%s) با نسخهٔ شبح (%s) مطابقت ندارد.\n" -#~ "احتمالاً همین حالا gdm را ارتقا داده‌اید.\n" -#~ " لطفاً شبح gdm یا رایانه را مجدداً راه‌اندازی کنید." - -#~ msgid "Last" -#~ msgstr "آخرین" - -#~ msgid "Can't open DefaultImage: %s!" -#~ msgstr "نمی‌توان DefaultImage را باز کرد: %s!" - -#~ msgid "" -#~ "Doubleclick on the user\n" -#~ "to log in" -#~ msgstr "" -#~ "برای ورود به سیستم روی\n" -#~ "کاربر دوبارکلیک کنید" - -#~ msgid "_XDMCP Chooser" -#~ msgstr "انتخاب‌گر_ XDMCP" - -#~ msgid "_Reboot the computer" -#~ msgstr "_راه‌اندازی مجدد رایانه" - -#~ msgid "(memory buffer" -#~ msgstr "میانگیر حافظه)" - -#~ msgid "24-hour" -#~ msgstr "24-hour" - -#~ msgid "Restart gdm" -#~ msgstr "راه‌اندازی مجدد gdm" - -#~ msgid "All Images" -#~ msgstr "همهٔ تصاویر" - -#~ msgid "Selection" -#~ msgstr "انتخاب" - -#~ msgid "User Image" -#~ msgstr "تصویر کاربر" - -#~ msgid "_Browse" -#~ msgstr "_مرور" - -#~ msgid "Open File" -#~ msgstr "باز کردن پرونده" - -#~ msgid "PNG and JPEG" -#~ msgstr "PNG و JPEG" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "<" -#~ msgstr "<" - -#~ msgid "Server Settings" -#~ msgstr "تنظیمات کارگزار" - -#~ msgid "" -#~ "WARNING: Placing values in this section that your Xserver does not " -#~ "support will stop your Xserver\n" -#~ "from restarting (effectively not allowing this configuration application " -#~ "to run), BE CAREFUL!" -#~ msgstr "" -#~ "هشدار: قرار دادن مقادیری که کارگزار X پشتیبانی نمی‌کند در این مکان " -#~ "باعث می‌شود کارگزار X شما راه اندازی مجدد نشود\n" -#~ "(در واقع اجازه داده نمی‌شود که این برنامهٔ پیکربندی اجرا شود)، مراقب باشید!" - -#~ msgid ">" -#~ msgstr ">" - -#~ msgid "Allow theme selection in _GTK+ Greeter" -#~ msgstr "مجاز بودن انتخاب _تم در خوش‌آمدگوی GTK+" - -#~ msgid "Apply" -#~ msgstr "اِعمال" - -#~ msgid "Choose network computer to connect to." -#~ msgstr "رایانهٔ شبکه‌ای را که می‌خواهید به آن متصل شوید انتخاب کنید." - -#~ msgid "Create Server Definition" -#~ msgstr "ایجاد توصیف کارگزار" - -#~ msgid "Delete" -#~ msgstr "حذف" - -#~ msgid "Delete Server Definition" -#~ msgstr "حذف توصیف کارگزار" - -#~ msgid "Flexible" -#~ msgstr "انعطاف‌پذیر" - -#~ msgid "GTK+ Greeter" -#~ msgstr "خوش‌آمدگوی GTK+" - -#~ msgid "" -#~ "GTK+ Greeter\n" -#~ "Themed Greeter" -#~ msgstr "" -#~ "خوش‌آمدگوی GTK+\n" -#~ "خوش‌آمدگوی تم‌دار" - -#~ msgid "" -#~ "GTK+ Greeter\n" -#~ "Themed Greeter\n" -#~ "Disabled" -#~ msgstr "" -#~ "خوش‌آمدگوی GTK+\n" -#~ "خوش‌آمدگوی تم‌دار\n" -#~ "از کار انداخته شد" - -#~ msgid "Make a _sound after a failed login attempt" -#~ msgstr "پخش _صدا پس از تلاش ناموفق برای ورود به سیستم" - -#~ msgid "Make a _sound after a successful login attempt" -#~ msgstr "پخش _صدا پس از تلاش موفق برای ورود به سیستم" - -#~ msgid "No Logo" -#~ msgstr "بدون نشان" - -#~ msgid "" -#~ "Note: For settings to take effect, the gdm service will require a restart." -#~ msgstr "" -#~ "توجه: برای این که تنظیمات اثر کند لازم است سرویس gdm مجدداً راه‌اندازی شود." - -#~ msgid "" -#~ "Only One Theme\n" -#~ "Random Theme" -#~ msgstr "" -#~ "فقط یک تم\n" -#~ "تم تصادفی" - -#~ msgid "Re_mote welcome string (%n = hostname): " -#~ msgstr "رشتهٔ خوش‌آمدگویی د_وردست: (%n = نام میزبان): " - -#~ msgid "Show _Face Browser" -#~ msgstr "نشان دادن مرورگر _چهره" - -#~ msgid "Themed Greeter" -#~ msgstr "خوش‌آمدگوی تم‌دار" - -#~ msgid "Use default Remote Welcome" -#~ msgstr "از خوش‌آمد دوردست پیش‌فرض استفاده شود" - -#~ msgid "Usually something like: /usr/bin/X" -#~ msgstr "معمولاً چیزی شبیه: /usr/bin/X" - -#~ msgid "_Mode:" -#~ msgstr "_حالت:" - -#~ msgid "A-M|English (British)" -#~ msgstr "الف‐س|انگلیسی (بریتانیایی)" - -#~ msgid "" -#~ "The system administrator has\n" -#~ "disabled your account." -#~ msgstr "" -#~ "مدیر سیستم حساب شما را\n" -#~ " از کار انداخته است." - -#~ msgid "Can't find /etc/pam.d/%s!" -#~ msgstr "نمی‌توان /etc/pam.d/%s را یافت!" - -#~ msgid "Gnome" -#~ msgstr "گنوم" - -#~ msgid "Name: " -#~ msgstr "نام: " - -#~ msgid "Remember this setting" -#~ msgstr "به خاطر سپردن این تنظیم" - -#~ msgid "S_ystem" -#~ msgstr "سیستم" - -#~ msgid "Select a photo" -#~ msgstr "انتخاب یک عکس" - -#~ msgid "GDM Configurator" -#~ msgstr "پیکربند GDM" diff -Nru gdm-2.32.1/po/fr.po gdm-3.0.0/po/fr.po --- gdm-2.32.1/po/fr.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/fr.po 2011-04-04 14:37:16.000000000 +0000 @@ -14,23 +14,23 @@ # Jonathan Ernst , 2006-2007. # Robert-André Mauchin , 2006-2008. # Claude Paroz , 2007-2010. -# Bruno Brouard , 2008-2009. +# Bruno Brouard , 2008-2011. # msgid "" msgstr "" "Project-Id-Version: gdm HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-13 15:26+0000\n" -"PO-Revision-Date: 2010-08-13 22:27+0200\n" -"Last-Translator: Claude Paroz \n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 19:28+0000\n" +"PO-Revision-Date: 2011-03-21 21:13+0100\n" +"Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \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" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom n'est pas un périphérique de caractères" @@ -55,28 +55,28 @@ msgid "could not find user \"%s\" on system" msgstr "impossible de trouver l'utilisateur « %s » sur le système" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Impossible d'initialiser le système de connexion" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Impossible d'authentifier l'utilisateur" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Impossible d'autoriser l'utilisateur" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Impossible d'établir les informations d'identification" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Impossible d'ouvrir une session" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -101,17 +101,17 @@ "n'existe pas" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Impossible de définir l'identificateur du groupe à %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () a échoué pour %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Impossible de définir l'identificateur de l'utilisateur à %d" @@ -162,83 +162,83 @@ msgid "The display device" msgstr "Le périphérique d'affichage" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" "erreur lors de l'initialisation de la conversation avec le système " -"d'authentification : %s" +"d'authentification - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "échec global" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "mémoire insuffisante" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "erreur de programmation de l'application" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "erreur inconnue" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Identifiant :" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "erreur lors de la notification au système d'authentification de l'invite " "favorite de l'utilisateur :%s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "erreur lors de la notification au système d'authentification du nom d'hôte " "de l'utilisateur : %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "erreur lors de la notification au système d'authentification de la console " "de l'utilisateur : %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "erreur lors de la notification au système d'authentification de la chaîne " "d'affichage : %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "erreur lors de la notification au système d'authentification des " "informations d'identification xauth de l'affichage : %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "aucun compte utilisateur disponible" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Impossible de changer vers cet utilisateur" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "L'utilisateur %s n'existe pas" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Le groupe %s n'existe pas" @@ -467,7 +467,7 @@ msgstr "Wrapper de registre AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Fenêtre de connexion" @@ -479,6 +479,10 @@ msgid "Power management daemon" msgstr "Service de gestion d'énergie" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Vérificateur d'accélération de session GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Service des paramètres GNOME" @@ -515,7 +519,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agent d'authentification de PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Sélectionnez un système" @@ -527,38 +531,38 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP : impossible de lire l'en-tête XDMCP" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valeur" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "pourcentage du temps effectué" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Texte inactif" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Le texte à utiliser dans l'étiquette si l'utilisateur n'a pas déjà choisi un " "élément" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Texte actif" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "" "Le texte à utiliser dans l'étiquette si l'utilisateur a choisi un élément" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Liste visible" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Indique si le sélecteur est visible" @@ -590,65 +594,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Connexion automatique en cours…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Choisissez la langue et cliquez sur Se connecter" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Annulation…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personnalisée" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Session personnalisée" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Annuler" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nom de l'ordinateur" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Se connecter" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Déverrouiller" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Version" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Tableau" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Options d'extinction…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspendre" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Redémarrer" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Éteindre" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personnalisée" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Durée restante inconnue" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Session personnalisée" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Tableau" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Langues" @@ -677,37 +685,10 @@ msgid "Language" msgstr "Langue" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Non précisé" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Agencements de clavier" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Clavier :" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Autre…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Choisissez un agencement de clavier à partir de la liste complète des " -"agencements disponibles." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Clavier" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Texte de l'étiquette" @@ -799,62 +780,51 @@ msgstr "Nom d'icône à utiliser pour le logo de la bannière d'accueil" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Agencements de clavier récemment sélectionnés" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Langues récemment sélectionnées" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Définit une liste des agencement de clavier à afficher par défaut dans la " -"fenêtre de connexion." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Définit une liste des langues à afficher par défaut dans la fenêtre de " "connexion." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Définit le nom d'icône (dans un thème) à utiliser pour le logo de la " "bannière d'accueil." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Si vrai, désactive l'affichage des utilisateurs connus dans la fenêtre de " "connexion." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Si vrai, désactive l'affichage des boutons de redémarrage dans la fenêtre de " "connexion." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Si vrai, active le greffon de gestion des paramètres de XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Si vrai, active le greffon de gestion des paramètres d'arrière-plan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Si vrai, active le greffon de gestion des paramètres des touches multimédias." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Si vrai, active le clavier à l'écran." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -862,31 +832,31 @@ "Si vrai, active le greffon de gestion des paramètres d'accessibilité du " "clavier." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Si vrai, active la loupe d'écran." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Si vrai, active le lecteur d'écran." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Si vrai, active le greffon de gestion des paramètres de son." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Si vrai, active le greffon de gestion des paramètres xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Si vrai, affiche le texte du message de la bannière." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Si vrai, active Compiz comme gestionnaire de fenêtres." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -894,35 +864,35 @@ "Message texte de la bannière à afficher dans la fenêtre de connexion quand " "le sélecteur d'utilisateur est vide, à la place de banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "" "Texte du message de la bannière à afficher dans la fenêtre de connexion." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Vrai si le greffon de gestion des paramètres de XRandR est activé." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Vrai si le greffon de gestion des paramètres d'arrière-plan est activé." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Vrai si le greffon de gestion des paramètres des touches multimédia est " "activé." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Vrai si le greffon de gestion des paramètres de son est activé." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Vrai si le greffon de gestion des paramètres de xsettings est activé." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Utiliser Compiz comme gestionnaire de fenêtres" @@ -950,8 +920,8 @@ msgid "Whether the timer is currently ticking" msgstr "Indique si le compte à rebours est actif" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Se connecter en tant que %s" @@ -961,184 +931,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Autre…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Choisissez un compte différent" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Invité" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Se connecter en tant qu'invité temporaire" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Connexion automatique" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Se connecter automatiquement au système après avoir choisi des options" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Déjà connecté" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"L'applet de changement d'utilisateur est un logiciel libre ; vous pouvez le " -"redistribuer et/ou le modifier au titre des clauses de la Licence Publique " -"Générale GNU, telle que publiée par la Free Software Foundation ; soit la " -"version 2 de la Licence, ou (à votre discrétion) une version ultérieure " -"quelconque." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " -"GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE " -"CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale " -"GNU pour plus de détails." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU " -"avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software " -"Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Un menu pour basculer rapidement entre les utilisateurs." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Vincent Renardias , 1998.\n" -"Fabrice Bellet , 1999.\n" -"Joaquim Fellmann , 2000.\n" -"Christophe Merlet , 2000-2006.\n" -"Christophe Fergeau , 2001.\n" -"Xavier Claessens , 2005.\n" -"Stéphane Raimbault , 2006-2008.\n" -"Guillaume Desmottes , 2006.\n" -"Vincent Fretin , 2006.\n" -"Jonathan Ernst , 2006-2007.\n" -"Robert-André Mauchin , 2006-2008.\n" -"Claude Paroz , 2007-2008.\n" -"Bruno Brouard , 2008." - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Impossible de verrouiller l'écran : %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Impossible de définir temporairement un écran vide en tant qu'écran de " -"veille : %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Impossible de se déconnecter : %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Disponible" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Invisible" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Occupé" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Absent" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informations du compte" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Préférences du système" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Verrouiller l'écran" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Changer d'utilisateur" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Quitter…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Inconnu" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Applet de changement d'utilisateur" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Modifier les paramètres et l'état du compte" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menu permettant de basculer rapidement entre les utilisateurs" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Outil de changement d'utilisateur" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fabrique de l'outil de changement d'utilisateur" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Modifier les _informations personnelles" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "À _propos" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Mo_difier les utilisateurs et les groupes" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Seule la commande VERSION est prise en charge" @@ -1174,11 +995,12 @@ msgid "Unable to start new display" msgstr "Impossible de démarrer un nouvel affichage" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Capture d'écran effectuée" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Effectue une capture de l'écran" + diff -Nru gdm-2.32.1/po/gl.po gdm-3.0.0/po/gl.po --- gdm-2.32.1/po/gl.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/gl.po 2011-04-04 14:37:16.000000000 +0000 @@ -7,6 +7,7 @@ # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://www.trasno.net # +# # Jesús Bravo Álvarez , 2004. # Manuel A. Fernández Montecelo , 2001-2002. # Ruben Lopez Gomez , 1999. @@ -15,24 +16,23 @@ # Ignacio Casal Quinteiro , 2008. # Mancomún - Centro de Referencia e Servizos de Software Libre , 2009. # Antón Méixome , 2009. -# Fran Diéguez , 2009, 2010. -# +# Fran Diéguez , 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm-master-po-gl-41637\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-18 19:29+0200\n" -"PO-Revision-Date: 2010-07-18 19:30+0200\n" -"Last-Translator: Fran Diéguez \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2011-03-20 18:45+0100\n" +"PO-Revision-Date: 2011-03-20 18:46+0100\n" +"Last-Translator: \n" +"Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.2\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom non é un dispositivo de caracteres" @@ -55,30 +55,30 @@ #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "non foi posíbel encontrar o usuario «%s» no sistema" +msgstr "non foi posíbel atopar o usuario «%s» no sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Non é posíbel inicializar o sistema de inicio de sesión" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Non foi posíbel autenticar o usuario" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Non foi posíbel autorizar o usuario" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Non foi posíbel estabelecer as credenciais" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Non foi posíbel abrir a sesión" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -101,17 +101,17 @@ msgstr "O servidor íase iniciar co usuario %s, mais ese usuario non existe" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Non foi posíbel definir o identificador de grupo como %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "fallou o initgroups () para %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Non foi posíbel definir o identificador de usuario como %d" @@ -162,82 +162,82 @@ msgid "The display device" msgstr "O dispositivo de pantalla" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" -"produciuse un erro iniciando a conversa co sistema de autenticación: %s" +"produciuse un erro ao inicializar a conversa co sistema de autenticación: %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "fallo xeral" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "sen memoria" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "produciuse un erro de programación do aplicativo" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "erro descoñecido" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Nome de usuario:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "produciuse un erro ao informar o sistema de autenticación do indicador " "(prompt) do nome de usuario: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "produciuse un erro ao informar o sistema de autenticación do nome de host do " "usuario: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "produciuse un erro ao informar ao sistema de autenticación da consola de " "usuario: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "produciuse un erro ao informar ao sistema de autenticación da cadea da " "pantalla: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "produciuse un erro ao informar ao sistema de autenticación de credenciais " "xauth de pantalla: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "non hai ningunha conta de usuario dispoñíbel" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Non é posíbel cambiar a ese usuario" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "O usuario %s non existe" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "O grupo %s non existe" @@ -412,13 +412,13 @@ #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "" -"O directorio de autorización %s ten permisos %o incorrectos. Deberían ser %" -"o. Interrompendo." +"O directorio de autorización %s ten permisos %o incorrectos. Deberían ser " +"%o. Interrompendo." #: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "Non é posíbel encontrar o usuario do GDM '%s'. Interrompendo!" +msgstr "Non é posíbel atopar o usuario do GDM '%s'. Interrompendo!" #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" @@ -427,7 +427,7 @@ #: ../daemon/main.c:421 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "Non é posíbel encontrar o grupo '%s' do GDM. Interrompendo!" +msgstr "Non é posíbel atopar o grupo '%s' do GDM. Interrompendo!" #: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" @@ -465,7 +465,7 @@ msgstr "Wrapper do rexistro AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Xanela de inicio de sesión" @@ -477,6 +477,10 @@ msgid "Power management daemon" msgstr "Daemon de xestión de enerxía" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Comprobador da aceleración da sesión de GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Daemon de configuracións do GNOME" @@ -513,7 +517,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Axente de autenticación de PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Seleccionar o sistema" @@ -525,36 +529,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: non foi posíbel ler a cabeceira XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "porcentaxe de tempo completa" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Texto inactivo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "O texto que se usará na etiqueta se o usuario non elixiu aínda un elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Texto activo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "O texto que se usará na etiqueta se o usuario elixiu un elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Lista visíbel" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Indica se a lista de selección é visíbel" @@ -586,65 +590,69 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" -msgstr "Iniciar sesión automaticamente..." +msgstr "Iniciar sesión automaticamente…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Seleccione o idioma e prema en Iniciar sesión" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" -msgstr "Interrompendo..." +msgstr "Interrompendo…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizada" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sesión personalizada" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancelar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nome do computador" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Iniciar a sesión" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desbloquear" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versión" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "Opcións de apagado..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspender" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reiniciar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Apagar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Tempo restante descoñecido" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "Sesión personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Idiomas" @@ -662,7 +670,7 @@ #: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" msgid "Other…" -msgstr "Outro..." +msgstr "Outro…" #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." @@ -672,35 +680,10 @@ msgid "Language" msgstr "Idioma" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Non especificado" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Disposicións de teclado" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teclado:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Outra..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Escolla un teclado da lista completa de teclados dispoñíbeis." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Teclado" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Texto da etiqueta" @@ -719,11 +702,11 @@ #: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" -msgstr "Elemento predefinido" +msgstr "Elemento predeterminado" #: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" -msgstr "O ID do elemento predefinido" +msgstr "O ID do elemento predeterminado" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" @@ -736,7 +719,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format msgid "Remote Login (Connecting to %s…)" -msgstr "Inicio de sesión remoto (Conectando a %s...)" +msgstr "Inicio de sesión remoto (Conectando a %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -792,67 +775,56 @@ msgstr "Nome da icona que se usará para o logotipo da xanela de benvida" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Disposicións de teclado seleccionadas recentemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Idiomas seleccionados recentemente" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Definir como unha lista de disposicións de teclado se mostrará na xanela de " -"inicio predefinida." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" -"Definir como unha lista de idiomas que se mostrarán de modo predefinido na " -"xanela de inicio de sesión." +"Definir como unha lista de idiomas que se mostrarán de modo predeterminado " +"na xanela de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Definir como nome da icona do tema que se usará como logotipo da xanela de " "benvida." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Definir como verdadeiro para desactivar a visualización de usuarios " "coñecidos na xanela de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Definir como verdadeiro para desactivar os botóns de reinicio na xanela de " "inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Definir como verdadeiro para activar o engadido do xestor de configuracións " "xrandr." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Definir como verdadeiro para activar o engadido de xestión da configuración " "de fondo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Definir como verdadeiro para activar o engadido de xestión da configuración " "das teclas multimedia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Definir como verdadeiro para activar o teclado en pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -860,35 +832,35 @@ "Definir como verdadeiro para activar o engadido para xestionar a " "configuración do teclado de accesibilidade." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Definir como verdadeiro para activar a lupa da pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Definir como verdadeiro para activar o lector de pantalla." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Definir como verdadeiro para activar o engadido de xestión de configuracións " "de son." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Definir como verdadeiro para activar o engadido do xestor de configuración " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Definir como verdadeiro para mostrar o texto de mensaxe do báner." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Definir como verdadeiro para usar o Compiz como xestor de xanela." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -896,34 +868,34 @@ "A mensaxe de texto do báner que se mostrará na xanela de inicio de sesión " "cando o selector de usuario está baleiro, no canto do banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "" "A mensaxe de texto do banner que se mostrará na xanela de inicio de sesión." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True se o engadido xestor de configuracións xrandr está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True se o engadido xestor de configuracións de fondo está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "True se o engadido xestor de configuración das teclas multimedia está " "activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True se o engadido xestor de configuracións de son está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True se o engadido xestor de configuracións xsettings está activado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Usar Compiz como xestor de xanelas" @@ -951,8 +923,8 @@ msgid "Whether the timer is currently ticking" msgstr "Indica se o temporizador está actualmente activo ou non" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Iniciar sesión como %s" @@ -962,181 +934,36 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" -msgstr "Outro..." +msgstr "Outro…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Elixa unha conta diferente" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Convidado" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Iniciar a sesión como convidado temporal" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Inicio de sesión automático" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "" "Iniciar a sesión automaticamente no sistema despois de seleccionar as opcións" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Sesión iniciada" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"O miniaplicativo de cambio rápido de usuario é software libre; pode " -"redistribuílo ou modificalo baixo os termos da Licenza pública xeral GNU tal " -"como a publica a Free Software Foundation; tanto na versión 2 da licenza " -"como (segundo o seu criterio) en calquera versión posterior." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Este programa distribúese esperando que sexa útil, mais SEN NINGUNHA " -"GARANTÍA; mesmo sen a garantía implícita de VALOR COMERCIAL ou IDONEIDADE " -"PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública " -"xeral GNU." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Debería ter recibido unha copia da Licenza pública xeral GNU xunto con este " -"programa; en caso contrario, escriba á Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Un menú para cambiar rapidamente entre usuarios." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Fran Diéguez , 2009, 2010.\n" -"Antón Méixome , 2009.\n" -"Mancomún - Centro de Referencia e Servizos de Software Libre , 2009.\n" -"Ignacio Casal Quinteiro , 2008.\n" -"Ignacio Casal Quinteiro , 2007.\n" -"Ignacio Casal Quinteiro , 2005, 2006.\n" -"Jesús Bravo Álvarez , 2004.\n" -"Manuel A. Fernández Montecelo , 2001-2002.\n" -"Ruben Lopez Gomez , 1999." - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Non foi posíbel bloquear a pantalla: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Non foi posíbel configurar temporalmente o protector de pantalla como unha " -"pantalla en branco: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Non é posíbel saír da sesión: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Dispoñíbel" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Invisíbel" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Ocupado" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Ausente" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Información da conta" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Preferencias do sistema" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Bloquear a pantalla" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Cambiar de usuario" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Saír..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Descoñecido" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Miniaplicativo para cambiar de usuario" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Cambiar as configuracións de conta e de estado" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menú para cambiar rapidamente entre usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Selector de usuarios" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Factoría de miniaplicativo para cambiar de usuario" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editar a _información persoal" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Sobre" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editar usuarios e grupos" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "So a a orde VERSION é compatíbel" @@ -1172,15 +999,156 @@ msgid "Unable to start new display" msgstr "Non foi posíbel iniciar unha pantalla nova" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Captura de pantalla tomada" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Capturar unha imaxe da pantalla" +#~ msgid "Keyboard layouts" +#~ msgstr "Disposicións de teclado" + +#~ msgid "_Keyboard:" +#~ msgstr "_Teclado:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Outra…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Escolla un teclado da lista completa de teclados dispoñíbeis." + +#~ msgid "Keyboard" +#~ msgstr "Teclado" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Disposicións de teclado seleccionadas recentemente" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Definir como unha lista de disposicións de teclado se mostrará na xanela " +#~ "de inicio predeterminada." + +#~ msgid "Shutdown Options…" +#~ msgstr "Opcións de apagado..." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "O miniaplicativo de cambio rápido de usuario é software libre; pode " +#~ "redistribuílo ou modificalo baixo os termos da Licenza pública xeral GNU " +#~ "tal como a publica a Free Software Foundation; tanto na versión 2 da " +#~ "licenza como (segundo o seu criterio) en calquera versión posterior." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Este programa distribúese esperando que sexa útil, mais SEN NINGUNHA " +#~ "GARANTÍA; mesmo sen a garantía implícita de VALOR COMERCIAL ou IDONEIDADE " +#~ "PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública " +#~ "xeral GNU." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Debería ter recibido unha copia da Licenza pública xeral GNU xunto con " +#~ "este programa; en caso contrario, escriba á Free Software Foundation, " +#~ "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Un menú para cambiar rapidamente entre usuarios." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Fran Diéguez , 2009, 2010.\n" +#~ "Antón Méixome , 2009.\n" +#~ "Mancomún - Centro de Referencia e Servizos de Software Libre " +#~ ", 2009.\n" +#~ "Ignacio Casal Quinteiro , 2008.\n" +#~ "Ignacio Casal Quinteiro , 2007.\n" +#~ "Ignacio Casal Quinteiro , 2005, 2006.\n" +#~ "Jesús Bravo Álvarez , 2004.\n" +#~ "Manuel A. Fernández Montecelo , 2001-2002.\n" +#~ "Ruben Lopez Gomez , 1999." + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Non foi posíbel bloquear a pantalla: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Non foi posíbel configurar temporalmente o protector de pantalla como " +#~ "unha pantalla en branco: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Non é posíbel saír da sesión: %s" + +#~ msgid "Available" +#~ msgstr "Dispoñíbel" + +#~ msgid "Invisible" +#~ msgstr "Invisíbel" + +#~ msgid "Busy" +#~ msgstr "Ocupado" + +#~ msgid "Away" +#~ msgstr "Ausente" + +#~ msgid "Account Information" +#~ msgstr "Información da conta" + +#~ msgid "System Preferences" +#~ msgstr "Preferencias do sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquear a pantalla" + +#~ msgid "Switch User" +#~ msgstr "Cambiar de usuario" + +#~ msgid "Quit…" +#~ msgstr "Saír..." + +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicativo para cambiar de usuario" + +#~ msgid "Change account settings and status" +#~ msgstr "Cambiar as configuracións de conta e de estado" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Un menú para cambiar rapidamente entre usuarios" + +#~ msgid "User Switcher" +#~ msgstr "Selector de usuarios" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Factoría de miniaplicativo para cambiar de usuario" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Editar a _información persoal" + +#~ msgid "_About" +#~ msgstr "_Sobre" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editar usuarios e grupos" + +#~ msgid "Unknown" +#~ msgstr "Descoñecido" + #~ msgid "Manager" #~ msgstr "Xestor" diff -Nru gdm-2.32.1/po/gu.po gdm-3.0.0/po/gu.po --- gdm-2.32.1/po/gu.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/gu.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,13 +1,13 @@ -# translation of gdm.master.gu.po to Gujarati +# translation of gu.po to Gujarati # Ankit Patel , 2005, 2006. # Ankit Patel , 2005, 2007. -# Sweta Kothari , 2008, 2009, 2010. +# Sweta Kothari , 2008, 2009, 2010, 2011. msgid "" msgstr "" -"Project-Id-Version: gdm.master.gu\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-20 18:41+0000\n" -"PO-Revision-Date: 2010-07-28 13:16+0530\n" +"Project-Id-Version: gu\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-29 16:34+0000\n" +"PO-Revision-Date: 2011-04-01 14:27+0530\n" "Last-Translator: Sweta Kothari \n" "Language-Team: Gujarati\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ "\n" "\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom એ અક્ષર ઉપકરણ નથી" @@ -63,40 +63,38 @@ msgid "could not find user \"%s\" on system" msgstr "સિસ્ટમ પર વપરાશકર્તા \"%s\" શોધી શકાતો નથી" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "સિસ્ટમના પ્રવેશની શરૂઆત કરવામાં અસમર્થ" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "વપરાશકર્તાને સત્તા આપવામાં અસમર્થ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "વપરાશકર્તાને સત્તાધિકાર આપવા માટે અસમર્થ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "ઓળખાણપત્ર સ્થાપવામાં અસમર્થ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 -#| msgid "Unable to authorize user" +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "સત્રને ખોલવાનું અસમર્થ" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " "diagnose. In the meantime this display will be disabled. Please restart GDM " "when the problem is corrected." -msgstr "અમુક આંતરિક ભૂલોના કારણે X સર્વર (તમારું ચિત્રાત્મક પર્યાવરણ) શરુ કરી શકાતું નથી.મહેરબાની કરીને તમારા સિસ્ટમ સંચાલકનો સંપર્ક કરો અથવા તપાસ માટે તમારું syslog ચકાસો. આ સમય દરમ્યાન આ ડિસ્પ્લે નિષ્ક્રિય થઇ જશે. મહેરબાની કરીને જ્યારે સમસ્યાનો હલ આવી જાય ત્યારે GDM ફરીથી શરુ કરો." +msgstr "" +"અમુક આંતરિક ભૂલોના કારણે X સર્વર (તમારું ચિત્રાત્મક પર્યાવરણ) શરુ કરી શકાતું નથી.મહેરબાની " +"કરીને તમારા સિસ્ટમ સંચાલકનો સંપર્ક કરો અથવા તપાસ માટે તમારું syslog ચકાસો. આ સમય " +"દરમ્યાન આ ડિસ્પ્લે નિષ્ક્રિય થઇ જશે. મહેરબાની કરીને જ્યારે સમસ્યાનો હલ આવી જાય ત્યારે GDM " +"ફરીથી શરુ કરો." #: ../daemon/gdm-server.c:250 #, c-format @@ -109,24 +107,23 @@ msgstr "સર્વર વપરાશકર્તા %s દ્વારા ઉત્પન્ન કરવાનું હતું પરંતુ તે વપરાશકર્તા અસ્તિત્વ ધરાવતો નથી" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "જૂથના ઓળખક્રમાંકને %d પર સુયોજિત કરી શકાયુ નહિં" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s માટે initgroups () નિષ્ફળ" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "વપરાશકર્તાના ઓળખક્રમાંકને %d પર સુયોજિત કરી શકાયુ નથી" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: દર્શાવ %s માટે લોગ ફાઇલ ખોલી શક્યા નહિં!" @@ -170,79 +167,72 @@ msgid "The display device" msgstr "ડિસ્પ્લે ઉપકરણ" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -#| msgid "error initiating conversation with authentication system - %s" -msgid "error initiating conversation with authentication system: %s" -msgstr "સત્તાધિકરણ સિસ્ટમ સાથે શરૂઆતમાં વાર્તાલાપ કરવા દરમિયાન ભૂલ: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "સત્તાધિકરણ સિસ્ટમ સાથે શરૂઆતમાં વાર્તાલાપ કરવા દરમ્યાન ભૂલ - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "સામાન્ય નિષ્ફળતા" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "મેમરીની બહાર" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "કાર્યક્રમ પ્રોગ્રામર ભૂલ" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "અજ્ઞાત ભૂલ" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "વપરાશકર્તાનું નામ:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "અધિમાન્ય વપરાશકર્તાનામ પ્રોમ્પ્ટનાં સિસ્ટમ સત્તાધિકરણને જાણકારી દરમિયાન ભૂલ: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "વપરાશકર્તાનાં યજમાનનામની સિસ્ટમ સત્તાધિકરણની જાણકારી દરમિયાન ભૂલ: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "વપરાશકર્તાનાં કન્સોલની સિસ્ટમ સત્તાધિકરણને જાણકારી દરમિયાન ભૂલ: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "શબ્દમાળાને દર્શાવવા સિસ્ટમ સત્તાધિકરણને જાણકારી દરમિયાન ભૂલ: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "xauth શ્રેય દર્શાવવા નું સત્તાધિકરણ સિસ્ટમને જાણકારી દરમિયાન ભૂલ: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "વપરાશકર્તાનું ખાતુ ઉપલબ્ધ નથી" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "વપરાશકર્તાને બદલવામાં અસમર્થ" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "વપરાશકર્તા %s અસ્તિત્વ ધરાવતુ નથી" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "જૂથ %s અસ્તિત્વ ધરાવતુ નથી" @@ -386,7 +376,6 @@ #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "PID ફાઈલ %s પર લખી શકાતુ નથી: સંભવિત છે કે ડિસ્કજગ્યા બહાર છે: %s" @@ -438,7 +427,6 @@ msgstr "બધી ચેતવણીઓ ફેટલ બનાવો" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "થોડા સમય પછી બહાર નીકળો (ડિબગીંગ માટે)" @@ -452,7 +440,6 @@ #. make sure the pid file doesn't get wiped #: ../daemon/main.c:616 -#| msgid "Only root wants to run GDM" msgid "Only the root user can run GDM" msgstr "માત્ર રુટ વપરાશકર્તા GDM ને ચલાવી શકે છે" @@ -463,12 +450,11 @@ msgstr "GNOME ડિસ્પ્લે વ્યવસ્થાપક સત્ર કામ કરનાર ચાલી" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "AT SPI રજીસ્ટરી રૅપર" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "પ્રવેશ વિન્ડો" @@ -480,6 +466,10 @@ msgid "Power management daemon" msgstr "પાવર વ્યવસ્થાપક ડેઇમોન" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME સત્ર એક્સેલરેશન ચકાસનાર" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME સુયોજનાઓ ડેઇમોન" @@ -493,12 +483,10 @@ msgstr "સ્ક્રીનનાં ભાગોને મોટા કરો" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "GNOME ઓન-સ્ક્રીન કિબોર્ડ" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "ઓન-સ્ક્રીન કિબોર્ડ ને વાપરો" @@ -518,7 +506,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit Authentication Agent" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "સિસ્ટમ પસંદ કરો" @@ -530,36 +518,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP હૅડર વાંચી શકાયુ નહિ!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "કિંમત" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "સમયની ટકાવારી સમાપ્ત થઇ " -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "નિષ્ક્રિય લ ખાણ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "જો વપરાશકર્તા એ હજુ વસ્તુને પકડેલ ન હોય તો લેબલમાં વપરાતુ લખાણ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "સક્રિય લખાણ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "જો વપરાશકર્તા વસ્તુને પકડેલ હોય ત્યારે વપરાતા લેબલમાં વપરાતુ લખાણ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "દેખાતી યાદી" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 -#| msgid "Whether or not the chooser list is visible" +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "ક્યાંતો પસંદ કરનાર યાદી દેખાશે કે નહિં" @@ -567,7 +554,6 @@ #. * the date and time with seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 -#| msgid "%l:%M:%S %p" msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" @@ -575,7 +561,6 @@ #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 -#| msgid "%l:%M %p" msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" @@ -583,7 +568,6 @@ #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 -#| msgid "%l:%M:%S %p" msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" @@ -591,73 +575,73 @@ #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 -#| msgid "%l:%M %p" msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "આપોઆપ પ્રવેશી રહ્યા છે..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "ભાષા પસંદ કરો અને પ્રવેશો પર ક્લિક કરો" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "રદ કરી રહ્યા છે..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "વૈવિધ્ય" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "વૈવિધ્ય ક્ષેત્ર" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "રદ કરો" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "કમ્પ્યુટર નામ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "પ્રવેશ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "તાળુ ખોલો" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "આવૃત્તિ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "પેનલ" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "વિકલ્પોને બંધ કરો..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "સ્થગિત" # gnome-session/session-properties.c:173 -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "ફરીથી શરુ કરો" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "બંધ કરો" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "વૈવિધ્ય" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "અજ્ઞાત સમય બાકી રહેલ છે" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "વૈવિધ્ય સત્ર" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "પેનલ" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ભાષાઓ" @@ -673,8 +657,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "બીજું..." @@ -684,42 +666,13 @@ msgstr "ઉપલબ્ધ ભાષાઓની સંપૂર્ણ યાદી માંથી ભાષા પસંદ કરો." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "ભાષા" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "સ્પષ્ટ થયેલ નથી" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "કિબોર્ડ રૂપરેખા" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "કિબોર્ડ (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "બીજું..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "ઉપલબ્ધ રૂપરેખાની સંપૂર્ણ યાદીમાંથી કિબોર્ડ પસંદ કરો." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "કિબોર્ડ" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "લેબલ લખાણ" @@ -741,7 +694,6 @@ msgstr "મૂળભૂત વસ્તુ" #: ../gui/simple-greeter/gdm-option-widget.c:523 -#| msgid "The id of the default item" msgid "The ID of the default item" msgstr "મૂળભૂત વસ્તુનું ID" @@ -755,7 +707,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "દૂરસ્થ પ્રવેશ (%s ને જોડાઇ રહ્યા છે...)" @@ -769,7 +720,6 @@ msgstr "દૂરસ્થ પ્રવેશ" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "સત્ર" @@ -814,90 +764,72 @@ msgstr "શુભેચ્છક લોગો માટે વપરાતા આઇકોન નામ" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "હાલમાં પસંદ થયેલ કિબોર્ડ લેઆઉટો" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "હાલમાં પસંદ કરાયેલ ભાષાઓ" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "પ્રવેશ વિન્ડો પર મૂળભૂત વડે બતાવેલ કિબોર્ડ લેઆઉટોની યાદીને સક્રિય કરો." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "પ્રવેશ વિન્ડો પર મૂળભૂત વડે બતાવેલ ભાષાઓની યાદીને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "શુભેચ્છક લોગો માટે વપરાશ કરવા માટે થીમ થયેલ આઇકોન નામને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "પ્રવેશ વિન્ડોમાં જાણીતા વપરાશકર્તાઓ બતાવવાનું નિષ્ક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "પ્રવેશ વિન્ડોમાં પુન:શરૂ કરવાનાં બટનો બતાવવાનું નિષ્ક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "XRandR વ્યવસ્થાપક પ્લગઇન સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "પાશ્ર્વભાગ સુયોજનો વ્યવસ્થાપક પ્લગઇનને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "મિડીઆ-કીઓ સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન ને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "ઓન-સ્ક્રીન કિબોર્ડ ને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "સુલભ કિબોર્ડ સુયોજનો વ્યવસ્થિત કરવા પ્લગઇન ને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "સ્ક્રીન વર્ધકને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "સ્ક્રીન વાંચનારને સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "સાઉન્ડ સુયોજનો વ્યવસ્થાપક પ્લગઇન સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings સુયોજનો વ્યવસ્થાપક પ્લગઇન સક્રિય કરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "બેનર સંદેસ લખાણ બતાવવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "વિન્ડો વ્યવસ્થાપક તરીકે કૉમ્પીઝ વાપરવા માટે true ને સુયોજિત કરો." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -905,34 +837,31 @@ "પ્રવેશ વિન્ડો પર બતાવવા માટે લખાણ બેનર સંદેશ જ્યારે વપરાશકર્તા પસંદકરનાર ખાલી હોય, " "banner_message_text ને બદલે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "પ્રવેશ વિન્ડોમાં બતાવવા માટે લખાણ બેનર સંદેશ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True છે જો xrandr સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન સક્રિય થયેલ છે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True છે જો પાશ્ર્વભાગ સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન સક્રિય થયેલ છે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "True છે જો મિડીઆ-કી સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન સક્રિય થયેલ છે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True છે જો સાઉન્ડ સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન સક્રિય થયેલ છે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True છે જો xsettings સુયોજનાઓ વ્યવસ્થાપક પ્લગઇન સક્રિય થયેલ છે." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "કૉમ્પીઝને વિન્ડો વ્યવસ્થાપક તરીકે વાપરો" @@ -957,12 +886,11 @@ msgstr "શું તે ચાલી રહ્યુ છે?" #: ../gui/simple-greeter/gdm-timer.c:166 -#| msgid "Whether or not the timer is currently ticking" msgid "Whether the timer is currently ticking" msgstr "ક્યાંતો ટાઇમર હાલમાં શરૂ થઇ રહ્યુ છે કે નહિં" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s તરીકે પ્રવેશ કરો" @@ -972,175 +900,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "બીજું..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "વિવિધ ખાતા પસંદ કરો" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "મહેમાન" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "કામચલાઉ મહેમાન તરીકે પ્રવેશ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "આપોઆપ પ્રવેશ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "વિકલ્પો પસંદ કરવા દરમિયાન પછી આપોઆપ સિસ્ટમ દાખલ થાય છે" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "વર્તમાનમાં જ પ્રવેશેલ છે" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "વપરાશકર્તાઓ વચ્ચે તરત જ બદલવા માટેનું મેનુ." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "શ્ર્વેતા કોઠારી " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "લોક કરી શકાસે નહિ: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "સ્ક્રીનસેવર ને ખાલી સ્ક્રીન કરવા કામચલાઉ માટે સુયોજિત કરી શકાતુ નથી: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "બહાર નીકળી શકાતુ નથી: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "ઉપલ્બધ" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "અદ્રશ્ય" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "વ્યસ્ત" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "દૂર" - -#: ../gui/user-switch-applet/applet.c:1122 -#| msgid "Account Information..." -msgid "Account Information" -msgstr "ખાતાની જાણકારી" - -#: ../gui/user-switch-applet/applet.c:1134 -#| msgid "System Preferences..." -msgid "System Preferences" -msgstr "સિસ્ટમ પસંદગીઓ" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "તાળુ સ્ક્રીન" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "વપરાશકર્તા સ્વીચ કરો" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "બહાર નીકળો..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "અજ્ઞાત" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "વપરાશકર્તા સ્વીચ એપલેટ" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "ખાતા સુયોજનો અને સ્થિતિ ને બદલો" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "વપરાશકર્તાઓ વચ્ચે તરત જ બદલવા માટે મેનુ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "વપરાશકર્તા સ્વીચર" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "વપરાશકર્તા સ્વીચર એપલેટ ફેક્ટરી" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "વ્યક્તિગત જાણકારીમાં ફેરફાર કરો (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "વિશે (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "વપરાશકર્તાઓ અને જૂથો માં ફેરફાર કરો (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "ફક્ત VERSION આદેશ આધારભૂત છે" @@ -1151,7 +939,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "અવગણેલ છે - સુસંગતા માટે રોકી રાખેલ છે" @@ -1177,12 +964,12 @@ msgid "Unable to start new display" msgstr "નવો ડિસ્પ્લે શરુ કરી શકવામાં અસમર્થ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "સ્ક્રીનશોટ લીધેલ છે" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "સ્ક્રીનનું ચિત્ર ને લો" diff -Nru gdm-2.32.1/po/he.po gdm-3.0.0/po/he.po --- gdm-2.32.1/po/he.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/he.po 2011-04-04 14:37:16.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gdm2.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 18:45+0200\n" -"PO-Revision-Date: 2010-10-01 18:59+0200\n" +"POT-Creation-Date: 2011-03-26 01:37+0200\n" +"PO-Revision-Date: 2011-03-26 01:37+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -42,28 +42,28 @@ msgid "could not find user \"%s\" on system" msgstr "לא ניתן לאתר את המשתמש \"%s\" במערכת" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "לא ניתן לאתחל את מערכת הכניסה" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "לא ניתן לאמת משתמש" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "לא ניתן לאמת את המשתמש" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "לא ניתן להקים את פרטי הזיהוי" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "לא ניתן לפתוח את ההפעלה" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -86,17 +86,17 @@ msgstr "Server was to be spawned by user %s but that user doesn't exist" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Couldn't set groupid to %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () failed for %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Couldn't set userid to %d" @@ -146,71 +146,71 @@ msgid "The display device" msgstr "התקן התצוגה" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "error initiating conversation with authentication system - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "general failure" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "out of memory" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "application programmer error" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "שגיאה לא ידועה" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "שם משתמש:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "error informing authentication system of preferred username prompt: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "error informing authentication system of user's hostname: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "error informing authentication system of user's console: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "error informing authentication system of display string: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "error informing authentication system of display xauth credentials: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "אין חשבון משתמש זמין" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "לא ניתן להחליף משתמש" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "User %s doesn't exist" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Group %s doesn't exist" @@ -432,7 +432,7 @@ msgstr "עוטף רישום AT SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1646 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "חלון התחברות" @@ -444,6 +444,10 @@ msgid "Power management daemon" msgstr "מנוע ניהול צריכת החשמל" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "בודק האצת ההפעלה של GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "מנוע ההגדרות של GNOME" @@ -480,7 +484,7 @@ msgid "PolicyKit Authentication Agent" msgstr "סוכן אימות של PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "בחירת מערכת" @@ -492,35 +496,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Could not read XDMCP header!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "ערך" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "אחוז הזמן שהסתיים" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inactive Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "The text to use in the label if the user hasn't picked an item yet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Active Text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "The text to use in the label if the user has picked an item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "הרשימה גלויה" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "האם רשימת הבחירה גלויה " @@ -552,65 +556,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "מתבצעת התחברות אוטומטית..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "יש לבחור שפה וללחוץ להתחברות" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "בהליכי ביטול..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "התאמה אישית" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "הפעלה מותאמת אישית" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "ביטול" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "שם מחשב" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "כניסה" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "שחרור" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "גרסה" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "לוח" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "אפשרויות כיבוי..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "השהה" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "הפעל מחדש" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "כיבוי" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "התאמה אישית" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "הזמן שנותר בלתי ידוע" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "הפעלה מותאמת אישית" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "לוח" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "שפות" @@ -638,35 +646,10 @@ msgid "Language" msgstr "שפה" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "לא מצוין" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "פריסות מקלדת" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_מקלדת:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "אחר..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "נא לבחור פריסת מקלדת מתוך הרשימה המלאה של הפריסות הזמינות." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "מקלדת" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "טקסט התווית" @@ -758,53 +741,43 @@ msgstr "Icon name to use for greeter logo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Recently selected keyboard layouts" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Recently selected languages" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Set to a list of keyboard layouts to be shown by default in the login window." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Set to a list of languages to be shown by default in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Set to the themed icon name to use for the greeter logo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "Set to true to disable showing known users in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Set to true to disable showing the restart buttons in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Set to true to enable the XRandR settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Set to true to enable the background settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Set to true to enable the media-keys settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Set to true to enable the on-screen keyboard." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -812,31 +785,31 @@ "Set to true to enable the plugin to manage the accessibility keyboard " "settings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Set to true to enable the screen magnifier." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Set to true to enable the screen reader." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Set to true to enable the sound settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Set to true to enable the xsettings settings manager plugin." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Set to true to show the banner message text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Set to true to use Compiz as the window manager." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -844,31 +817,31 @@ "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Text banner message to show in the login window." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True if the XRandR settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True if the background settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "True if the media-keys settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True if the sound settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True if the xsettings settings manager plugin is enabled." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Use Compiz as the window manager" @@ -896,8 +869,8 @@ msgid "Whether the timer is currently ticking" msgstr "האם קוצב הזמן מתקתק" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "התחברות כ־%s" @@ -907,167 +880,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "אחר..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "בחירה בחשבון אחר" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "אורח" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "התחברות כאורח זמני" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "התחברות אוטומטית" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "התחברות אוטומטית למערכת לאחר בחירת אפשרויות" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "כבר מחובר" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "תפריט להחלפה מהירה בין המשתמשים." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Yaron Shahrabani \n" -"פרויקט תרגום GNOME לעברית\n" -"‏http://gnome-il.brelios.de" - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "לא ניתן לנעול את המסך: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "לא ניתן להגדיר את שומר המסך באופן זמני למסך ריק: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "לא ניתן לנתק: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "זמין" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "בלתי נראה" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "עסוק" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "מרוחק" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "פרטי החשבון" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "העדפות המערכת" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "נעילת המסך" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "החלפת משתמש" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "יציאה..." - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "יישומון החלפת משתמשים" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "שינוי הגדרות המצב והחשבון" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "תפריט להחלפה מהירה בין המשתמשים" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "מחליף משתמשים" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "User Switcher Applet Factory" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "עריכת _פרטים אישיים" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "על _אודות" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_עריכת משתמשים וקבוצות" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Only the VERSION command is supported" @@ -1103,15 +944,144 @@ msgid "Unable to start new display" msgstr "Unable to start new display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "המסך צולם" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "צילום המסך" +#~ msgid "Keyboard layouts" +#~ msgstr "פריסות מקלדת" + +#~ msgid "_Keyboard:" +#~ msgstr "_מקלדת:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "אחר..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "נא לבחור פריסת מקלדת מתוך הרשימה המלאה של הפריסות הזמינות." + +#~ msgid "Keyboard" +#~ msgstr "מקלדת" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Recently selected keyboard layouts" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." + +#~ msgid "Shutdown Options…" +#~ msgstr "אפשרויות כיבוי..." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "תפריט להחלפה מהירה בין המשתמשים." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Yaron Shahrabani \n" +#~ "פרויקט תרגום GNOME לעברית\n" +#~ "‏http://gnome-il.brelios.de" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "לא ניתן לנעול את המסך: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "לא ניתן להגדיר את שומר המסך באופן זמני למסך ריק: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "לא ניתן לנתק: %s" + +#~ msgid "Available" +#~ msgstr "זמין" + +#~ msgid "Invisible" +#~ msgstr "בלתי נראה" + +#~ msgid "Busy" +#~ msgstr "עסוק" + +#~ msgid "Away" +#~ msgstr "מרוחק" + +#~ msgid "Account Information" +#~ msgstr "פרטי החשבון" + +#~ msgid "System Preferences" +#~ msgstr "העדפות המערכת" + +#~ msgid "Lock Screen" +#~ msgstr "נעילת המסך" + +#~ msgid "Switch User" +#~ msgstr "החלפת משתמש" + +#~ msgid "Quit…" +#~ msgstr "יציאה..." + +#~ msgid "User Switch Applet" +#~ msgstr "יישומון החלפת משתמשים" + +#~ msgid "Change account settings and status" +#~ msgstr "שינוי הגדרות המצב והחשבון" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "תפריט להחלפה מהירה בין המשתמשים" + +#~ msgid "User Switcher" +#~ msgstr "מחליף משתמשים" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "User Switcher Applet Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "עריכת _פרטים אישיים" + +#~ msgid "_About" +#~ msgstr "על _אודות" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_עריכת משתמשים וקבוצות" + #~ msgid "Unknown" #~ msgstr "לא ידוע" diff -Nru gdm-2.32.1/po/hi.po gdm-3.0.0/po/hi.po --- gdm-2.32.1/po/hi.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/hi.po 2011-04-04 14:37:16.000000000 +0000 @@ -4,21 +4,23 @@ # # G Karunakar , 2003. # Ravishankar Shrivastava , 2004. -# Rajesh Ranjan , 2005, 2006, 2008, 2009, 2010. +# Rajesh Ranjan , 2005, 2006, 2008, 2009, 2010, 2011. # Rajesh Ranjan , 2009. msgid "" msgstr "" "Project-Id-Version: gdm.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-29 09:37+0000\n" -"PO-Revision-Date: 2010-07-30 12:57+0530\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=gdm&component=general\n" +"POT-Creation-Date: 2011-02-17 16:55+0000\n" +"PO-Revision-Date: 2011-02-28 14:59+0530\n" "Last-Translator: Rajesh Ranjan \n" "Language-Team: Hindi \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" -"Plural-Forms: nplurals=2; plural=(n!=1);\n\n" +"X-Generator: Lokalize 1.1\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"\n" "\n" "\n" "\n" @@ -37,7 +39,7 @@ "\n" "\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom वर्ण युक्ति नहीं है" @@ -62,7 +64,7 @@ msgid "could not find user \"%s\" on system" msgstr "तंत्र पर \"%s\" उपयोक्ता नहीं पा सका" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "लॉगिन तंत्र आरंभीकृत करने में असमर्थ" @@ -71,27 +73,25 @@ # is not really an auth problem, but it will # pretty much look as such, it shouldn't really # happen -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "उपयोक्ता सत्यापित करने में असमर्थ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "उपयोक्ता प्राधिकृत करने में असमर्थ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "श्रेय स्थापित करने में असमर्थ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 #| msgid "Unable to authorize user" msgid "Unable to open session" -msgstr "सत्र खोलने में असमर्थ" +msgstr "सत्र खोलने में असमर्थ " -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1259 #| msgid "" #| "Could not start the X server (your graphical environment) due to some " #| "internal error. Please contact your system administrator or check your " @@ -118,26 +118,26 @@ msgstr "%s उपयोक्ता द्वारा सर्वर को शाखित किया गया पर वह उपयोक्ता मौजूद नहीं है" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "%d पर समूह आईडी नियत नहीं कर सका" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s हेतु initgroups() असफल" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "उपयोक्ता आईडी %d हेतु नियत नहीं कर सका" #: ../daemon/gdm-server.c:435 -#, fuzzy, c-format +#, c-format #| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" -msgstr "%s: प्रदर्शक %s हेतु लॉग फ़ाइल नहीं खोल पाया!" +msgstr "%s: प्रदर्शन %s हेतु लॉग फ़ाइल नहीं खोल पाया!" #: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 #: ../daemon/gdm-server.c:458 @@ -179,82 +179,82 @@ msgid "The display device" msgstr "प्रदर्शक युक्ति" -#: ../daemon/gdm-session-worker.c:1309 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1289 +#, c-format #| msgid "error initiating conversation with authentication system - %s" msgid "error initiating conversation with authentication system: %s" msgstr "सत्यापन तंत्र के साथ वार्तालाप शुरू करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1290 msgid "general failure" msgstr "सामान्य विफलता" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1291 msgid "out of memory" msgstr "स्मृति से अधिक" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1292 msgid "application programmer error" msgstr "अनुप्रयोग प्रोग्रामर त्रुटि" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1293 msgid "unknown error" msgstr "अज्ञात त्रुटि" # login: is whacked always translate to Username: -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1300 msgid "Username:" msgstr "उपयोक्ता नाम:" -#: ../daemon/gdm-session-worker.c:1326 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1306 +#, c-format #| msgid "" #| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "वरीय उपयोक्तानाम प्रांप्ट के सत्यापन तंत्र सूचित करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1340 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1320 +#, c-format #| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "उपयोक्ता के मेजबाननाम के सत्यापन तंत्र सूचित करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1355 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1335 +#, c-format #| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "उपयोक्ता के कंसोल के सत्यापन तंत्र सूचित करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1368 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1348 +#, c-format #| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "प्रदर्शन स्ट्रिंग के सत्यापन तंत्र सूचित करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1383 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1363 +#, c-format #| msgid "" #| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "प्रदर्शन xauth श्रेय के सत्यापन तंत्र सूचित करने में त्रुटि - %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677 #, c-format msgid "no user account available" msgstr "कोई उपयोक्ता खाता उपलब्ध नहीं" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1704 msgid "Unable to change to user" msgstr "उपयोक्ता बदलने में असमर्थ" # markup -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "उपयोक्ता %s मौजूद नहीं है." # markup -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "समूह %s मौजूद नहीं है." @@ -397,7 +397,7 @@ msgstr "सर्वर मेजबान नाम नहीं मिला: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 -#, fuzzy, c-format +#, c-format #| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "पीआईडी फ़ाइल %s लिख नहीं सकता: संभवतः डिस्क में खाली जगह नहीं. %s" @@ -450,10 +450,9 @@ msgstr "सभी चेतावनी गंभीर बनाएँ" #: ../daemon/main.c:534 -#, fuzzy #| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" -msgstr "समय के बाद बाहर - डिबगिंग के लिए" +msgstr "एक समय के बाद बाहर - डिबगिंग के लिए" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -465,7 +464,6 @@ #. make sure the pid file doesn't get wiped #: ../daemon/main.c:616 -#, fuzzy #| msgid "Only root wants to run GDM" msgid "Only the root user can run GDM" msgstr "सिर्फ रूट उपयोक्ता जीडीएम चला सकता है" @@ -478,13 +476,12 @@ msgstr "गनोम डिस्प्ले प्रबंधक सत्र वर्कर" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#, fuzzy #| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" -msgstr "AT SPI रजिस्ट्री रैपर" +msgstr "AT-SPI रजिस्ट्री रैपर" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753 msgid "Login Window" msgstr "लॉगइन विंडो" @@ -509,13 +506,11 @@ msgstr "स्क्रीन का कुछ हिस्सा आवर्द्धित करें" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#, fuzzy #| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "GNOME ऑनस्क्रीन कुंजीपट" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#, fuzzy #| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "ऑनस्क्रीन कुंजीपट का प्रयोग करें" @@ -536,7 +531,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit सत्यापन प्रतिनिधि" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "तंत्र चुनें" @@ -548,36 +543,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: एक्सडीएमसीपी शीर्षिका पढ़ नहीं सका!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "मान" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "समय प्रतिशत पूर्ण" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "निष्क्रिय पाठ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "लेबल में प्रयोग के लिए पाठ यदि उपयोक्ता ने किसी मद को अब तक चुना नहीं है" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "सक्रिय पाठ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "लेबल में प्रयोग के लिए पाठ यदि उपयोक्ता ने किसी मद को चुना है" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "दृश्य सूचीबद्ध करें" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 -#, fuzzy +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 #| msgid "Whether or not the chooser list is visible" msgid "Whether the chooser list is visible" msgstr "क्या चयनक सूची दृश्य नहीं है" @@ -586,7 +580,6 @@ #. * the date and time with seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 -#, fuzzy #| msgid "%l:%M:%S %p" msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" @@ -595,7 +588,6 @@ #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 -#, fuzzy #| msgid "%l:%M %p" msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" @@ -604,7 +596,6 @@ #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 -#, fuzzy #| msgid "%l:%M:%S %p" msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" @@ -613,77 +604,78 @@ #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 -#, fuzzy #| msgid "%l:%M %p" msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 #| msgid "Automatically logging in..." msgid "Automatically logging in…" msgstr "स्वचालित लॉग इन..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 msgid "Select language and click Log In" msgstr "भाषा चुनें और लॉगिन क्लिक करें" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 #| msgid "Cancelling..." msgid "Cancelling…" msgstr "रद्द कर रहा है..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 +msgctxt "customsession" +msgid "Custom" +msgstr "मनपसंदमनपसिन" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 +msgid "Custom session" +msgstr "मनपसंद सत्र" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "रद्द करें" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "कम्प्यूटर नाम" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 #| msgid "Log In" msgid "Login" msgstr "लॉगिन" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" -msgstr "" +msgstr "खोलें" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "संस्करण" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "पटल" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "स्थगित" # gnome-session/session-properties.c:173 -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "पुनः आरंभ करें" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "बंद करें" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "अज्ञात समय शेष" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "पटल" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "भाषा" @@ -699,7 +691,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#, fuzzy #| msgctxt "language" #| msgid "Other..." msgctxt "language" @@ -711,45 +702,14 @@ msgstr "उपलब्ध भाषाओं की सूची से भाषा चुनें." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#, fuzzy #| msgid "Languages" msgid "Language" msgstr "भाषा" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "अविशिष्ट" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "कुंजीपट लेआउट" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "कुंजीपट (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#, fuzzy -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "अन्य..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "उपलब्ध लेआउट की पूरी सूची से कुंजीपट लेआउट चुनें." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#, fuzzy -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "कुंजीपट" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "पाठ लेबल करें" @@ -771,7 +731,6 @@ msgstr "तयशुदा मद" #: ../gui/simple-greeter/gdm-option-widget.c:523 -#, fuzzy #| msgid "The id of the default item" msgid "The ID of the default item" msgstr "तयशुदा मद की आईडी" @@ -785,7 +744,7 @@ msgstr "सूची में रखने के लिए मदों की अधिकतम संख्या" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 -#, fuzzy, c-format +#, c-format #| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "दूरस्थ लॉगिन (%s में जोड़ रहा है...)" @@ -800,7 +759,6 @@ msgstr "दूरस्थ लॉगिन" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#, fuzzy #| msgid "_Sessions:" msgid "Session" msgstr "सत्र" @@ -849,94 +807,79 @@ msgstr "ग्रीटर लोगो के प्रयोग के लिए प्रतीक नाम" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "हालिया चुना कुंजीपट लेआउट" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "हालिया चुनी भाषा" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#, fuzzy -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "लॉगिन विंडो पर तयशुदा रूप से कुंजीपट लेआउट की सूची सेट करें." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 #| msgid "" #| "Set to a list of languages to be shown by default at the login window." msgid "Set to a list of languages to be shown by default in the login window." msgstr "लॉगिन विंडो पर तयशुदा रूप से भाषा सूची में सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "ग्रीटर लोगो के लिए प्रयोग के लिए प्रसंग प्रतीक नाम में सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." -msgstr "निष्क्रिय दिखाने के लिए सही पर सेट करें जो ज्ञात उपयोक्ता को लॉगिन विंडो में दिखाने के लिए." +msgstr "" +"निष्क्रिय दिखाने के लिए सही पर सेट करें जो ज्ञात उपयोक्ता को लॉगिन विंडो में दिखाने के लिए." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "निष्क्रिय दिखाने के लिए सही पर सेट करें जो फिर आरंभ करें बटन को लॉगिन विंडो में दिखाने के " "लिए." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 #| msgid "Set to true to enable the xrandr settings manager plugin." msgid "Set to true to enable the XRandR settings manager plugin." -msgstr "xrandr सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." +msgstr "XRandR सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "पृष्ठभूमि सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "मीडिया कुंजी सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "ऑन स्क्रीन कुंजीपट सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "पहुँच कुंजी सेटिंग प्रबंधित करने के लिए प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "स्क्रीन आवर्द्धक सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "स्क्रीन रीडर सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "आवाज सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings सेटिंग प्रबंधक प्लगिन सक्रिय करने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "बैनर संदेश पाठ दिखाने के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 #| msgid "Set to true to use compiz as the window manager." msgid "Set to true to use Compiz as the window manager." msgstr "विंडो प्रबंधक के रूप में कोंपिज प्रयोग के लिए सही पर सेट करें." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 #| msgid "" #| "Text banner message to show on the login window when the user chooser is " #| "empty, instead of banner_message_text." @@ -947,36 +890,33 @@ "लॉगिन विंडो पर दिखाने के लिए पाठ बैनर संदेश जब उपयोक्ता चयनक रिक्त है, " "banner_message_text के अलावे." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 #| msgid "Text banner message to show on the login window." msgid "Text banner message to show in the login window." msgstr "लॉगिन विंडो पर दिखाने के लिए पाठ बैनर संदेश." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 #| msgid "True if the xrandr settings manager plugin is enabled." msgid "True if the XRandR settings manager plugin is enabled." -msgstr "सही यदि xrandr सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." +msgstr "सही यदि XRandR सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "सही यदि पृष्ठभूमि सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "सही यदि मीडिया कुंजी सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "सही यदि आवाज सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "सही यदि xsettings सेटिंग प्रबंधक प्लगिन सक्रिय किया जाता है." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 #| msgid "Use compiz as the window manager" msgid "Use Compiz as the window manager" msgstr "विंडो प्रबंधक के रूप में कोंपिज का प्रयोग करें" @@ -1003,13 +943,12 @@ msgstr "क्या यह चल रहा है?" #: ../gui/simple-greeter/gdm-timer.c:166 -#, fuzzy #| msgid "Whether or not the timer is currently ticking" msgid "Whether the timer is currently ticking" msgstr "क्या टाइमर अभी चल रहा है या नहीं" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 #, c-format msgid "Log in as %s" msgstr "बतौर %s लॉगिन हों" @@ -1019,179 +958,39 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 #| msgctxt "user" #| msgid "Other..." msgctxt "user" msgid "Other…" msgstr "अन्य..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 msgid "Choose a different account" msgstr "कोई अलग खाता चुनें" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 msgid "Guest" msgstr "अतिथि" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 #| msgid "Login as a temporary guest" msgid "Log in as a temporary guest" msgstr "अस्थायी अतिथि के रूप में लॉगिन करें" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 msgid "Automatic Login" msgstr "स्वचालित लॉगिन" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 #| msgid "Automatically login to the system after selecting options" msgid "Automatically log into the system after selecting options" msgstr "विकल्प चुनने के बाद तंत्र में स्वतः लॉगिन हों" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 msgid "Currently logged in" msgstr "अभी लॉगिन" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"यह प्रोग्राम को इस आशा से वितरित किया गया है कि यह उपयोगी होगा, लेकिन बिना किसी " -"वारंटी के; यहां तक कि बिना किसी मर्केंटेबिलिटी या खास उद्देश्य के लिए फिटनेस की वारंटी " -"के. GNU जनरल पब्लिक लाइसेंस को अधिक विस्तार के लिए देखें." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"आपको GNU जनरल पब्लिक लाइसेंस की एक कॉपी इस प्रोग्राम के साथ प्राप्त करनी चाहिए; यदि " -"नहीं, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " -"Boston, MA 02110-1301, USA को लिखें." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "उपयोक्ता के बीच तेजी से आने-जाने के लिए मेन्यू" - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "राजेश रंजन (rranjan@redhat.com, rajesh672@gmail.com)" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "स्क्रीन लॉक नहीं कर सकता है: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "खाली स्क्रीन में स्क्रीनसेवर को अस्थायी रूप से सेट नहीं कर सकता है: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, fuzzy, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "लॉगआउट नहीं कर सकता है: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "उपलब्ध" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "अदृश्य" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "व्यस्त" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "दूर" - -#: ../gui/user-switch-applet/applet.c:1122 -#, fuzzy -#| msgid "Account Information..." -msgid "Account Information" -msgstr "खाता सूचना" - -#: ../gui/user-switch-applet/applet.c:1134 -#, fuzzy -#| msgid "System Preferences..." -msgid "System Preferences" -msgstr "तंत्र वरीयता" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "स्क्रीन बंद करें" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "उपयोक्ता बदलें" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "अज्ञात" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "उपयोक्ता स्विच एप्पलेट" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "खाता सेटिंग व स्थिति बदलें" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "उपयोक्ता के बीच तेजी से बदलने के लिए मेन्यू" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "उपयोक्ता स्विचर" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "उपयोक्ता स्विचर एप्पलेट फैक्टरी" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "निजी सूचना संपादित करें (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "परिचय (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "उपयोक्ता व समूह संपादित करें (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "केवल VERSION कमांड समर्थित हैं" @@ -1202,10 +1001,9 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#, fuzzy #| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" -msgstr "अनदेखा किया गया - सुसंगतता के लिए" +msgstr "अनदेखा किया गया - सुसंगतता के लिए बनाए रखा गया" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 msgid "Debugging output" @@ -1230,12 +1028,146 @@ msgid "Unable to start new display" msgstr "नया प्रदर्शक आरंभ करने में असमर्थ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "स्क्रीनशॉट लिया गया" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "स्क्रीन की तस्वीर उतारें" +#~ msgid "Keyboard layouts" +#~ msgstr "कुंजीपट लेआउट" + +#~ msgid "_Keyboard:" +#~ msgstr "कुंजीपट (_K):" + +#, fuzzy +#~| msgctxt "keyboard" +#~| msgid "Other..." +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "अन्य..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "उपलब्ध लेआउट की पूरी सूची से कुंजीपट लेआउट चुनें." + +#, fuzzy +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "कुंजीपट" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "हालिया चुना कुंजीपट लेआउट" + +#, fuzzy +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "लॉगिन विंडो पर तयशुदा रूप से कुंजीपट लेआउट की सूची सेट करें." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "यह प्रोग्राम को इस आशा से वितरित किया गया है कि यह उपयोगी होगा, लेकिन बिना " +#~ "किसी वारंटी के; यहां तक कि बिना किसी मर्केंटेबिलिटी या खास उद्देश्य के लिए फिटनेस की " +#~ "वारंटी के. GNU जनरल पब्लिक लाइसेंस को अधिक विस्तार के लिए देखें." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "आपको GNU जनरल पब्लिक लाइसेंस की एक कॉपी इस प्रोग्राम के साथ प्राप्त करनी चाहिए; " +#~ "यदि नहीं, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " +#~ "Boston, MA 02110-1301, USA को लिखें." + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "उपयोक्ता के बीच तेजी से आने-जाने के लिए मेन्यू" + +#~ msgid "translator-credits" +#~ msgstr "राजेश रंजन (rranjan@redhat.com, rajesh672@gmail.com)" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "स्क्रीन लॉक नहीं कर सकता है: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "खाली स्क्रीन में स्क्रीनसेवर को अस्थायी रूप से सेट नहीं कर सकता है: %s" + +#, fuzzy +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "लॉगआउट नहीं कर सकता है: %s" + +#~ msgid "Available" +#~ msgstr "उपलब्ध" + +#~ msgid "Invisible" +#~ msgstr "अदृश्य" + +#~ msgid "Busy" +#~ msgstr "व्यस्त" + +#~ msgid "Away" +#~ msgstr "दूर" + +#, fuzzy +#~| msgid "Account Information..." +#~ msgid "Account Information" +#~ msgstr "खाता सूचना" + +#, fuzzy +#~| msgid "System Preferences..." +#~ msgid "System Preferences" +#~ msgstr "तंत्र वरीयता" + +#~ msgid "Lock Screen" +#~ msgstr "स्क्रीन बंद करें" + +#~ msgid "Switch User" +#~ msgstr "उपयोक्ता बदलें" + +#~ msgid "Unknown" +#~ msgstr "अज्ञात" + +#~ msgid "User Switch Applet" +#~ msgstr "उपयोक्ता स्विच एप्पलेट" + +#~ msgid "Change account settings and status" +#~ msgstr "खाता सेटिंग व स्थिति बदलें" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "उपयोक्ता के बीच तेजी से बदलने के लिए मेन्यू" + +#~ msgid "User Switcher" +#~ msgstr "उपयोक्ता स्विचर" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "उपयोक्ता स्विचर एप्पलेट फैक्टरी" + +#~ msgid "Edit Personal _Information" +#~ msgstr "निजी सूचना संपादित करें (_I)" + +#~ msgid "_About" +#~ msgstr "परिचय (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "उपयोक्ता व समूह संपादित करें (_E)" diff -Nru gdm-2.32.1/po/hu.po gdm-3.0.0/po/hu.po --- gdm-2.32.1/po/hu.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/hu.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,5 +1,5 @@ # Hungarian translation of gdm. -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the gdm package. # # Szabolcs Ban , 1999. @@ -8,17 +8,18 @@ # Andras Timar , 2001, 2002, 2003. # Gabor Sari , 2003, 2004. # Laszlo Dvornik , 2004, 2005. -# Gabor Kelemen , 2004, 2005, 2006, 2007, 2008, 2009, 2010. +# Gabor Kelemen , 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. # Attila Szervác as sas-guest see : , 2006. # Kováts Dóra , 2008. msgid "" msgstr "" "Project-Id-Version: gdm master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-25 15:43+0100\n" -"PO-Revision-Date: 2010-08-28 08:18+0200\n" +"POT-Creation-Date: 2011-03-18 17:19+0100\n" +"PO-Revision-Date: 2011-03-18 17:20+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -52,28 +53,28 @@ msgid "could not find user \"%s\" on system" msgstr "„%s” nevű felhasználó nem található a rendszeren" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "A bejelentkező képernyő előkészítése sikertelen" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "A felhasználó nem hitelesíthető" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "A felhasználó nem hitelesíthető" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "A hitelesítési adatok létrehozása sikertelen" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Nem indítható el a környezet" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -97,17 +98,17 @@ "nem létezik" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nem sikerült a csoportazonosítót %d értékre beállítani" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "az initgroups () meghiúsult a következőhöz: %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nem sikerült a felhasználói azonosítót %d értékre beállítani" @@ -157,77 +158,75 @@ msgid "The display device" msgstr "A képernyő" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "hiba a hitelesítőrendszerrel való kommunikáció indítása közben: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "hiba a hitelesítőrendszerrel való kommunikáció indítása közben – %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "általános hiba" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "elfogyott a memória" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "alkalmazásprogramozási hiba" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "Ismeretlen hiba" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Felhasználónév:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "hiba a hitelesítőrendszer értesítésekor a felhasználó által választott " "parancsorról: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "hiba a hitelesítőrendszer értesítésekor a felhasználó gépnevéről: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" -msgstr "" -"hiba a hitelesítőrendszer értesítésekor a felhasználó termináljáról: %s" +msgstr "hiba a hitelesítőrendszer értesítésekor a felhasználó termináljáról: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" -msgstr "" -"hiba a hitelesítőrendszer értesítésekor a megjelenítő-karakterláncról: %s" +msgstr "hiba a hitelesítőrendszer értesítésekor a megjelenítő-karakterláncról: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "hiba a hitelesítőrendszer értesítésekor a kijelző xauth hitelesítési " "adatairól: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nem létezik felhasználói fiók" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Nem lehet a felhasználóra váltani" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "A(z) %s felhasználó nem létezik" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "A(z) %s csoport nem létezik" @@ -372,8 +371,7 @@ #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" -msgstr "" -"Nem írható a(z) %s PID fájl: lehetséges, hogy elfogyott a lemezterület: %s" +msgstr "Nem írható a(z) %s PID fájl: lehetséges, hogy elfogyott a lemezterület: %s" #: ../daemon/main.c:271 #, c-format @@ -454,7 +452,7 @@ msgstr "AT-SPI nyilvántartás-átalakító" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1646 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Bejelentkezési ablak" @@ -466,6 +464,10 @@ msgid "Power management daemon" msgstr "Energiakezelő démon" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME munkamenet gyorsítás-ellenőrző" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME beállításdémon" @@ -502,7 +504,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit hitelesítési ügynök" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Válasszon rendszert" @@ -514,38 +516,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nem olvasható az XDMCP fejléc!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Érték" # fixme -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "eltelt idő százaléka" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inaktív szöveg" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" -msgstr "" -"A címkében használandó szöveg, ha a felhasználó még nem választott ki elemet" +msgstr "A címkében használandó szöveg, ha a felhasználó még nem választott ki elemet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktív szöveg" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "" -"A címkében használandó szöveg, ha a felhasználó már kiválasztott egy elemet" +msgstr "A címkében használandó szöveg, ha a felhasználó már kiválasztott egy elemet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "A lista látható" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "A választólista látható-e?" @@ -577,65 +577,69 @@ msgid "%a %l:%M %p" msgstr "%a %k.%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automatikus bejelentkezés…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Válasszon nyelvet, és nyomja meg a Bejelentkezés gombot" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Megszakítás…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Egyéni" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Egyéni környezet" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Mégse" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Számítógép neve" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Bejelentkezés" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Feloldás" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Verzió" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Leállítási lehetőségek…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Felfüggesztés" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Újraindítás" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Leállítás" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Egyéni" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Ismeretlen idő van hátra" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Egyéni környezet" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Nyelvek" @@ -663,36 +667,10 @@ msgid "Language" msgstr "Nyelv" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nem definiált" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Billentyűzetkiosztások" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "Bille_ntyűzet:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Más…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Válasszon egy billentyűzetkiosztást az elérhető kiosztások teljes listájából." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Billentyűzet" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Szöveg címkéje" @@ -786,92 +764,76 @@ msgstr "Az üdvözlő logójaként használandó ikon neve" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nemrég használt billentyűzetkiosztások" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nemrég használt nyelvek" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"A bejelentkezési ablakban alapértelmezésben megjelenítendő " -"billentyűzetkiosztások listája." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." -msgstr "" -"A bejelentkezési ablakban alapértelmezésben megjelenítendő nyelvek listája." +msgstr "A bejelentkezési ablakban alapértelmezésben megjelenítendő nyelvek listája." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Az üdvözlőlogóhoz használandó témázott ikon neve." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Állítsa igazra az ismert felhasználók megjelenítésének letiltásához a " "bejelentkezési ablakban." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Állítsa igazra az újraindítás gombok megjelenítésének letiltásához a " "bejelentkezési ablakban." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Állítsa igazra az XRandR-beállításkezelő bővítmény engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." -msgstr "" -"Állítsa igazra a háttér beállításait kezelő bővítmény engedélyezéséhez." +msgstr "Állítsa igazra a háttér beállításait kezelő bővítmény engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "" -"Állítsa igazra a médiabillentyűbeállítás-kezelő bővítmény engedélyezéséhez." +msgstr "Állítsa igazra a médiabillentyűbeállítás-kezelő bővítmény engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Állítsa igazra a képernyő-billentyűzet engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." -msgstr "" -"Állítsa igazra az akadálymentes billentyűzet beállításainak engedélyezéséhez." +msgstr "Állítsa igazra az akadálymentes billentyűzet beállításainak engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Állítsa igazra a képernyőnagyító engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Állítsa igazra a képernyőolvasó engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Állítsa igazra a hangbeállítás-kezelő bővítmény engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "" -"Állítsa igazra az xsettings beállításkezelő bővítmény engedélyezéséhez." +msgstr "Állítsa igazra az xsettings beállításkezelő bővítmény engedélyezéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Állítsa igazra a fejléc szövegének megjelenítéséhez." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Állítsa igazra a Compiz használatához ablakkezelőként." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -879,31 +841,31 @@ "A bejelentkezési ablakban megjelenítendő fejlécszöveg, ha a " "felhasználóválasztó üres, a banner_message_text helyett." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "A bejelentkezési ablakban megjelenítendő fejlécszöveg." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Igaz, ha az XRandR-beállításkezelő bővítmény engedélyezve van." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Igaz, ha a háttérképbeállítás-kezelő bővítmény engedélyezve van." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Igaz, ha a médiabillentyűbeállítás-kezelő bővítmény engedélyezve van." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Igaz, ha a hangbeállítás-kezelő bővítmény engedélyezve van." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Igaz, ha az xsettings beállításkezelő bővítmény engedélyezve van." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "A Compiz használata ablakkezelőként" @@ -931,8 +893,8 @@ msgid "Whether the timer is currently ticking" msgstr "Az időzítő visszaszámol-e?" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Bejelentkezés mint %s" @@ -942,174 +904,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Más…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Válasszon másik felhasználói fiókot" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Vendég" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Bejelentkezés ideiglenes vendégként" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatikus bejelentkezés" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automatikus bejelentkezés a rendszerbe a beállítások kiválasztása után" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Be van jelentkezve" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"A felhasználóváltó kisalkalmazás szabad szoftver, terjesztheti és/vagy " -"módosíthatja a Free Software Foundation által kiadott GNU General Public " -"License második (vagy bármely későbbi) változatában foglaltak alapján." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"A programot abban a reményben terjesztjük, hogy hasznos lesz, de nem " -"vállalunk SEMMIFÉLE GARANCIÁT, még olyan értelemben sem, hogy a program " -"alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " -"részletekért tanulmányozza a GNU GPL licencet." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"A programhoz a GNU General Public License egy példánya is jár, ha nem kapta " -"meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 Franklin St, " -"Fifth Floor, Boston, MA 02110-1301, USA." - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Menü a felhasználók közti gyors váltáshoz" - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Bán Szabolcs \n" -"Czakó Krisztián \n" -"Dvornik László \n" -"Kelemen Gábor \n" -"Kovács Emese \n" -"Kováts Dóra \n" -"Sári Gábor \n" -"Szervác Attila \n" -"Tímár András " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nem lehet zárolni a képernyőt: %s " - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Átmenetileg nem lehet beállítani a képernyővédőt a képernyő elsötétítésére: %" -"s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Nem lehet kijelentkezni: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Elérhető" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Láthatatlan" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Elfoglalt" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Távol" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Fiókinformációk" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Rendszerbeállítások" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Képernyő zárolása" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Felhasználóváltás" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Kilépés…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Felhasználóváltás" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Fiókbeállítások és -állapot módosítása" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Menü a felhasználók közti gyors váltáshoz" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Felhasználóváltás" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Felhasználóváltás kisalkalmazás factory" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Személyes _információk szerkesztése" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Névjegy" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Felhasználók és csoportok szerkesztése" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Csak a VERZIÓ parancs támogatott" @@ -1145,14 +968,12 @@ msgid "Unable to start new display" msgstr "Nem indítható új képernyő" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "A képernyőkép elkészült" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Kép készítése a képernyőről" -#~ msgid "Unknown" -#~ msgstr "Ismeretlen" diff -Nru gdm-2.32.1/po/id.po gdm-3.0.0/po/id.po --- gdm-2.32.1/po/id.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/id.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,25 +1,24 @@ -# translation of gdm.master.po to Indonesian -# Indonesian translation of gdm. +# Translation of gdm.master.po to Bahasa Indonesian # Copyright (C) 2004 THE gdm's COPYRIGHT HOLDER # This file is distributed under the same license as the gdm package. -# -=Dicky Wahyu Purnomo=- # +# -=Dicky Wahyu Purnomo=- # Mohammad DAMT , 2004. # ahmad riza h nst , 2005. -# Dirgita , 2010. -# Dirgita , 2010. +# Dirgita , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-31 18:28+0000\n" -"PO-Revision-Date: 2010-08-28 18:50+0700\n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-02-01 22:31+0700\n" "Last-Translator: Dirgita \n" -"Language-Team: Indonesian \n" +"Language-Team: GNOME Indonesian Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: id\n" "X-Poedit-Language: Indonesian\n" "X-Poedit-Country: Indonesia\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -51,28 +50,28 @@ msgid "could not find user \"%s\" on system" msgstr "tidak menemukan pengguna \"%s\" pada sistem" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Tidak dapat menginisialisasi sistem log masuk" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Tidak dapat mengotentikasi pengguna" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Tidak dapat mengotorisasi pengguna" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Tidak dapat membangun kredensial" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Tidak dapat membukan sesi" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -95,17 +94,17 @@ msgstr "Server mestinya dijalankan oleh %s, tetapi pengguna tersebut tidak ada" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Tidak dapat menentukan ID kelompok menjadi %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () gagal untuk %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Tidak dapat menentukan ID pengguna menjadi %d" @@ -155,74 +154,73 @@ msgid "The display device" msgstr "Perangkat tampilan" -#: ../daemon/gdm-session-worker.c:1310 -#, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "galat mengawali percakapan dengan sistem otentikasi: %s" +#: ../daemon/gdm-session-worker.c:1066 +msgid "error initiating conversation with authentication system - %s" +msgstr "galat saat mengawali percakapan dengan sistem otentikasi - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "kegagalan umum" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "kehabisan memori" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "galat pemrogram aplikasi" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "galat tak dikenal" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Nama Pengguna:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "galat memberitahu sistem otentikasi tentang sapaan nama pengguna yang " "disukai: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "galat memberitahu sistem otentikasi tentang nama host pengguna: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "galat memberitahu sistem otentikasi tentang konsol pengguna: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "galat memberitahu sistem otentikasi tentang kalimat tampilan: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "galat memberitahu sistem otentikasi tentang kredensial xauth tampilan: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "akun pengguna tidak tersedia" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Tidak dapat berganti pengguna" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Pengguna %s tidak ada" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Kelompok %s tidak ada" @@ -450,7 +448,7 @@ msgstr "Pembungkus Registri AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Jendela Log Masuk" @@ -462,6 +460,10 @@ msgid "Power management daemon" msgstr "Daemon manajemen daya" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Pemeriksa Akselerasi Sesi GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Daemon Pengaturan GNOME" @@ -498,7 +500,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agen Otentikasi PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Pilih Sistem" @@ -510,35 +512,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Tidak dapat membaca tajuk XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Nilai" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "persentase waktu lengkap" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Teks Tak Aktif" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Teks yang dipakai pada label bila pengguna belum memilih" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Teks Aktif" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Teks yang dipakai pada label bila pengguna telah memilih" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Daftar Nampak" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Menentukan terlihatnya daftar pilih" @@ -570,65 +572,69 @@ msgid "%a %l:%M %p" msgstr "%a %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Otomatis masuk..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Pilih bahasa dan klik Masuk" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Membatalkan..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Ubahan" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sesi ubahan" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Batal" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nama Komputer" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Log Masuk" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Buka Kunci" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opsi Mematikan Mesin..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspensi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Hidupkan Ulang" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Matikan" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Ubahan" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Sisa waktu tak diketahui" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sesi ubahan" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Bahasa" @@ -656,36 +662,10 @@ msgid "Language" msgstr "Bahasa" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Tak dinyatakan" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tata letak papan ketik" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "Papan _Ketik:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Lainnya..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Memilih tata letak papan ketik dari daftar lengkap tata letak yang tersedia." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Papan Ketik:" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Teks Label" @@ -777,65 +757,54 @@ msgstr "Nama ikon untuk logo penyapa" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Tata letak papan ketik yang baru-baru ini dipilih" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Bahasa yang dipilih baru-baru ini" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Tata ke daftar tata letak papan tik yang ditampilkan secara baku pada " -"jendela login." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Tata ke daftar bahasa yang ditampilkan secara baku pada jendela login." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Isi dengan nama ikon tema untuk digunakan sebagai logo pembuka/penyambut." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Isi dengan nilai benar (true) untuk tidak menampilkan daftar pengguna yang " "dikenal pada jendela log masuk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Isi dengan nilai benar (true) untuk tidak menampilkan tombol hidupkan ulang " "komputer pada jendela log masuk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan plugin pengelola penataan " "XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan plugin manajer penataan " "latar belakang." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan plugin manajer penataan " "kunci media." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan papan ketik pada layar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -843,38 +812,38 @@ "Isi dengan nilai benar (true) untuk mengaktifkan plugin untuk mengelola " "penataan papan kunci aksesibilitas." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan pembesar tampilan layar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Isi dengan nilai benar (true) untuk mengaktifkan pembaca layar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan plugin pengelola penataan " "suara." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Isi dengan nilai benar (true) untuk mengaktifkan plugin pengelola penataan " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Isi dengan nilai benar (true) untuk menampilkan teks pesan banner." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" "Isi dengan nilai benar (true) untuk menggunakan Compiz sebagai manajer " "jendela." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -882,31 +851,31 @@ "Pesan banner teks untuk ditampilkan pada jendela login ketika pemilih " "pengguna kosong, alih-alih banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Pesan yang ditampilkan pada jendela log masuk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True bila plugin manajer penataan XRandR diaktifkan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True bila plugin manajer penataan latar belakang diaktifkan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "True bila plugin manajer penataan kunci media diaktifkan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True bila plugin manajer penataan suara diaktifkan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True bila plugin manajer penataan xsettings diaktifkan." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Menggunakan Compiz sebagai manajer jendela" @@ -934,8 +903,8 @@ msgid "Whether the timer is currently ticking" msgstr "Apakah pewaktu sekarang sedang berjalan" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Masuk sebagai %s" @@ -945,173 +914,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Lainnya..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Memilih akun lainnya" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Tamu" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Masuk sebagai tamu untuk sementara" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Masuk Otomatis" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Otomatis masuk ke dalam sistem setelah memilih opsi" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Saat ini sudah masuk" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Aplet Pindah Cepat Pengguna adalah perangkat lunak bebas; Anda dapat " -"menyebar ulang dan/atau mengubahnya dibawah persyaratan GNU General Public " -"License sebagaimana dipublikasikan oleh Free Software Foundation; versi 2 " -"dari Lisensi, atau (sesuai pilihan Anda) sebarang versi selanjutnya." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Program ini didistribusikan dengan harapan dapat berguna, tetapi TANPA " -"ADANYA JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK TUJUAN " -"TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Anda seharusnya menerima salinan dari GNU General Public License bersama " -"Nautilus; jika tidak, kirimkan surat Anda ke Free Software Foundation, Inc., " -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Menu untuk berpindah cepat antarpengguna." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Dicky Wahyu Purnomo .\n" -"Mohammad DAMT , 2004.\n" -"Ahmad Riza H Nst , 2005.\n" -"Andika Triwidada , 2009.\n" -"Dirgita , 2010." - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Tidak dapat mengunci layar: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Untuk sementara tidak dapat membuat screensaver menjadi layar kosong: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Tidak bisa keluar: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Tersedia" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Tidak Terlihat" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Sibuk" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Pergi" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informasi Akun" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Preferensi Sistem" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Kunci Layar" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Pindah Pengguna" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Keluar..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Tidak Dikenal" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Aplet Pindah Pengguna" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Mengubah pengaturan serta status akun" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Menu untuk berpindah pengguna dengan cepat" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Pengalih Pengguna" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Pabrik Aplet Pengalih Pengguna" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Sunting _Informasi Pribadi" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "Tent_ang" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Sunting P_engguna dan Kelompok" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Hanya perintah VERSI yang didukung" @@ -1147,11 +978,11 @@ msgid "Unable to start new display" msgstr "Tidak dapat memulai tampilan baru" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Cuplikan layar telah diambil" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Mengambil gambar cuplikan layar" diff -Nru gdm-2.32.1/po/it.po gdm-3.0.0/po/it.po --- gdm-2.32.1/po/it.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/it.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,5 +1,5 @@ -# gdm2, the Gnome Display Manager, Italian translation -# Copyright (C) 200, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Italian translation of gdm +# Copyright (C) 200, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the GDM package. # Daniele Medri , 2000. # Salvo Isaja , 2001. @@ -7,15 +7,16 @@ # Alessio Frusciante , 2003. # Francesco Marletta , 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Milo Casagrande , 2010. +# Claudio Arseni , 2011. msgid "" msgstr "" "Project-Id-Version: gdm2 2.30\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-09-18 04:17+0000\n" -"PO-Revision-Date: 2010-09-18 16:24+0200\n" -"Last-Translator: Milo Casagrande \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-04-01 15:00+0200\n" +"PO-Revision-Date: 2011-03-25 23:20+0100\n" +"Last-Translator: Claudio Arseni \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -46,28 +47,28 @@ msgid "could not find user \"%s\" on system" msgstr "impossibile trovare l'utente \"%s\" nel sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Impossibile inizializzare il sistema di accesso" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Impossibile autenticare l'utente" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Impossibile autorizzare l'utente" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Impossibile stabilire le credenziali" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Impossibile aprire la sessione" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -91,17 +92,17 @@ "Il server doveva essere lanciato dall'utente %s ma questo utente non esiste" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Impossibile impostare il groupid a %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() per %s non riuscita" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Impossibile impostare lo userid a %d" @@ -151,82 +152,82 @@ msgid "The display device" msgstr "Il dispositivo del display" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" -"errore nell'iniziare la conversazione con il sistema di autenticazione: %s" +"errore nell'avvio della conversazione con il sistema di autenticazione: %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "errore generico" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "memoria esaurita" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "errore del programmatore" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "errore sconosciuto" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Utente:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "errore nell'informare il sistema di autenticazione del prompt preferito " "dall'utente: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "errore nell'informare il sistema di autenticazione del nome dell'host " "dell'utente: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "errore nell'informare il sistema di autenticazione della console " "dell'utente: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "errore nell'informare il sistema di autenticazione della stringa del " "display: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "errore nell'informare il sistema di autenticazione delle credenziali xauth " "del display: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nessun account utente disponibile" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Impossibile cambiare utente" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "L'utente %s non esiste" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Il gruppo %s non esiste" @@ -382,8 +383,8 @@ #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" -"Impossibile scrivere il file PID %s, forse per mancanza di spazio su disco: %" -"s" +"Impossibile scrivere il file PID %s, forse per mancanza di spazio su disco: " +"%s" #: ../daemon/main.c:271 #, c-format @@ -463,7 +464,7 @@ msgstr "Adattatore registro AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1638 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Finestra di accesso" @@ -475,6 +476,10 @@ msgid "Power management daemon" msgstr "Demone di gestione dell'alimentazione" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Controllo di accelerazione per la sessione di GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Demone impostazioni di GNOME" @@ -511,7 +516,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agente di autenticazione di PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Seleziona sistema" @@ -525,36 +530,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: impossibile leggere l'intestazione XDMCP." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valore" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "percentuale di tempo completata" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Testo inattivo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Il testo da usare nell'etichetta se l'utente non ha ancora scelto un elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Testo attivo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Il testo da usare nell'etichetta se l'utente ha scelto un elemento" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Elenco visibile" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Indica se l'elenco del chooser è visibile" @@ -590,65 +595,69 @@ msgid "%a %l:%M %p" msgstr "%a %k.%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Accesso automatico..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Selezionare la lingua e fare clic su «Accedi»" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Annullamento..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizzata" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sessione personalizzata" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Annulla" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nome del computer" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Accedi" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Sblocca" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versione" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Pannello" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opzioni di arresto..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Sospendi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Riavvia" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Arresta" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizzata" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Tempo rimanente sconosciuto" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sessione personalizzata" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Pannello" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Lingue" @@ -676,37 +685,10 @@ msgid "Language" msgstr "Lingua" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Non specificato" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Schemi della tastiera" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastiera:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Altre..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Scegliere uno schema di tastiera dall'elenco completo degli schemi " -"disponibili." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tastiera" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Testo etichetta" @@ -799,65 +781,54 @@ msgstr "Nome dell'icona da usare come logo del greeter" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Schemi di tastiera selezionati recentemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Lingue selezionate recentemente" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Impostare a un elenco di disposizioni di tastiera da mostrare in modo " -"predefinito nella finestra di accesso." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Impostare a un elenco di lingue da mostrare in modo predefinito nella " "finestra di accesso." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Impostare col nome dell'icona del tema da usare per il logo del greeter." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Impostare a VERO per disabilitare la visualizzazione degli utenti conosciuti " "nella finestra di accesso." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Impostare a VERO per disabilitare la visualizzazione dei pulsanti di riavvio " "nella finestra di accesso." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Impostare a VERO per abilitare il plugin del gestore impostazioni XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Impostare a VERO per abilitare il plugin del gestore impostazioni dello " "sfondo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Impostare a VERO per abilitare il plugin del gestore impostazioni dei tasti " "multimediali." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Impostare a VERO per abilitare la tastiera a schermo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -865,33 +836,33 @@ "Impostare a VERO per abilitare il plugin per gestire le impostazioni di " "accessibilità della tastiera." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Impostare a VERO per abilitare l'ingranditore dello schermo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Impostare a VERO per abilitare il lettore dello schermo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Impostare a VERO per abilitare il plugin del gestore impostazioni sonore." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Impostare a VERO per abilitare il plugin del gestore impostazioni xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Impostare a VERO per mostrare il testo del messaggio di intestazione." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Impostare a VERO per usare Compiz come gestore delle finestre." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -899,36 +870,36 @@ "Testo del messaggio di intestazione da mostrare nella finestra di accesso " "quando la scelta degli utenti è vuota, invece di banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "" "Testo del messaggio di intestazione da mostrare nella finestra di accesso." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "VERO se il plugin del gestore delle impostazioni XRandR è abilitato." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "VERO se il plugin del gestore delle impostazioni dello sfondo è abilitato." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "VERO se il plugin del gestore delle impostazioni dei tasti multimediali è " "abilitato." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "VERO se il plugin del gestore delle impostazioni sonore è abilitato." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "VERO se il plugin del gestore delle impostazioni xsettings è abilitato." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Usa Compiz come gestore delle finestre" @@ -956,8 +927,8 @@ msgid "Whether the timer is currently ticking" msgstr "Indica se il timer sta attualmente progredendo" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Accesso come %s" @@ -967,167 +938,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Altri..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Scegliere un account diverso" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Ospite" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Accesso come ospite temporaneo" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Accesso automatico" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Accedere automaticamente al sistema dopo aver selezionato le opzioni" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Accesso già effettuato" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"La applet di cambio utente è software libero; è possibile redistribuirla e/o " -"modificarla secondo i termini dalla GNU General Public License pubblicata " -"dalla Free Software Foundation; sia la versione 2 della licenza sia (a tua " -"scelta) qualsiasi versione successiva." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Questo programma è distribuito nella speranza che sia utile, ma SENZA ALCUNA " -"GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o APPLICABILITÀ " -"PER UNO SCOPO PARTICOLARE. Per maggiori dettagli vere la GNU General Public " -"License." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Una copia della GNU General Public License dovrebbe essere stata fornita " -"insieme a questo programma, in caso contrario scrivere a:\n" -" Free Software Foundation, Inc.\n" -" 51 Franklin Street, Fifth Floor, Boston, MA\n" -" 02110-1301 USA" - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Un menù per passare rapidamente da un utente all'altro." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "Francesco Marletta " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Impossibile bloccare lo schermo: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Impossibile impostare temporaneamente il salva schermo allo schermo vuoto: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Impossibile terminare la sessione: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Disponibile" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Invisibile" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Occupato" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Assente" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Informazioni account" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Preferenze di sistema" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Blocca schermo" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Cambio utente" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Esci..." - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Applet cambio utente" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Modifica le impostazioni dell'account e lo stato" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un menù per passare rapidamente da un utente all'altro" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Cambio utente" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Factory dell'applet di cambio utente" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Modifica _informazioni personali" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "I_nformazioni" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Modifica utenti e gruppi" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Solo il comando VERSION è supportato" @@ -1164,17 +1003,11 @@ msgid "Unable to start new display" msgstr "Impossibile avviare un nuovo display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Schermata catturata" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Cattura una immagine dello schermo" - -#~ msgid "Quit..." -#~ msgstr "Esci..." - -#~ msgid "Unknown" -#~ msgstr "Sconosciuto" diff -Nru gdm-2.32.1/po/kk.po gdm-3.0.0/po/kk.po --- gdm-2.32.1/po/kk.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/kk.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: gdm to kazakh\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-13 14:23+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" +"POT-Creation-Date: 2011-01-18 22:43+0000\n" "PO-Revision-Date: \n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -13,23 +13,29 @@ "X-Poedit-Language: Kazakh\n" "X-Poedit-Country: KAZAKHSTAN\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom символдық құрылғы емес" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Дисплей ID" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 -#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 +#: ../daemon/factory-slave-main.c:190 +#: ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 +#: ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Display Manager Slave" @@ -38,38 +44,36 @@ msgid "could not find user \"%s\" on system" msgstr "жүйеден \"%s\" пайдаланушысы табылмады" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 +#: ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "Жүйеге кіру жүйесін іске қосу мүмкін емес" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 +#: ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "Пайдаланушыны анықтау мүмкін емес" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 +#: ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "Пайдаланушыны растау мүмкін емес" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 +#: ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "Нақтылықты тексеру мүмкін емес" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 +#: ../daemon/gdm-simple-slave.c:581 msgid "Unable to open session" msgstr "Сессияны ашу мүмкін емес" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -msgid "" -"Could not start the X server (your graphical environment) due to an internal " -"error. Please contact your system administrator or check your syslog to " -"diagnose. In the meantime this display will be disabled. Please restart GDM " -"when the problem is corrected." -msgstr "" -"X серверін іске қосу мүмкін емес (сіздің графикалық қоршамыңыз), себебі ішкі " -"қатеде. Жүйелік администраторыңызға хабарласыңыз немесе өзіңіздің syslog " -"шығысын тексеріңіз. Бұл экран уақытша сөндіріледі. Мәселе шешілген кезде GDM " -"қызметін қайта қосыңыз." +#: ../daemon/gdm-factory-slave.c:689 +#: ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1267 +msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." +msgstr "X серверін іске қосу мүмкін емес (сіздің графикалық қоршамыңыз), себебі ішкі қатеде. Жүйелік администраторыңызға хабарласыңыз немесе өзіңіздің syslog шығысын тексеріңіз. Бұл экран уақытша сөндіріледі. Мәселе шешілген кезде GDM қызметін қайта қосыңыз." #: ../daemon/gdm-server.c:250 #, c-format @@ -81,18 +85,22 @@ msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "Серверді %s пайдаланушысы қосқан, бірақ ол пайдаланушысы жоқ болып тұр" -#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-server.c:376 +#: ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 +#: ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Groupid мәнін %d-ға орнату қатесі" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 +#: ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s үшін initgroups () қатесі" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 +#: ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Userid мәнін %d-ға орнату қатесі" @@ -102,7 +110,8 @@ msgid "%s: Could not open log file for display %s!" msgstr "%s: %s экраны үшін лог файлын ашу мүмкін емес!" -#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:446 +#: ../daemon/gdm-server.c:452 #: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" @@ -142,75 +151,72 @@ msgid "The display device" msgstr "экран құрылғысы" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1290 #, c-format msgid "error initiating conversation with authentication system: %s" msgstr "пайдаланушыны анықтау жүйесімен алмасу қатесі: %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1291 msgid "general failure" msgstr "жалпы қате" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1292 msgid "out of memory" msgstr "жады жеткіліксіз" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1293 msgid "application programmer error" msgstr "бағдарламалаушы қатесі" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1294 msgid "unknown error" msgstr "белгісіз қате" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1301 msgid "Username:" msgstr "Пайдаланушы:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1307 #, c-format msgid "error informing authentication system of preferred username prompt: %s" -msgstr "" -"аутентификация жүйесіне тандалған пайдаланушы жөнінде хабарлау қатесі: %s" +msgstr "аутентификация жүйесіне тандалған пайдаланушы жөнінде хабарлау қатесі: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1321 #, c-format msgid "error informing authentication system of user's hostname: %s" -msgstr "" -"аутентификация жүйесіне пайдаланушының хост аты жөнінде хабарлау қатесі: %s" +msgstr "аутентификация жүйесіне пайдаланушының хост аты жөнінде хабарлау қатесі: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1336 #, c-format msgid "error informing authentication system of user's console: %s" -msgstr "" -"аутентификация жүйесіне пайдаланушының консолі жөнінде хабарлау қатесі: %s" +msgstr "аутентификация жүйесіне пайдаланушының консолі жөнінде хабарлау қатесі: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1349 #, c-format msgid "error informing authentication system of display string: %s" msgstr "аутентификация жүйесіне экран жолы жөнінде хабарлау қатесі: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1364 #, c-format msgid "error informing authentication system of display xauth credentials: %s" -msgstr "" -"аутентификация жүйесіне экран xauth credentials жөнінде хабарлау қатесі: %s" +msgstr "аутентификация жүйесіне экран xauth credentials жөнінде хабарлау қатесі: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1661 +#: ../daemon/gdm-session-worker.c:1678 #, c-format msgid "no user account available" msgstr "қолжетерлік пайдаланушы тіркелгілер жоқ" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1705 msgid "Unable to change to user" msgstr "Пайдаланушыға ауысу мүмкін емес" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s пайдаланушысы жоқ" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s тобы жоқ" @@ -352,7 +358,8 @@ msgid "Could not get server hostname: %s!" msgstr "Сервердің хост атын алу мүмкін емес: %s!" -#: ../daemon/main.c:237 ../daemon/main.c:250 +#: ../daemon/main.c:237 +#: ../daemon/main.c:250 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "%s PID файлын жазу мүмкін емес: дискіде орын жоқ болуы мүмкін: %s" @@ -375,14 +382,12 @@ #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "" -"Аутентификация %s бумасы пайдаланушы %d, тобы %d иелігінде емес. Тоқтатылады." +msgstr "Аутентификация %s бумасы пайдаланушы %d, тобы %d иелігінде емес. Тоқтатылады." #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "" -"Аутентификация %s бумасының %o рұқсаты қате. %o болуы керек. Тоқтатылады." +msgstr "Аутентификация %s бумасының %o рұқсаты қате. %o болуы керек. Тоқтатылады." #: ../daemon/main.c:409 #, c-format @@ -434,7 +439,7 @@ msgstr "AT-SPI Registry Wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1695 msgid "Login Window" msgstr "Кіру терезесі" @@ -482,7 +487,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit аутентификация агенті" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Жүйені таңдау" @@ -494,35 +499,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP header оқу мүмкін емес!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Мәні" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "орындалған уақыт пайызын көрсету" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 msgid "Inactive Text" msgstr "Белсенді емес мәтін" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Пайдаланушы элементті таңдамаса, белгі мәтіні" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 msgid "Active Text" msgstr "Белсенді мәтін" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 msgid "The text to use in the label if the user has picked an item" msgstr "Пайдаланушы элементті таңдаса, белгі мәтіні" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 msgid "List Visible" msgstr "Көрінетін тізім" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 msgid "Whether the chooser list is visible" msgstr "Таңдау тізімі көріне ма, жоқ па" @@ -563,56 +568,52 @@ msgstr "Тілді тандап, Кіру пернесін шертіңіз" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:693 msgid "Cancelling…" msgstr "Бас тарту..." #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Бас тарту" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Компьютер аты" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Тіркелгі" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Блоктаудан босату" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Нұсқасы" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "Панель" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "Сөндіру опциялары..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:888 msgid "Suspend" msgstr "Ұйықтату" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:893 msgid "Restart" msgstr "Қайта қосу" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:897 msgid "Shut Down" msgstr "Сөндіру" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "Таңдауыңызша" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "Таңдауыңызша сесия" +#: ../gui/simple-greeter/gdm-greeter-panel.c:930 +msgid "Unknown time remaining" +msgstr "Қалған уақыты белгісіз" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:967 +msgid "Panel" +msgstr "Панель" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Тілдер" @@ -640,11 +641,11 @@ msgid "Language" msgstr "Тіл" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:698 msgid "Unspecified" msgstr "Көрсетілмеген" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 +#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:242 msgid "Keyboard layouts" msgstr "Пернетақта жаймалары" @@ -768,10 +769,8 @@ msgstr "Соңғы тандалған тілдер" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Жүйеге кіру тересінде көрсетілетін пернетақта жаймалар тізімін көрсетіңіз." +msgid "Set to a list of keyboard layouts to be shown by default in the login window." +msgstr "Жүйеге кіру тересінде көрсетілетін пернетақта жаймалар тізімін көрсетіңіз." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to a list of languages to be shown by default in the login window." @@ -779,20 +778,15 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" -"Белгішелер темасының атын көрсетіңіз, қарсы алу лого ретінде қолдану үшін." +msgstr "Белгішелер темасының атын көрсетіңіз, қарсы алу лого ретінде қолдану үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to disable showing known users in the login window." -msgstr "" -"АҚИҚАТ мәніне орнатыңыз, жүйеге кіру терезесінде белгілі пайдаланушыларды " -"көрсетпеу үшін." +msgstr "АҚИҚАТ мәніне орнатыңыз, жүйеге кіру терезесінде белгілі пайдаланушыларды көрсетпеу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" -"АҚИҚАТ мәніне орнатыңыз, жүйеге кіру терезесінде қайта қосу батырмасын " -"көрсетпеу үшін." +msgstr "АҚИҚАТ мәніне орнатыңыз, жүйеге кіру терезесінде қайта қосу батырмасын көрсетпеу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the XRandR settings manager plugin." @@ -804,20 +798,15 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "" -"Ақиқат мәніне орнатыңыз, медиа пернелер баптаулар менеджер плагинді қосу " -"үшін." +msgstr "Ақиқат мәніне орнатыңыз, медиа пернелер баптаулар менеджер плагинді қосу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the on-screen keyboard." msgstr "Ақиқат мәніне орнатыңыз, экрандағы пернетақтаны қосу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -msgid "" -"Set to true to enable the plugin to manage the accessibility keyboard " -"settings." -msgstr "" -"Ақиқат мәніне орнатыңыз, арнайы баптауларды басқару плагинді қосу үшін." +msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." +msgstr "Ақиқат мәніне орнатыңыз, арнайы баптауларды басқару плагинді қосу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the screen magnifier." @@ -833,8 +822,7 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "" -"Ақиқат мәніне орнатыңыз, xsettings баптаулар менеджер плагинді қосу үшін." +msgstr "Ақиқат мәніне орнатыңыз, xsettings баптаулар менеджер плагинді қосу үшін." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "Set to true to show the banner message text." @@ -842,17 +830,11 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Set to true to use Compiz as the window manager." -msgstr "" -"Ақиқат деп орнатыңыз, егер терезелер менеджері ретінде Compiz қолданғыңыз " -"келсе." +msgstr "Ақиқат деп орнатыңыз, егер терезелер менеджері ретінде Compiz қолданғыңыз келсе." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "" -"Text banner message to show in the login window when the user chooser is " -"empty, instead of banner_message_text." -msgstr "" -"Пайдаланушыны таңдаушысы бос болған кезде кіру терезесінде көрсетілетін " -"қарсы алу мәтіні, banner_message_text орнына." +msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text." +msgstr "Пайдаланушыны таңдаушысы бос болған кезде кіру терезесінде көрсетілетін қарсы алу мәтіні, banner_message_text орнына." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "Text banner message to show in the login window." @@ -907,7 +889,7 @@ msgstr "Таймер қазір қосулы тұр ма, жоқ па" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 #, c-format msgid "Log in as %s" msgstr "%s ретінде кіру" @@ -917,167 +899,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 msgctxt "user" msgid "Other…" msgstr "Басқа..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 msgid "Choose a different account" msgstr "Басқа тіркелгіні тандаңыз" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 msgid "Guest" msgstr "Қонақ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 msgid "Log in as a temporary guest" msgstr "Уақытша қонақ ретінде кіру" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 msgid "Automatic Login" msgstr "Автоматты кіру" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 msgid "Automatically log into the system after selecting options" msgstr "Опцияларды тандау кейін жүйеге автоматты түрде кіру" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1000 msgid "Currently logged in" msgstr "Жүйеге кіріп тұр" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"User Switch Applet еркін бағдарлама; сіз оны Free Software Foundation " -"шығарған GNU General Public License аясында еркін тарата не/және өзгерте " -"аласыз; лицензия нұсқасы 2 не (тандауыңызша) кез-келген кейін шыққан." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Бұл бағдарлама пайдалы болады деген сеніммен таратылады, бірақ ЕШҚАНДАЙ " -"КЕПІЛДЕМЕ берілмейді; КОММЕРЦИЯЛЫҚ ҚҰНДЫЛЫҚ немесе белгілі бір МАҚСАТТАРҒА " -"СӘЙКЕС КЕЛЕТІНІ үшін де. Көбірек білу үшін GNU General Public License " -"қараңыз." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Сіз осы бағдарламамен бірге GNU General Public License көшірмесін алуыңыз " -"керек еді; олай болмаса, Free Software Foundation, Inc. ұйымына " -"хабарласыңыз, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Пайдаланушылар арасында тез ауысу мәзірі." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Baurzhan Muftakhidinov , 2009-2010" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Экранды бұғаттау мүмкін емес: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Уақытша скринсейверді бос экранға орнату мүмкін емес: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Жүйеден шығу мүмкін емес: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Бар" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Көрінбейді" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Бос емес" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Кетіп қалды" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Тіркелгі ақпараты" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Жүйе баптаулары" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Экранды блоктау" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Пайдаланушыны ауыстыру" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Шығу..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Белгісіз" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Пайдаланушыны ауыстыру апплеті" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Тіркелгі баптауларын мен күйін өзгерту" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Пайдаланушылар арасында тез ауысу мәзірі" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Пайдаланушыларды ауыстырғышы" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Пайдаланушыларды ауыстырғышы" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Жеке мәлі_меттерді түзету" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Туралы" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Пайдаланушыларды мен топтарды түз_ету" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Тек VERSION командасына қолдау бар" @@ -1086,12 +936,15 @@ msgid "COMMAND" msgstr "КОМАНДА" -#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 -#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +#: ../utils/gdmflexiserver.c:62 +#: ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 +#: ../utils/gdmflexiserver.c:66 msgid "Ignored — retained for compatibility" msgstr "Елемеу — үйлесімділік үшін ұсталады" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +#: ../utils/gdmflexiserver.c:64 +#: ../utils/gdm-screenshot.c:43 msgid "Debugging output" msgstr "Шығысты логтау" @@ -1113,15 +966,124 @@ msgid "Unable to start new display" msgstr "Жаңа экранды бастау мүмкін емес" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Скриншот алынды" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Экранның сурет көшірмесін сақтау" +#~ msgid "Shutdown Options…" +#~ msgstr "Сөндіру опциялары..." +#~ msgctxt "customsession" + +#~ msgid "Custom" +#~ msgstr "Таңдауыңызша" + +#~ msgid "Custom session" +#~ msgstr "Таңдауыңызша сесия" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "User Switch Applet еркін бағдарлама; сіз оны Free Software Foundation " +#~ "шығарған GNU General Public License аясында еркін тарата не/және өзгерте " +#~ "аласыз; лицензия нұсқасы 2 не (тандауыңызша) кез-келген кейін шыққан." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Бұл бағдарлама пайдалы болады деген сеніммен таратылады, бірақ ЕШҚАНДАЙ " +#~ "КЕПІЛДЕМЕ берілмейді; КОММЕРЦИЯЛЫҚ ҚҰНДЫЛЫҚ немесе белгілі бір " +#~ "МАҚСАТТАРҒА СӘЙКЕС КЕЛЕТІНІ үшін де. Көбірек білу үшін GNU General " +#~ "Public License қараңыз." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Сіз осы бағдарламамен бірге GNU General Public License көшірмесін алуыңыз " +#~ "керек еді; олай болмаса, Free Software Foundation, Inc. ұйымына " +#~ "хабарласыңыз, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Пайдаланушылар арасында тез ауысу мәзірі." + +#~ msgid "translator-credits" +#~ msgstr "Baurzhan Muftakhidinov , 2009-2010" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Экранды бұғаттау мүмкін емес: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Уақытша скринсейверді бос экранға орнату мүмкін емес: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Жүйеден шығу мүмкін емес: %s" + +#~ msgid "Available" +#~ msgstr "Бар" + +#~ msgid "Invisible" +#~ msgstr "Көрінбейді" + +#~ msgid "Busy" +#~ msgstr "Бос емес" + +#~ msgid "Away" +#~ msgstr "Кетіп қалды" + +#~ msgid "Account Information" +#~ msgstr "Тіркелгі ақпараты" + +#~ msgid "System Preferences" +#~ msgstr "Жүйе баптаулары" + +#~ msgid "Lock Screen" +#~ msgstr "Экранды блоктау" + +#~ msgid "Switch User" +#~ msgstr "Пайдаланушыны ауыстыру" + +#~ msgid "Quit…" +#~ msgstr "Шығу..." + +#~ msgid "Unknown" +#~ msgstr "Белгісіз" + +#~ msgid "User Switch Applet" +#~ msgstr "Пайдаланушыны ауыстыру апплеті" + +#~ msgid "Change account settings and status" +#~ msgstr "Тіркелгі баптауларын мен күйін өзгерту" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Пайдаланушылар арасында тез ауысу мәзірі" + +#~ msgid "User Switcher" +#~ msgstr "Пайдаланушыларды ауыстырғышы" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Пайдаланушыларды ауыстырғышы" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Жеке мәлі_меттерді түзету" + +#~ msgid "_About" +#~ msgstr "_Туралы" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "Пайдаланушыларды мен топтарды түз_ету" + #~ msgid "Enable debugging code" #~ msgstr "Жөндеу кодын қосу" diff -Nru gdm-2.32.1/po/ko.po gdm-3.0.0/po/ko.po --- gdm-2.32.1/po/ko.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ko.po 2011-04-04 14:37:16.000000000 +0000 @@ -3,22 +3,23 @@ # update by Young-Ho, Cha , 2001, 2006. # update by ChiDeok, Hwang , 2001. # Eunju Kim , 2007. -# Changwoo Ryu , 1999, 2002, 2004, 2006, 2007, 2008, 2009, 2010. +# Changwoo Ryu , 1999, 2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011. # # 새로 번역하시는 분은 translator-credit에 추가하세요. # msgid "" msgstr "" "Project-Id-Version: gdm\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-10-09 04:00+0900\n" -"PO-Revision-Date: 2010-10-09 04:07+0900\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-19 22:33+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" -"Language: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: Korean\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../common/gdm-common.c:456 @@ -46,34 +47,37 @@ msgid "could not find user \"%s\" on system" msgstr "시스템에 \"%s\" 사용자가 없습니다" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "로그인 시스템을 초기화할 수 없습니다" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "사용자를 인증할 수 없습니다" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "사용자 권한을 확인할 수 없습니다" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "인증된 연결을 할 수 없습니다" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "세션을 열 수 없습니다" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " "diagnose. In the meantime this display will be disabled. Please restart GDM " "when the problem is corrected." -msgstr "내부 오류로 인해 X 서버(그래픽 환경)를 시작할 수 없습니다. 진단을 하려면 시스템 관리자에게 연락을 하거나 시스템 기록을 확인하십시오. 이 화면은 곧 사라질것 입니다. 문제가 해결되면 GDM을 다시 시작해 주십시오." +msgstr "" +"내부 오류로 인해 X 서버(그래픽 환경)를 시작할 수 없습니다. 진단을 하려면 시스" +"템 관리자에게 연락을 하거나 시스템 기록을 확인하십시오. 이 화면은 곧 사라질" +"것 입니다. 문제가 해결되면 GDM을 다시 시작해 주십시오." #: ../daemon/gdm-server.c:250 #, c-format @@ -86,17 +90,17 @@ msgstr "%s 사용자가 서버를 실행했지만 해당 사용자가 없습니다" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "그룹 아이디를 %d(으)로 맞출 수 없습니다" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s에 대해 initgroups () 실패" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "사용자 아이디를 %d(으)로 맞출 수 없습니다" @@ -146,71 +150,71 @@ msgid "The display device" msgstr "디스플레이 장치" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "인증 시스템과 통신하는 데 오류: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "인증 시스템과 통신하는 데 오류 - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "일반 실패" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "메모리 바닥남" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "응용 프로그램 오류" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "알 수 없는 오류" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "사용자 이름:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "인증 시스템에 사용자 프롬프트를 전달하는 데 오류: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "인증 시스템에 사용자 호스트 이름을 전달하는 데 오류: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "인증 시스템에 사용자 콘솔을 전달하는 데 오류: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "인증 시스템에 디스플레이 문자열을 전달하는 데 오류: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "인증 시스템에 디스플레이 xauth 비밀 키를 전달하는 데 오류: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "사용자 계정이 없습니다" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "다른 사용자로 바꿀 수 없습니다" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s 사용자가 없습니다" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s 그룹이 없습니다" @@ -432,7 +436,7 @@ msgstr "AT-SPI 레지스트리 래퍼" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1646 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "로그인 창" @@ -444,6 +448,10 @@ msgid "Power management daemon" msgstr "전원 관리 데몬" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "그놈 세션 가속 확인" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "그놈 설정 데몬" @@ -480,7 +488,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit 인증 서버" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "시스템 선택" @@ -492,35 +500,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP 헤더를 읽지 못했습니다!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "값" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "완료된 시간 퍼센트" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "비활성 텍스트" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "사용자가 항목을 아직 고르지 않았으면 그 레이블에서 사용할 텍스트" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "활성 텍스트" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "사용자가 항목을 고르면 그 레이블에서 사용할 텍스트" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "목록 표시" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "선택 목록을 표시할 지 여부" @@ -552,65 +560,69 @@ msgid "%a %l:%M %p" msgstr "(%a) %p %l:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "자동으로 로그인하는 중입니다…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "언어를 선택하고 로그인 단추를 누르십시오" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "취소하는 중입니다…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "사용자 설정" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "사용자 설정 세션" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "취소" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "컴퓨터 이름" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "로그인" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "잠금 해제" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "버전" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "패널" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "끄기 옵션…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "일시 중지" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "다시 시작" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "시스템 끄기" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "사용자 설정" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "남은 시간 알 수 없음" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "사용자 설정 세션" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "패널" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "언어" @@ -638,35 +650,10 @@ msgid "Language" msgstr "언어" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "지정하지 않음" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "키보드 배치" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "키보드(_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "기타…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "이용할 수 있는 전체 키보드 목록에서 키보드를 하나 선택하십시오." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "키보드" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "레이블 텍스트" @@ -758,112 +745,103 @@ msgstr "환영 프로그램 로고에 사용할 아이콘 이름" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "최근에 선택한 키보드 배치" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "최근에 선택한 언어" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "로그인 창에서 기본값으로 표시할 키보드 배치 목록으로 설정하십시오." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "로그인 창에서 기본값으로 표시할 언어 목록으로 설정하십시오." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "환영 프로그램 로고에 테마 아이콘 이름으로 설정하십시오." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "참이면 로그인 창에 알려진 사용자를 표시하지 않습니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "참이면 로그인 창에 다시 시작 단추를 표시하지 않습니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "참이면 XRandR 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "참이면 배경 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "참이면 멀티미디어 키 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "참이면 화면 키보드를 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "참이면 접근성 키보드 설정을 관리하는 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "참이면 화면 확대를 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "참이면 화면 읽어주기를 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "참이면 사운드 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "참이면 xsettings 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "참이면 배너 글을 표시합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "참이면 창 관리자로 컴피즈를 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "사용자 선택이 없을 때, banner_message_text 대신 로그인 창에 표시할 배너 글." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "로그인 창에 표시할 배너 글." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "참이면 XRandR 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "참이면 배경 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "참이면 멀티미디어 키 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "참이면 사운드 설정 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "참이면 xsettings 설정 관리자 플러그인을 사용합니다." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "창 관리자로 컴피즈 사용" @@ -891,8 +869,8 @@ msgid "Whether the timer is currently ticking" msgstr "타이머가 돌아가는 중인 지 여부" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s 사용자로 로그인" @@ -902,164 +880,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "기타…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "다른 계정을 선택하십시오" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "손님" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "임시로 손님으로 로그인" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "자동 로그인" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "옵션을 선택하면 시스템에 자동으로 로그인합니다" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "현재 로그인 상태" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "사용자를 빠르게 바꾸는 메뉴." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "류창우 , 2008." - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "화면을 잠글 수 없습니다: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "화면 보호기를 임시로 빈 화면으로 설정할 수 없습니다: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "로그아웃할 수 없습니다: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "사용 가능" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "보이지 않음" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "다른 용무중" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "자리 비움" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "계정 정보" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "시스템 기본 설정" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "화면 잠그기" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "사용자 전환" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "끝내기…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "사용자 바꾸기 애플릿" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "계정 설정이나 상태를 바꿉니다" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "사용자를 빠르게 바꾸는 메뉴" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "사용자 바꾸기" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "사용자 바꾸기 애플릿 팩토리" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "개인 정보 편집(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "정보(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "사용자 및 그룹 편집(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "VERSION 명령어만 지원합니다" @@ -1095,11 +944,135 @@ msgid "Unable to start new display" msgstr "새 디스플레이를 시작할 수 없습니다" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "찍은 스크린샷" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "화면을 그림 파일로 잡습니다" + +#~ msgid "Shutdown Options…" +#~ msgstr "끄기 옵션…" + +#~ msgid "Keyboard layouts" +#~ msgstr "키보드 배치" + +#~ msgid "_Keyboard:" +#~ msgstr "키보드(_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "기타…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "이용할 수 있는 전체 키보드 목록에서 키보드를 하나 선택하십시오." + +#~ msgid "Keyboard" +#~ msgstr "키보드" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "최근에 선택한 키보드 배치" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "로그인 창에서 기본값으로 표시할 키보드 배치 목록으로 설정하십시오." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "사용자를 빠르게 바꾸는 메뉴." + +#~ msgid "translator-credits" +#~ msgstr "류창우 , 2008." + +#~ msgid "Can't lock screen: %s" +#~ msgstr "화면을 잠글 수 없습니다: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "화면 보호기를 임시로 빈 화면으로 설정할 수 없습니다: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "로그아웃할 수 없습니다: %s" + +#~ msgid "Available" +#~ msgstr "사용 가능" + +#~ msgid "Invisible" +#~ msgstr "보이지 않음" + +#~ msgid "Busy" +#~ msgstr "다른 용무중" + +#~ msgid "Away" +#~ msgstr "자리 비움" + +#~ msgid "Account Information" +#~ msgstr "계정 정보" + +#~ msgid "System Preferences" +#~ msgstr "시스템 기본 설정" + +#~ msgid "Lock Screen" +#~ msgstr "화면 잠그기" + +#~ msgid "Switch User" +#~ msgstr "사용자 전환" + +#~ msgid "Quit…" +#~ msgstr "끝내기…" + +#~ msgid "User Switch Applet" +#~ msgstr "사용자 바꾸기 애플릿" + +#~ msgid "Change account settings and status" +#~ msgstr "계정 설정이나 상태를 바꿉니다" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "사용자를 빠르게 바꾸는 메뉴" + +#~ msgid "User Switcher" +#~ msgstr "사용자 바꾸기" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "사용자 바꾸기 애플릿 팩토리" + +#~ msgid "Edit Personal _Information" +#~ msgstr "개인 정보 편집(_I)" + +#~ msgid "_About" +#~ msgstr "정보(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "사용자 및 그룹 편집(_E)" diff -Nru gdm-2.32.1/po/lv.po gdm-3.0.0/po/lv.po --- gdm-2.32.1/po/lv.po 2011-03-28 16:49:04.000000000 +0000 +++ gdm-3.0.0/po/lv.po 2011-04-04 14:37:16.000000000 +0000 @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-12-18 09:45+0000\n" -"PO-Revision-Date: 2011-03-07 14:53+0200\n" +"cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-17 17:59+0200\n" "Last-Translator: Rudolfs \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" @@ -20,8 +20,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Launchpad-Export-Date: 2009-02-19 16:12+0000\n" "X-Generator: Lokalize 1.1\n" +"X-Launchpad-Export-Date: 2009-02-19 16:12+0000\n" #: ../common/gdm-common.c:456 #, c-format @@ -48,33 +48,29 @@ msgid "could not find user \"%s\" on system" msgstr "sistēmā neizdevās atrast lietotāju \"%s\"" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Neizdevās inicializēt pieteikšanās sistēmu" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Neizdevās autentificēt lietotāju" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Neizdevās autorizēt lietotāju" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Neizdevās apstiprināt pilnvaras" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Neizdevās atvērt sesiju" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1267 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 +#: ../daemon/gdm-simple-slave.c:1363 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -84,7 +80,7 @@ "Neizdevās palaist X serveri (jūsu grafisko vidi) kādas iekšējas kļūdas dēļ. " "Lūdzu, sazinieties ar jūsu sistēmas administratoru vai pārbaudiet sistēmas " "žurnālu, lai noteiktu problēmas cēloni. Pa to laiku displejs tiks " -"deaktivēts. Lūdzu, pārstartējiet GDM, kad problēma ir novērsta." +"deaktivizēts. Lūdzu, pārstartējiet GDM, kad problēma ir novērsta." #: ../daemon/gdm-server.c:250 #, c-format @@ -97,24 +93,23 @@ msgstr "Serveri vajadzēja palaist lietotājam %s, bet šāds lietotājs neeksistē" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Neizdevās iestatīt grupas id uz %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() neizdevās %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Neizdevās iestatīt lietotāja id uz %d" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: Neizdevās atvērt %s ekrāna žurnāla failu!" @@ -158,88 +153,80 @@ msgid "The display device" msgstr "Displeja ierīce" -#: ../daemon/gdm-session-worker.c:1290 +#: ../daemon/gdm-session-worker.c:1066 +#, c-format #, c-format -#| msgid "error initiating conversation with authentication system - %s" -msgid "error initiating conversation with authentication system: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" msgstr "" -"kļūda, inicializējot informācijas apmaiņu ar autentifikācijas sistēmu: %s" +"kļūda, inicializējot informācijas apmaiņu ar autentifikācijas sistēmu - %s" -#: ../daemon/gdm-session-worker.c:1291 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "vispārēja kļūda" -#: ../daemon/gdm-session-worker.c:1292 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "beigusies atmiņa" -#: ../daemon/gdm-session-worker.c:1293 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "lietotnes programmētāja kļūda" -#: ../daemon/gdm-session-worker.c:1294 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "nezināma kļūda" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Lietotājvārds:" -#: ../daemon/gdm-session-worker.c:1307 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "kļūda, autentifikācijas sistēmas informēšanā par vēlamo lietotājvārda " -"ievades " -"veidu: %s" +"ievades veidu: %s" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "" "kļūda, autentifikācijas sistēmas informēšanā par lietotāja saimniekdatora " "vārdu: %s" -#: ../daemon/gdm-session-worker.c:1336 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "kļūda, autentifikācijas sistēmas informēšanā par lietotāja konsoli: %s" -#: ../daemon/gdm-session-worker.c:1349 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "kļūda, autentifikācijas sistēmas informēšanā par displeja virkni: %s" -#: ../daemon/gdm-session-worker.c:1364 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "kļūda, autentifikācijas sistēmas informēšanā par displeja xauth " -"akreditācijas " -"datiem: %s" +"akreditācijas datiem: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1678 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nav pieejams lietotāja konts" -#: ../daemon/gdm-session-worker.c:1705 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Neizdevās nomainīties uz lietotāju" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Lietotājs %s neeksistē" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Grupa %s neeksistē" @@ -383,7 +370,6 @@ #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Neizdodas ierakstīt PID failu %s: iespējams, beigusies diska brīvā vieta: %s" @@ -440,7 +426,6 @@ msgstr "Padarīt visus brīdinājumus fatālus" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "Iziet pēc laika (atkļūdošanai)" @@ -464,12 +449,12 @@ msgstr "GNOME displeja pārvaldnieka sesijas darbinieks" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "AT-SPI reģistra ietinums" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1648 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1754 msgid "Login Window" msgstr "Pieteikšanās logs" @@ -481,6 +466,10 @@ msgid "Power management daemon" msgstr "Barošanas pārvaldības dēmons" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME sesijas paātrināšanas pārbaudītājs" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME iestatījumu dēmons" @@ -494,12 +483,10 @@ msgstr "Palielina ekrāna daļas" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "GNOME ekrāna tastatūra" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "Izmantot ekrāna tastatūru" @@ -519,7 +506,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit autentifikācijas aģents" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Izvēlieties sistēmu" @@ -531,35 +518,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Neizdevās nolasīt XDMCP galveni!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Vērtība" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "pabeigtā laika procents" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Neaktīvs teksts" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Teksts, ko izmantot etiķetei, ja lietotājs vēl nav izvēlējies vienību" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktīvs teksts" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Teksts, ko izmantot etiķetei, ja lietotājs ir izvēlējies vienību" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Saraksts redzams" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Vai izvēles saraksts ir redzams" @@ -591,69 +578,73 @@ msgid "%a %l:%M %p" msgstr "%A %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automātiski piesakās…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 msgid "Select language and click Log In" msgstr "Izvēlieties valodu un klikšķiniet 'Pieteikties'" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 msgid "Cancelling…" msgstr "Atceļ…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1089 +msgctxt "customsession" +msgid "Custom" +msgstr "Pielāgota" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1090 +msgid "Custom session" +msgstr "Pielāgota sesija" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Atcelt" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Datora nosaukums" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Pieteikties" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Atslēgt" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versija" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panelis" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -#| msgid "Shutdown Options..." -msgid "Shutdown Options…" -msgstr "Izslēgšanas opcijas…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Iemidzināt" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Pārstartēt" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Izslēgt" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Pielāgota" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Nav zināms atlikušais laiks" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Pielāgota sesija" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panelis" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Valodas" @@ -669,11 +660,9 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" -msgstr "Cita…" +msgstr "Cita..." #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." @@ -683,37 +672,10 @@ msgid "Language" msgstr "Valoda" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nenorādīta" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tastatūras izkārtojumi" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatūra:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "Cita…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Izvēlieties tastatūras izkārtojumu no pilnā pieejamo valodu saraksta." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tastatūra" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etiķetes teksts" @@ -748,7 +710,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "Attālinātā pieteikšanās (Savienojas ar %s…)" @@ -806,69 +767,52 @@ msgstr "Sveicinātāja logo ikonas nosaukums" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nesen izvēlētie tastatūras izkārtojumi" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nesen izvēlētās valodas" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Iestatīt tastatūras izkārtojumu sarakstu, ko rādīt pēc noklusējuma " -"pieteikšanās logā." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Iestatīt valodu sarakstu, ko rādīt pēc noklusējuma pieteikšanās logā." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Iestatīt tēmas ikonas nosaukumu, ko izmantot kā sveicinātāja logo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Iestatīt uz true (patiess), lai nerādītu zināmos lietotājus pieteikšanās " "logā." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Iestatīt uz true (patiess), lai izslēgtu pārstartēšanas pogu rādīšanu " "pieteikšanās logā." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Iestatīt uz true (patiess), lai ieslēgtu XRandR iestatījumu pārvaldnieka " "spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Iestatīt uz true (patiess), lai ieslēgtu fona iestatījumu pārvaldnieka " "spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Iestatīt uz true (patiess), lai ieslēgtu mēdiju taustiņu iestatījumu " "pārvaldnieka spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Iestatīt uz true (patiess), lai aktivizētu ekrāna tastatūru." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -876,40 +820,35 @@ "Iestatīt uz true (patiess), lai ieslēgtu tastatūras pieejamības iestatījumu " "pārvaldnieka spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Iestatīt uz true (patiess), lai aktivizētu ekrāna lupu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Iestatīt uz true (patiess), lai aktivizētu ekrāna lasītāju." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Iestatīt uz true (patiess), lai ieslēgtu skaņas iestatījumu pārvaldnieka " "spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Iestatīt uz true (patiess), lai ieslēgtu xsettings iestatījumu pārvaldnieka " "spraudni." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." -msgstr "" -"Iestatīt uz true (patiess), lai rādītu karoga joslas paziņojuma tekstu." +msgstr "Iestatīt uz true (patiess), lai rādītu karoga joslas paziņojuma tekstu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Iestatīt uz true (patiess), lai izmantotu Compiz kā logu pārvaldnieku." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -917,41 +856,38 @@ "Teksta joslas paziņojums, ko rādīt pieteikšanās logā gadījumā, ja nav " "pieejami lietotāji ko izvēlēties." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Teksta ziņojums, ko rādīt pieteikšanās logā." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "Patiess (true), ja XRandR iestatījumu pārvaldnieka spraudnis ir aktivizēts." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Patiess (true), ja fona iestatījumu pārvaldnieka spraudnis ir aktivizēts." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Patiess (true), ja mēdiju taustiņu iestatījumu pārvaldnieka spraudnis ir " "aktivizēts." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "Patiess (true), ja skaņas iestatījumu pārvaldnieka spraudnis ir aktivizēts." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Patiess (true), ja xsettings iestatījumu pārvaldnieka spraudnis ir " "aktivizēts." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Izmantot Compiz kā logu pārvaldnieku" @@ -979,8 +915,8 @@ msgid "Whether the timer is currently ticking" msgstr "Vai skaitītājs šobrīd skaita" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Pieteikties kā %s" @@ -990,169 +926,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" -msgstr "Cita…" +msgstr "Cits..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Izvēlieties citu kontu" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Viesis" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Pieteikties kā pagaidu viesim" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automātiskā pieslēgšanās" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automātiski pieteikties sistēmā pēc opciju izvēlēšanās" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Šobrīd pieteicies" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Lietotāju pārslēgšanas sīklietotne ir brīva programmatūra; jūs varat to " -"izplatīt tālāk un/vai izmainīt saskaņā ar GNU Vispārējās publiskās licences " -"2. versijas vai jebkuras vēlākas versijas noteikumiem, ko publicējis Brīvas " -"programmatūras fonds." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Šī programma tiek izplatīta cerībā, ka tā būs noderīga, taču BEZ JEBKĀDĀM " -"GARANTIJĀM; pat bez šķietamām KOMERCIĀLAS VĒRTĪBAS un PIEMĒROTĪBAS " -"KONKRĒTIEM NOLŪKIEM garantijām. Sīkāku informāciju meklējiet GNU Vispārējā " -"publiskajā licencē." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Jums būtu bijis jāsaņem GNU Vispārējās publiskās licences kopiju kopā ar šo " -"programmatūru; ja tas tā nav noticis, rakstiet Free Software Foundation, " -"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Izvēlne, lai ātri pārslēgtos starp lietotājiem." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "Raivis Dejus Pēteris Krišjānis " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Neizdodas noslēgt ekrānu: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Pagaidām neizdodas iestatīt ekrānsaudzētāju uz tukšu ekrānu: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "Neizdodas atteikties: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Pieejams" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Neredzams" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Aizņemts" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Projām" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Konta informācija" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Sistēmas iestatījumi" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Slēgt ekrānu" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Pārslēgt lietotāju" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Iziet…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Lietotāju pārslēgšanas sīklietotne" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Izmainīt konta iestatījumus un statusu" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Izvēlne, lai ātri pārslēgtos starp lietotājiem" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Lietotāju pārslēdzējs" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Lietotāju pārslēgšanas sīklietotņu ražotne" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Red_iģēt personisko Informāciju" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "P_ar" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "R_ediģēt lietotājus un grupas" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Atbalstīta ir tikai VERSION komanda" @@ -1163,7 +965,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "Ignorēts — atstāts savietojamībai" @@ -1189,56 +990,28 @@ msgid "Unable to start new display" msgstr "Neizdodas palaist jaunu displeju" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Ekrānattēls uzņemts" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Uzņemt ekrāna attēlu" -#~ msgid "Quit..." -#~ msgstr "Iziet..." - -#~ msgid "Unknown" -#~ msgstr "Nezināms" - -#~ msgid "Couldn't set groupid to 0" -#~ msgstr "Neizdevās iestatīt grupas id uz 0" - -#~ msgid "%x" -#~ msgstr "%x" - -#~ msgid "Manager" -#~ msgstr "Pārvaldnieks" - -#~ msgid "The user manager object this user is controlled by." -#~ msgstr "Lietotāju vadības paneļa objekts, kurš vada šo lietotāju." - -#~ msgid "Enable debugging code" -#~ msgstr "Aktivizēt atkļūdošanas kodu" - -#~ msgid "id" -#~ msgstr "id" - -#~ msgid "Unable establish credentials" -#~ msgstr "Nevar apstiprināt mandātus" - -#~ msgid "%a %b %e" -#~ msgstr "%a %b %e" - -#~ msgid "%1$s, %2$s" -#~ msgstr "%1$s, %2$s" - -#~ msgid "Failed to restart computer" -#~ msgstr "Nevar pārstartēt datoru" +#~ msgid "Shutdown Options..." +#~ msgstr "Izslēgšanas opcijas..." -#~ msgid "Failed to stop computer" -#~ msgstr "Nevar apturēt datoru" +#~ msgid "Keyboard layouts" +#~ msgstr "Tastatūras izkārtojumi" -#~ msgid "page 5" -#~ msgstr "5 lapa" +#~ msgid "_Keyboard:" +#~ msgstr "_Tastatūra:" -#~ msgid "Enable debugging" -#~ msgstr "Aktivizēt atkļūdošanu" +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Cita..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Izvēlieties tastatūras izkārtojumu no pilnā pieejamo valodu saraksta." diff -Nru gdm-2.32.1/po/mr.po gdm-3.0.0/po/mr.po --- gdm-2.32.1/po/mr.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/mr.po 2011-04-04 14:37:16.000000000 +0000 @@ -8,13 +8,13 @@ # Rahul Bhalerao , 2006. # Rahul Bhalerao , 2006. # Sandeep Shedmake , 2008, 2009. -# Sandeep Shedmake , 2009, 2010. +# Sandeep Shedmake , 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: mr\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-27 07:52+0000\n" -"PO-Revision-Date: 2010-07-27 15:13+0530\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-28 14:46+0530\n" "Last-Translator: Sandeep Shedmake \n" "Language-Team: Marathi \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom अक्षर साधन नाही" @@ -41,44 +41,43 @@ #: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 #: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" -msgstr "GNOME दृश्य व्यवस्थापक स्लेव" +msgstr "GNOME डिस्पले मॅनेजर स्लेव्" #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" msgstr "प्रणालीवरील वापरकर्ता \"%s\" आढळले नाही" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" -msgstr "दाखलन प्रणाली प्रारंभ करू शकले नाही" +msgstr "प्रवेश प्रणाली प्रारंभ करू शकले नाही" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "वापरकर्त्याची ओळख पटली नाही" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "वापरकर्तास अधिप्रमाणीत करू शकले नाही" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "श्रेय स्थपीत करू शकले नाही" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "सत्र उघडण्यास अशक्य" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " "diagnose. In the meantime this display will be disabled. Please restart GDM " "when the problem is corrected." msgstr "" -"काही अंतर्गत चुकींमुळे X (तुमचे चित्रलेखीय कार्यक्षेत्र) सर्वर चालू करु शकले नाही. कृपया तुमच्या " -"संगणक व्यवस्थापकाशी संपर्क साधा किंवा तुमचे संगणकीय व्यवस्थापन तपासून पहा. दरम्यान हे दृश्य " +"काही अंतर्गत त्रुटींमुळे X (तुमचे चित्रलेखीय कार्यक्षेत्र) सर्वर चालू करु शकले नाही. कृपया तुमच्या " +"संगणक व्यवस्थापकाशी संपर्क साधा किंवा syslog तपासून पहा. दरम्यान हे दृश्य " "खंडीत राहील. समस्या सुटल्यावर कृपया, GDM पुन्हा सुरू करा." #: ../daemon/gdm-server.c:250 @@ -92,25 +91,25 @@ msgstr "सर्वर चालु करायचा होता पण %s वापरकर्ताच अस्तित्वात नाहीय़" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid %d करीता निश्चित करू शकले नाही" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s साठी initgroups() अयशस्वी झाले" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid ला %d हे मुल्य देता आले नाही" #: ../daemon/gdm-server.c:435 -#, fuzzy, c-format +#, c-format msgid "%s: Could not open log file for display %s!" -msgstr "%1s: प्रदर्शनासाठी %2s logfile मिळत नाही !" +msgstr "%s: डिस्पले %s करीता लॉग फाइल उघडणे अशक्य!" #: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 #: ../daemon/gdm-server.c:458 @@ -130,19 +129,19 @@ #: ../daemon/gdm-session-auditor.c:90 msgid "Username" -msgstr "वापरकर्ता" +msgstr "वापरकर्तानाव" #: ../daemon/gdm-session-auditor.c:91 msgid "The username" -msgstr "वापरकर्ता" +msgstr "वापरकर्तानाव" #: ../daemon/gdm-session-auditor.c:95 msgid "Hostname" -msgstr "यजमान" +msgstr "यजमाननाव" #: ../daemon/gdm-session-auditor.c:96 msgid "The hostname" -msgstr "यजमान" +msgstr "यजमाननाव" #: ../daemon/gdm-session-auditor.c:101 msgid "Display Device" @@ -152,71 +151,71 @@ msgid "The display device" msgstr "दृश्य साधन" -#: ../daemon/gdm-session-worker.c:1309 -#, fuzzy, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "अधिप्रमाणन प्रणाली - %s सह संभाषण प्रारंभ करतेवेळी त्रुटी" +#: ../daemon/gdm-session-worker.c:1066 +#, c-format +msgid "error initiating conversation with authentication system - %s" +msgstr "ओळख पटवा प्रणालीसह संभाषण प्रारंभ करतेवेळी त्रुटी - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "सर्वसाधारण त्रुटी" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "स्मृती बाहेर" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "अनुप्रयोग प्रोग्रमकर्ता त्रुटी" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "अपरिचित त्रुटी" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "वापरकर्त्याचे नाव:" -#: ../daemon/gdm-session-worker.c:1326 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1083 +#, c-format msgid "error informing authentication system of preferred username prompt: %s" -msgstr "स्विकार्ह वापरकर्ता प्रॉम्पट - %s वरील अधिप्रमाणन प्रणालीस सूचीत करतेवेळी त्रुटी" +msgstr "शिफारसीय वापरकर्तानाव प्रॉमप्टमधील ओळख पटवा प्रणालीकरीता सांगतेवेळी त्रुटी: %s" -#: ../daemon/gdm-session-worker.c:1340 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1097 +#, c-format msgid "error informing authentication system of user's hostname: %s" -msgstr "वापरकर्ताचे यजमाननाव - %s वरील अधिप्रमाणन प्रणालीस सूचीत करतेवेळी त्रुटी" +msgstr "वापरकर्ताचे यजमाननावमधील ओळख पटवा प्रणालीला कळवतेवेळी त्रुटी: %s" -#: ../daemon/gdm-session-worker.c:1355 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1112 +#, c-format msgid "error informing authentication system of user's console: %s" -msgstr "वापरकर्ताचे कंसोल - %s वरील अधिप्रमाणन प्रणालीस सूचीत करतेवेळी त्रुटी" +msgstr "वापरकर्ताचे कंसोलमधील ओळख पटवा प्रणालीला कळवतेवेळी त्रुटी: %s" -#: ../daemon/gdm-session-worker.c:1368 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1125 +#, c-format msgid "error informing authentication system of display string: %s" -msgstr "अधिप्रमाणीत प्रणालीला अक्षरमाळा - %s दृश्य विषयी सूचीत करतेवेळी त्रुटी आढळली" +msgstr "डिस्पले स्ट्रिंगमधील ओळख पटवा प्रणालीला कळवतेवेळी त्रुटी: %s" -#: ../daemon/gdm-session-worker.c:1383 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1140 +#, c-format msgid "error informing authentication system of display xauth credentials: %s" -msgstr "अधिप्रमाणीत प्रणालीला xauth श्रेय - %s वियषी सूचीत करतेवेळी त्रुटी आढळली" +msgstr "डिस्पले xauth श्रेयमधील ओळख पटवा प्रणालीला कळवतेवेळी त्रुटी: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "वापरकर्ता खाते उपलब्ध नाही" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "वापरकर्ता बदलविण्यास अपयशी" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "वापरकर्ता %s अस्तित्वात नाही" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "गट %s अस्तित्वात नाही" @@ -359,9 +358,9 @@ msgstr "सर्वर यजमाननाव प्राप्त करू शकले नाही: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 -#, fuzzy, c-format +#, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" -msgstr "PID फाइल %s लिहीता आली नाही: डिस्कवरील जागा कमी पडल्याची शक्यता आहे: %s" +msgstr "PID फाइल %s लिहणे अशक्य: संभाव्यतया डिस्कवर जागा कमी आहे: %s" #: ../daemon/main.c:271 #, c-format @@ -411,9 +410,8 @@ msgstr "सर्व धोकादायक सावधानता सूचना चिन्हाकृत करा" #: ../daemon/main.c:534 -#, fuzzy msgid "Exit after a time (for debugging)" -msgstr "ठराविक वेळ नंतर - डीबगींग करीता बाहेर पडा" +msgstr "ठराविक वेळनंतर बाहेर पडा (डिबगिंग करीता)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -435,14 +433,13 @@ msgstr "GNOME दृश्य व्यवस्थापन सत्र कार्यकर्ता" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#, fuzzy msgid "AT-SPI Registry Wrapper" -msgstr "AT SPI रेजीस्ट्री रॅपर" +msgstr "AT SPI रेजिस्ट्री रॅपर" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" -msgstr "दाखलन चौकट" +msgstr "प्रवेश चौकट" #: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 msgid "Power Manager" @@ -452,6 +449,10 @@ msgid "Power management daemon" msgstr "पावर व्यवस्थापन डीमन" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME सेशन ॲक्सिलरेशन चेकर" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME संयोजना डीमन" @@ -465,14 +466,12 @@ msgstr "पडद्यावरील भाग मोठे करा" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#, fuzzy msgid "GNOME On-Screen Keyboard" -msgstr "GNOME ऑनस्क्रीन कळफलक" +msgstr "GNOME ऑनस्क्रीन किबोर्ड" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#, fuzzy msgid "Use an on-screen keyboard" -msgstr "ऑनस्क्रीन कळफलक वापरा" +msgstr "ऑनस्क्रीन कळफलकचा वापर करा" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -490,7 +489,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit ऑथेंटीकेशन एजेंट" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "प्रणाली नीवडा" @@ -502,35 +501,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP हेड्डर वाचू शकले नाही!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "मुल्य" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "टक्केवारीतील पूर्णत्वाची वेळ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "पाठ्य असक्रीयता" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "वापरकर्त्याने घटक निवडले नसल्यास लेबल मध्ये वापरण्याजोगी पाठ्य" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "सक्रीय पाठ्य" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "वापरकर्त्याने घटक निवडले असल्यास लेबल मध्ये वापरण्याजोगी पाठ्य" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "सूची दृष्यास्पद आहे" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "नीवड सूची पहण्याजोगी आहे का" @@ -562,69 +561,70 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" -msgstr "स्वयं दाखलन करा..." +msgstr "स्वयं प्रवेश करत आहे…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "भाषा निवडा व दाखल करा वर क्लिक करा" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" -msgstr "रद्द करीत आहे..." +msgstr "रद्द करत आहे…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "पसंतीचे" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "पसंतीचे सत्र" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "रद्द करा" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "संगणकाचे नाव" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "प्रवेश करा" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" -msgstr "" +msgstr "कुलूपबंद अशक्य करा" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "आवृत्ती" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "पटल" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -#, fuzzy -msgid "Shutdown Options…" -msgstr "पूर्णपणे बंद करायचे पर्याय..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "अकार्यक्षम" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "पुन्हा सुरू करा" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "बंद करा" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "अपरिचीत उर्वरित वेळ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "पटल" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "भाषा" @@ -640,10 +640,9 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#, fuzzy msgctxt "language" msgid "Other…" -msgstr "इतर..." +msgstr "इतर…" #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." @@ -653,36 +652,10 @@ msgid "Language" msgstr "भाषा" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "अनिर्देशीत" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "कळफलक मांडणी" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "कळफलक (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#, fuzzy -msgctxt "keyboard" -msgid "Other…" -msgstr "इतर..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "पूर्णतया उपलब्ध कळफलक रचना यादी पासून रचना निवडा." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "कळफलक" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "लेबल पाठ्य" @@ -716,18 +689,18 @@ msgstr "यादी मधिल एकूण घटकांची संख्या संचीयत करायचे प्रमाण" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 -#, fuzzy, c-format +#, c-format msgid "Remote Login (Connecting to %s…)" -msgstr "दूर्रस्थ दाखलन (%s शी जुळवणी करीत आहे...)" +msgstr "दूरस्त प्रवेश (%s शी जुळवणी करीत आहे…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format msgid "Remote Login (Connected to %s)" -msgstr "दूर्रस्थ दाखलन (%s शी जुळवणी करीत आहे)" +msgstr "दूरस्त प्रवेश (%s शी जुळवणी करीत आहे)" #: ../gui/simple-greeter/gdm-remote-login-window.c:281 msgid "Remote Login" -msgstr "दूर्रस्थ दाखलन" +msgstr "दूरस्त प्रवेश" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 msgid "Session" @@ -747,7 +720,7 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 msgid "Do not show known users in the login window" -msgstr "दाखलन चौकट अंतर्गत परिचीत वापरकर्ता दर्शवू नका" +msgstr "प्रवेश चौकट अंतर्गत परिचीत वापरकर्ता दर्शवू नका" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 msgid "Enable accessibility keyboard plugin" @@ -774,122 +747,104 @@ msgstr "शुभेच्छा बोधचिन्ह करीता वापरण्याजोगी चिन्हाचे नाव" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "नुकतेच निवडलेले कळफलक मांडणी" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "नुकतेच निवडलेले भाषा" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#, fuzzy -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "प्रवेश पटलात पूर्वनिर्धारीतरित्या दर्शविण्याजोगी कळफलक मांडणीची यादी निश्चित करा." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." -msgstr "प्रवेश पटलात पूर्वनिर्धारीतरित्या दर्शविण्याजोगी भाषांची यादी निश्चित करा." +msgstr "प्रवेश पटलात पूर्वनिर्धारीतरित्या दाखवण्याजोगी भाषांची यादी निश्चित करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "सुभेच्छा बोधचिन्ह करीता वापरण्याजोगी सुत्रयोजन नुरूप चिन्ह नाव निश्चित करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." -msgstr "प्रवेश पटलात परिचीत वापरकर्ते दाखवण्यापासून अकार्यक्षम करण्यासाठी true सेट केले." +msgstr "प्रवेश पटलात परिचीत वापरकर्ते दाखवण्यापासून असुरू करण्यासाठी true सेट केले." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "प्रवेश पटलात रिस्टार्ट बटने दाखवण्यापासून अकार्यक्षम करण्यासाठी true सेट करा." +msgstr "प्रवेश पटलात रिस्टार्ट बटने दाखवण्यापासून असुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." -msgstr "xrandr संयोजना व्यवस्थापक प्लगइन कार्यक्षम करण्यासाठी true सेट करा." +msgstr "XRandR सेटिंग्स् व्यवस्थापक प्लगइन सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." -msgstr "पार्श्वभूमी संयोजना व्यवस्थापक प्लगइन कार्यक्षम करण्यासाठी true सेट करा." +msgstr "पार्श्वभूमी सेटिंग्स् व्यवस्थापक प्लगइन सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "मिडीया-किज् संयोजना व्यवस्थापक प्लगइन कार्यक्षम करण्यासाठी true सेट करा." +msgstr "मिडीया-किज् सेटिंग्स् व्यवस्थापक प्लगइन सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." -msgstr "ऑन-स्क्रीन किबोर्ड कार्यक्षम करण्यासाठी true सेट करा." +msgstr "ऑन-स्क्रीन किबोर्ड सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "प्रवेश किबोर्ड संयोजना व्यवस्थापीत करण्यासाठी प्लगइन कार्यक्षम करण्याकरीता true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." -msgstr "पडदा वर्धक कार्यक्षम करण्यासाठी true सेट करा." +msgstr "पडदा वर्धक सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." -msgstr "पडदा वाचक कार्यक्षम करण्यासाठी true सेट करा." +msgstr "पडदा वाचक सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." -msgstr "आवाज संयोजना व्यवस्थापक प्लगइन कार्यक्षम करण्यासाठी true सेट करा." +msgstr "आवाज सेटिंग्स् व्यवस्थापक प्लगइन सुरू करण्यासाठी true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "xsettings संयोजना व्यवस्थापक प्लगइन कार्यक्षम करण्यासाठी true सेट केले." +msgstr "xsettings सेटिंग्स् व्यवस्थापक प्लगइन सुरू करण्यासाठी true सेट केले." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "बॅनर संदेश पाठ्य दर्शविण्याकरीता true सेट करा." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." -msgstr "कॉम्पीज् ला पडदा वर्धक नुरूप वापरण्याकरीता खरे असे निश्चित केले जाते." +msgstr "कॉम्पीज् ला पटल व्यवस्थापक म्हणून वापरण्याकरीता खरे असे सेट केले." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." -msgstr "" -"वापकर्ता chooser रिकामे असल्यास प्रवेश पटलात, banner_message_text एवजी " -"दाखवण्याजोगी मजकूर बॅनर संदेश." +msgstr "वापकर्ता chooser रिकामे असल्यास प्रवेश पटलात, banner_message_text ऐवजी दाखवण्याजोगी मजकूर बॅनर संदेश." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." -msgstr "प्रवेश पटलात दर्शविण्याजोगी पाठ्य बॅनर संदेश." +msgstr "प्रवेश पटलात दाखवण्याजोगी मजकूर बॅनर संदेश." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." -msgstr "xrandr संयोजना व्यवस्थापक प्लगइन कार्यान्वीत असल्यास खरे निश्चित होते." +msgstr "XRandR सेटिंग्स् व्यवस्थापक प्लगइन सुरू असल्यास खरे निश्चित होते." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." -msgstr "पार्श्वभूमी संयोजना व्यवस्थापक प्लगइन कार्यान्वीत असल्यास खरे निश्चित होते." +msgstr "पार्श्वभूमी सेटिंग्स् व्यवस्थापक प्लगइन सुरू असल्यास खरे निश्चित होते." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." -msgstr "मिडीया-कि संयोजना व्यवस्थापक प्लगइन कार्यान्वीत असल्यास खरे असते." +msgstr "मिडीया-कि सेटिंग्स् व्यवस्थापक प्लगइन सुरू असल्यास खरे असते." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." -msgstr "पार्श्वभूमी संयोजना व्यवस्थापक प्लगइन कार्यान्वीत असल्यास खरे असते." +msgstr "पार्श्वभूमी सेटिंग्स् व्यवस्थापक प्लगइन सुरू असल्यास खरे असते." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." -msgstr "xsettings संयोजना व्यवस्थापक प्लगइन कार्यान्वीत असल्यास खरे असे निश्चित होते." +msgstr "xsettings सेटिंग्स् व्यवस्थापक प्लगइन सुरू असल्यास खरे असे निश्चित होते." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" -msgstr "compiz ला चौकट व्यवस्थापक म्हणून वापर करा" +msgstr "Compiz चा चौकट व्यवस्थापक म्हणून वापर करा" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -915,8 +870,8 @@ msgid "Whether the timer is currently ticking" msgstr "वर्तमानक्षणी टाइमर टिक करत आहे का" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s म्हणून प्रवेश करा" @@ -926,186 +881,47 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" -msgstr "इतर..." +msgstr "इतर…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "इतर खाते निवडा" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "पाहुणा" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" -msgstr "तात्पुरता पाहूणा म्हणून दाखल करा" +msgstr "तात्पुर्ते अतिथी म्हणून प्रवेश करा" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" -msgstr "स्वयं दाखलन" +msgstr "स्वयं प्रवेश" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" -msgstr "पर्यान निवडल्यानंतर स्वयंरित्या प्रणालीस दाखल व्हा" +msgstr "पर्यान नीवडल्यानंतर स्वयंरित्या प्रणालीमध्ये प्रवेश करा" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "सद्या दाखल केले" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "वापरकर्ता पटकन बदलविण्याकीरताचे मेन्यु." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"संदिप शेडमाके , 2008, 2009; संदिप शेडमाके " -", 2009, 2010." - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "पडदा कुलूपबंद करू शकत नाही: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "स्क्रीनसेवरला रिकामी पडदा करीता तात्पूरते निश्चित करू शकत नाही: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, fuzzy, c-format -msgid "Can't log out: %s" -msgstr "वापरकर्ता बदलणे शक्य नाही: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "उपलब्ध" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "अदृष्य" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "व्यस्थ" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "दूर आहे" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "खात्याची माहिती" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "प्रणाली पसंती" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "पडदा कुलूपबंद करा" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "वापरकर्ता बदला" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "अपरिचित" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "वापरकर्ता बदलविण्याकरीताचे ऍपलेट" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "खाते संयोजना व स्थिती बदला" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "वापरकर्ता बदलविण्याकरीताचे मेन्यु" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "वापरकर्ता बदलावकर्ता" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "वापरकर्ता बदलाव ऍपलेट फॅक्टरी" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "व्यक्तिगत माहिती संपादित करा (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "विषयी (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "वापरकर्ता व गट संपादन (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "फक्त VERSION आदेश समर्थीत आहे" #: ../utils/gdmflexiserver.c:61 msgid "COMMAND" -msgstr "आज्ञा" +msgstr "COMMAND" #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#, fuzzy msgid "Ignored — retained for compatibility" -msgstr "दुर्लक्षीत - सहत्व करीता जपून ठेवले" +msgstr "दुर्लक्षीत — सहत्वताकरीता जपून ठेवले" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 msgid "Debugging output" @@ -1129,12 +945,12 @@ msgid "Unable to start new display" msgstr "नवे दृश्य सुरू करता येत नाही" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "स्क्रीनशॉट घेतले" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "पडद्याचे चित्र घ्या" diff -Nru gdm-2.32.1/po/nb.po gdm-3.0.0/po/nb.po --- gdm-2.32.1/po/nb.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/nb.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,22 +1,24 @@ # Norwegian translation of gdm (bokmål dialect). # Copyright (C) 1998-2005 Free Software Foundation, Inc. -# Kjartan Maraas , 1998-2010. -# Terance Edward Sola , 2005. # # +# Kjartan Maraas , 1998-2011. +# Terance Edward Sola , 2005. +# Torstein Adolf Winterseth , 2010. msgid "" msgstr "" -"Project-Id-Version: gdm 2.31.x\n" +"Project-Id-Version: gdm 2.91.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-31 21:34+0200\n" -"PO-Revision-Date: 2010-06-14 00:13+0200\n" -"Last-Translator: Kjartan Maraas \n" +"POT-Creation-Date: 2011-03-17 22:48+0100\n" +"PO-Revision-Date: 2011-03-17 22:48+0100\n" +"Last-Translator: Torstein Adolf Winterseth \n" "Language-Team: Norwegian Bokmål \n" "Language: \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.1\n" #: ../common/gdm-common.c:456 #, c-format @@ -43,28 +45,28 @@ msgid "could not find user \"%s\" on system" msgstr "kunne ikke finne bruker «%s» på systemet" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Kan ikke initiere påloggingssystemet" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Kan ikke autentisere bruker" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Kan ikke autorisere bruker" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Kan ikke bruke autentiseringsinformasjonen" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" -msgstr "Kan ikke åpne sesjon" +msgstr "Kan ikke åpne økt" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -88,17 +90,17 @@ "Tjeneren skulle startes av bruker %s, men denne brukeren eksisterer ikke" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Kunne ikke sette gruppe-ID til %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () feilet for %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Kunne ikke sette bruker-id til %d" @@ -148,76 +150,76 @@ msgid "The display device" msgstr "Skjermenheten" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "feil i initiering av kommunikasjon med autentiseringssystemet: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "feil i initiering av kommunikasjon med autentiseringssystemet - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "generell feil" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "ikke mer minne" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "feil i programkoden" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "ukjent feil" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Brukernavn:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "feil ved informasjon til autentiseringssystemet om spørring etter " "foretrukket brukernavn: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "feil ved informasjon til autentiseringssystemet om brukers vertsnavn: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "feil ved informasjon til autentiseringssystemet om brukers konsoll: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "feil ved informasjon til autentiseringssystemet om skjermstrengen: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "feil ved informasjon til autentiseringssystemet om xauth-" "påloggingsinformasjon for skjermen: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ingen brukerkonto tilgjengelig" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kan ikke bytte til denne brukeren" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Bruker %s eksisterer ikke" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Gruppe %s eksisterer ikke" @@ -321,7 +323,7 @@ #: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" -msgstr "%s: Kunne ikke lese sesjons-ID" +msgstr "%s: Kunne ikke lese økt-ID" #: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format @@ -434,14 +436,14 @@ #. of starting up a session #: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" -msgstr "GNOME skjermhåndterer sesjonsarbeider" +msgstr "GNOME skjermhåndterer øktarbeider" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 msgid "AT-SPI Registry Wrapper" msgstr "AT SPI register wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Påloggingsvindu" @@ -453,6 +455,10 @@ msgid "Power management daemon" msgstr "Tjeneste for strømstyring" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Sjekk om GNOME økt kan kjøres aksellerert" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Tjeneste for innstillinger" @@ -489,7 +495,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit autentiseringsagent" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Velg system" @@ -501,37 +507,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Kunne ikke lese XDMCP header!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Verdi" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "prosent av tiden som er fullført" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inaktiv tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Tekst som skal brukes i etiketten hvis brukeren ikke har valgt en oppføring " "ennå" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktiv tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Tekst som skal brukes i etiketten hvis brukeren har valgt en oppføring" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Synlig liste" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Om listen for valg av bruker er synlig" @@ -563,65 +569,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" -msgstr "Logger inn automatisk…" +msgstr "Logger inn automatisk …" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Velg språk og klikk på Logg inn" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" -msgstr "Avbryter…" +msgstr "Avbryter …" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Egendefinert" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Egendefinert sesjon" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Avbryt" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Navn på datamaskin" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Logg inn" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Lås opp" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versjon" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Alternativer for nedstenging…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Hvilemodus" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Start på nytt" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Slå av" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Egendefinert" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Ukjent tid gjenstår" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Egendefinert sesjon" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Språk" @@ -639,7 +649,7 @@ #: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" msgid "Other…" -msgstr "Annet…" +msgstr "Annet …" #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." @@ -649,35 +659,10 @@ msgid "Language" msgstr "Språk" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Uspesifisert" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tastaturutforminger" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatur:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Annet…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Velg en tastaturutforming fra listen med tilgjengelige utforminger." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tastatur" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Tekst for etikett" @@ -713,7 +698,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format msgid "Remote Login (Connecting to %s…)" -msgstr "Ekstern pålogging (Kobler til %s…)" +msgstr "Ekstern pålogging (Kobler til %s …)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -726,7 +711,7 @@ #: ../gui/simple-greeter/gdm-session-option-widget.c:162 msgid "Session" -msgstr "Sesjon" +msgstr "Økt" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -769,63 +754,52 @@ msgstr "Ikonnavn som skal brukes for velkomstlogo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Sist valgte tastaturutforminger" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Sist valgte språk" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Sett til en liste med tastaturutforminger som skal vises som forvalg i " -"påloggingsvinduet." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Sett til en liste med språk som skal vises som forvalg i påloggingsvinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Sett til temabasert ikonnavn som skal brukes for velkomstlogoen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Sett til true for å slå av visning av kjente brukere i påloggingsvinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Sett til true for å slå av visning av knapper for omstart i " "påloggingsvinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Sett til true for å slå på tillegg for håndtering av innstillinger for " "XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Sett til true for å slå på tillegg for håndtering av innstillinger for " "bakgrunn." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Sett til true for å slå på tillegg for håndtering av innstillinger for " "medietaster." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Sett til true for å slå på tastatur på skjermen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -833,34 +807,34 @@ "Sett til true for å slå på tillegg for håndtering av innstillinger for " "tilgjengelighet for tastatur." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Sett til true for å slå på forstørrelsesglass på skjermen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Sett til true for å slå på skjermleser." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Sett til true for å slå på tillegg for håndtering av innstillinger for lyd." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Sett til true for å slå på tillegg for håndtering av innstillinger i " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Sett til true for å vise tekst i bannermelding." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Sett til true for å bruke Compiz som vindushåndterer." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -868,36 +842,36 @@ "Melding som skal vises i tekstbanner i påloggingsvinduet i stedet for " "banner_message_text når brukervelger er tom." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Melding som skal vises i tekstbanner i påloggingsvinduet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "True hvis tillegg for håndtering av innstillinger for XRandR er aktivert." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "True hvis tillegg for håndtering av innstillinger for bakgrunn er aktivert." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "True hvis tillegg for håndtering av innstillinger for medietaster er " "aktivert." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True hvis tillegg for håndtering av innstillinger for lyd er aktivert." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "True hvis tillegg for håndtering av innstillinger i xsettings er aktivert." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Bruk Compiz som vindushåndterer" @@ -925,8 +899,8 @@ msgid "Whether the timer is currently ticking" msgstr "Om nedtelling har startet" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Logg inn som %s" @@ -936,167 +910,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" -msgstr "Annen…" +msgstr "Annen …" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Velg en annen konto" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gjest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Logg inn som en midlertidig gjest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatisk pålogging" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Logg inn automatisk etter å ha valgt alternativer" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Allerede logget inn" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Panelprogram for brukerbytte er fri programvare. Du kan redistribuere og/" -"eller endre programmet under betingelsene gitt i GNU General Public License " -"som utgitt av Free Software Foundation; enten versjon 2 av lisensen, eller " -"(hvis du ønsker det) enhver senere versjon." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Programmet distribueres i håp om at programmet er nyttig, men uten NOEN " -"GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET " -"BESTEMT FORMÅL. Se GNU General Public License for detaljer." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Du skal ha mottatt en kopi av GNU General Public License sammen med " -"Nautilus. Hvis dette ikke er tilfelle, kan du skrive til Free Software " -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "En meny som lar deg bytte mellom brukere." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Kjartan Maraas " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Kan ikke låse skjerm: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Kan ikke sette skjermsparer til blank skjerm midlertidig: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Kan ikke logge ut: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Tilgjengelig" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Usynlig" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Opptatt" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Borte" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Kontoinformasjon" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Brukervalg for systemet" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Lås skjerm" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Bytt bruker" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Avslutt…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Ukjent" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Panelprogram for brukerbytte" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Bytt innstillinger og status for konto" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "En meny for å bytte mellom brukere" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Bytt bruker" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fabrikk for panelprogram for brukerbytte" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Rediger personlig _informasjon" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Om" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "R_ediger brukere og grupper" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Kun kommandoen VERSION er støttet" @@ -1121,7 +963,7 @@ #: ../utils/gdmflexiserver.c:675 #, c-format msgid "Could not identify the current session." -msgstr "Kunne ikke identifisere aktiv sesjon." +msgstr "Kunne ikke identifisere aktiv økt." #. Option parsing #: ../utils/gdmflexiserver.c:711 @@ -1132,11 +974,11 @@ msgid "Unable to start new display" msgstr "Kan ikke starte ny skjerm" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Skjermdump ferdig" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Ta bilde av skjermen" diff -Nru gdm-2.32.1/po/nl.po gdm-3.0.0/po/nl.po --- gdm-2.32.1/po/nl.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/nl.po 2011-04-04 14:37:16.000000000 +0000 @@ -5,136 +5,136 @@ # Hein-Jan Leliveld , 1999. # Vincent van Adrighem , 2001, 2003, 2008, 2010. # Ronald Hummelink , 2002. -# Tino Meinen , 2004, 2005, 2006, 2008. +# Tino Meinen , 2004–2006, 2008. # Vincent van Adrighem , 2004, 2006. # Michiel Sikkes , 2006. -# Wouter Bolsterlee , 2006–2009. +# Wouter Bolsterlee , 2006–2011. +# Hannie Dumoleyn , 2010–2011. # -# Authentication identificatie / aanmeldingscontrole -# display scherm -# face browser gezichtenlijst/gebruikersfoto's -# suspend pauzeren/pauzestand/pauzeerstand -# hibernate slaapstand/slapen +# Authentication identificatie / aanmeldingscontrole +# display scherm +# face browser gezichtenlijst/gebruikersfoto's +# suspend pauzeren/pauzestand/pauzeerstand +# hibernate slaapstand/slapen +# Gnome Display Manager Slave onvertaald gelaten (was Gnome Aanmeldbeheer) - Hannie # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-04 01:33+0200\n" -"PO-Revision-Date: 2010-04-03 22:29+0200\n" -"Last-Translator: Vincent van Adrighem \n" +"POT-Creation-Date: 2011-03-19 15:34+0100\n" +"PO-Revision-Date: 2011-03-19 15:34+0100\n" +"Last-Translator: Wouter Bolsterlee \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" -msgstr "Het bestand /dev/urandom is geen character device" +msgstr "Het bestand /dev/urandom is geen tekenbestand" # Beeldscherm? -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Scherm-ID" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" -msgstr "Gnome Aanmeldbeheer" +msgstr "GNOME Display Manager Slave" #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "kan de gebruiker \"%s\" niet vinden op het systeem" +msgstr "kan de gebruiker '%s' niet vinden op het systeem" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "kan aanmeldsysteem niet initialiseren" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Kan gebruiker niet authenticeren" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Kan gebruiker niet autoriseren" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Kan aanmeldgegevens niet vaststellen" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Kan sessie niet openen" -#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" "Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. " -"Neem contact op met de systeembeheerder of bekijk het logboek om een " +"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een " "diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart " "GDM wanneer het probleem is opgelost." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: kan geen verbinding maken met moederscherm '%s'" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "Server moest gestart worden als %s, maar die gebruiker bestaat helemaal niet" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Kan groeps-ID niet instellen op %d" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() mislukt voor %s" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Kan gebruikers-ID niet instellen op %d" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "Kan groeps-ID niet instellen op 0" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: Kan het logboek voor scherm %s niet openen!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Fout bij instellen van %s naar %s" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Serverprioriteit kon niet worden ingesteld op %d: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Lege serveropdracht voor scherm %s" @@ -167,218 +167,217 @@ msgid "The display device" msgstr "Het beeldscherm" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" -msgstr "fout bij initialisering van aanmeldcontrole - %s" +msgstr "fout bij initialisatie van communicatie met authenticatiesysteem: %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "algemene fout" -# geen vrij geheugen/geen geheugen meer -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" -msgstr "geen vrije geheugenruimte" +msgstr "onvoldoende geheugen beschikbaar" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "programmafout" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "onbekende fout" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Gebruikersnaam:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "" -"fout bij doorgeven gewenste tekst bij het naamveld aan authenticatiesysteem " -"- %s" +"fout bij doorgeven gewenste tekst bij het naamveld aan authenticatiesysteem: " +"%s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "fout bij doorgeven computernaam aan authenticatiesysteem - %s" +msgid "error informing authentication system of user's hostname: %s" +msgstr "fout bij doorgeven computernaam aan authenticatiesysteem: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "fout bij doorgeven van gebruikersconsole aan authenticatiesysteem - %s" +msgid "error informing authentication system of user's console: %s" +msgstr "fout bij doorgeven van gebruikersconsole aan authenticatiesysteem: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "fout bij doorgeven schermnaam aan authenticatiesysteem - %s" +msgid "error informing authentication system of display string: %s" +msgstr "fout bij doorgeven schermnaam aan authenticatiesysteem: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" -msgstr "fout bij doorgeven van xauth-gegevens aan authenticatiesysteem - %s" +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "fout bij doorgeven van xauth-gegevens aan authenticatiesysteem: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "geen gebruikersaccount beschikbaar" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kan gebruiker niet wisselen" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Gebruiker %s bestaat niet" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Groep %s bestaat niet" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Kan geen socket aanmaken!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "XDMCP verzoek van host %s geweigerd" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" -msgstr "Kan authlijst uit pakket halen" +msgstr "Kan authlijst niet uit pakket halen" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" -msgstr "Fout in controlesom" +msgstr "Fout in checksum" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Foutief adres" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Kan schermadres niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Kan poortnummer van scherm niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Kan geen authlijst uit pakket halen" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" -msgstr "%s: Fout bij checksum" +msgstr "%s: Fout in checksum" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: REQUEST ontvangen van verboden host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Kan het schermnummer niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Kan het verbindingstype niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: Kan clientadres niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Kan de identificatienamen niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Kan de identificatiedata niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Kan de identificatielijst niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Kan Producent-ID niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: Fout in checksum van %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" -msgstr "%s: \"Manage\" ontvangen van verboden host %s" +msgstr "%s: 'Manage' ontvangen van verboden host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Kan sessie-ID niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Kan schermklasse niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Kan adres niet lezen" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: KEEPALIVE ontvangen van verboden host %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XDMCP: Versie van XDMCP niet goed!" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XDMCP: Kan adres niet analyseren" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Kan de naam van de server niet vinden: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Kan PID-bestand %s niet beschrijven. Mogelijkerwijs is er geen vrije " "schijfruimte meer: %s" @@ -431,8 +430,8 @@ msgstr "Ook stoppen bij waarschuwingen" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "Afsluiten na een tijdje - voor debuggen" +msgid "Exit after a time (for debugging)" +msgstr "Afsluiten na een tijdje (voor debuggen)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -444,20 +443,22 @@ # wil -> mag #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Alleen root mag GDM starten" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GDM (Gnome aanmeldbeheer) Session worker" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" msgstr "AT SPI Registry Wrapper" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Aanmeldvenster" @@ -469,6 +470,10 @@ msgid "Power management daemon" msgstr "Energiebeheer-service" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Controle van hardwareversnelling voor de Gnome-sessie" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Gnome instellingenservice" @@ -482,11 +487,11 @@ msgstr "Delen van het scherm uitvergroten" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "Gnome schermtoetsenbord" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" msgstr "Schermtoetsenbord gebruiken" #: ../data/greeter-autostart/metacity.desktop.in.h:1 @@ -509,51 +514,51 @@ # hostsysteem/hostcomputer/computer/systeem # het/een/. -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Selecteer computer" # BUG: XMCP aan het begin moet zijn: XDMCP -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Kan XDMCP-header niet lezen!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Waarde" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "percentage voltooide tijd" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inactieve tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "De te gebruiken tekst in het label als de gebruiker nog geen item heeft " "gekozen" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Actieve tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "" "De te gebruiken tekst in het label als de gebruiker een item heeft gekozen" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Lijst zichtbaar" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Of de kieslijst zichtbaar is" @@ -617,124 +622,122 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" msgstr "Automatische aanmelding…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +msgid "Select language and click Log In" +msgstr "Selecteer de taal en klik op ‘Aanmelden’" + #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" msgstr "Afbreken…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 -msgid "Select language and click Log In" -msgstr "Selecteer de taal en klik op ‘Aanmelden’" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Aangepast" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Aangepaste sessie" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Afbreken" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Computernaam" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +msgid "Login" msgstr "Aanmelden" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Ontgrendelen" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versie" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "Paneel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "Afsluitopties..." - # pauzestand/pauzeren -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Pauzeren" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Herstarten" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Uitschakelen" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Resterende tijd onbekend" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Paneel" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Talen" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "_Talen:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "_Taal:" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" -msgid "Other..." +msgid "Other…" msgstr "Overige…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Kies een taal uit de lijst van beschikbare talen." -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "Taal" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Niet gespecificeerd" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Toetsenbordindelingen" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "_Toetsenbord:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "Overig…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Kies een toetsenbordindeling uit de lijst van beschikbare indelingen." - -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Labeltekst" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "De te gebruiken tekst voor het label" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Pictogramnaam" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Het te gebruiken pictogram voor het label" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "Standaard-item" -#: ../gui/simple-greeter/gdm-option-widget.c:525 +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" msgstr "Het ID van het standaard-item" @@ -748,7 +751,7 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" msgstr "Aanmelding op afstand (Verbinden met %s...)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 @@ -761,8 +764,8 @@ msgstr "Aanmelding op afstand" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Sessies:" +msgid "Session" +msgstr "Sessies" # flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 @@ -785,7 +788,7 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 msgid "Enable accessibility keyboard plugin" -msgstr "Toetsenbordplugin inschakelen" +msgstr "Toetsenbordtoegankelijkheidsplug-in activeren" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 msgid "Enable on-screen keyboard" @@ -810,130 +813,121 @@ msgstr "Pictogramnaam voor het aanmeldlogo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Recente toetsenbordindelingen" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Recent gebruikte talen" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "" -"Instellen op een lijst van standaard weer te geven toetsenbordindelingen." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +msgid "Set to a list of languages to be shown by default in the login window." msgstr "Instellen op een lijst van standaard weer te geven talen." # thema van pictogramnaam/naam van het themapictogram -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het " "aanmeldlogo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Inschakelen om de gebruikers van het systeem niet te tonen in het " "aanmeldvenster." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "Inschakelen om de plugin voor xrandr te gebruiken." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Inschakelen om de plugin voor het beheer van de media-toetsen te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Inschakelen om het schermtoetsenbord te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplugin te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Inschakelen om het vergrootglas te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Inschakelen om de schermlezer te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Inschakelen om de plugin voor het beheer van de geluidsinstellingen te " "gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "Inschakelen om de plugin voor xrandr te gebruiken." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Inschakelen om de plugin voor het beheer van de xsettings-instellingen te " "gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Inschakelen om het welkomstbericht te tonen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +msgid "Set to true to use Compiz as the window manager." msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst " "leeg is, in plaats van banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +msgid "Text banner message to show in the login window." msgstr "Tekst van het welkomstbericht in het aanmeldvenster." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "Ingeschakeld als de xrandr-plugin gebruikt wordt." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." -msgstr "Waar als de plugin voor achtergrondinstellingen gebruikt wordt." +msgstr "" +"Ingeschakeld als de plugin voor achtergrondinstellingen gebruikt wordt." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Ingeschakeld als de plugin voor het beheer van de media-toetsen gebruikt " "wordt." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "Ingeschakeld als de plugin voor het beheer van de geluidsinstellingen " "gebruikt wordt." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "Ingeschakeld als de xrandr-plugin gebruikt wordt." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." -msgstr "Waar als de plugin voor xsettings-instellingen gebruikt wordt." +msgstr "Ingeschakeld als de plugin voor xsettings-instellingen gebruikt wordt." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" msgstr "Compiz gebruiken voor het vensterbeheer" #: ../gui/simple-greeter/gdm-timer.c:149 @@ -963,208 +957,57 @@ msgid "Whether the timer is currently ticking" msgstr "Of de teller momenteel aan het aftellen is" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "Beheer" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "Het gebruikersbeheerobject waar deze gebruiker door beheerd wordt." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "Aanmelden als %s" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" -msgid "Other..." +msgid "Other…" msgstr "Anderen…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Kies een ander account" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gast" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" msgstr "Aanmelden als tijdelijke gast" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatische aanmelding" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" msgstr "Automatisch aanmelden na het selecteren van de opties" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "Aanmelden als %s" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Al aangemeld" -#: ../gui/user-switch-applet/applet.c:164 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Het applet voor wisselen van gebruikers is vrije software; U mag het " -"herdistribueren en/of wijzigen onder de voorwaarden van de GNU General " -"Public License als gepubliceerd door the Free Software Foundation; ofwel " -"versie 2, alsook (uw eigen optie) elke latere versie." - -#: ../gui/user-switch-applet/applet.c:168 -msgid "" -"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." -msgstr "" -"Dit programma wordt gedistribueerd in de hoop dat het bruikbaar zal zijn, " -"maar ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie voor " -"VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN SPECIFIEK DOEL. Zie de GNU General " -"Public License voor meer details." - -#: ../gui/user-switch-applet/applet.c:172 -msgid "" -"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 " -msgstr "" -"U zou een kopie ontvangen moeten hebben van de GNU General Public License " -"bij dit programma; indien dit niet het geval is, schrijf dan een brief naar " -"de Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " -"MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "Een menu om snel tussen gebruikers te wisselen." - -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "" -"Hein-Jan Leliveld\n" -"Vincent van Adrighem\n" -"Ronald Hummelink\n" -"Tino Meinen\n" -"Michiel Sikkes\n" -"Wouter Bolsterlee\n" -"\n" -"Kijk voor meer informatie op http://nl.gnome.org/" - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Kan scherm niet vergrendelen: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Kan schermbeveiliging niet tijdelijk instellen op zwart scherm: %s" - -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "Kan niet afmelden: %s" - -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "Beschikbaar" - -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "Onzichtbaar" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "Bezig" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "Afwezig" - -#: ../gui/user-switch-applet/applet.c:1133 -msgid "Account Information" -msgstr "Account-informatie" - -#: ../gui/user-switch-applet/applet.c:1145 -msgid "System Preferences" -msgstr "Systeemvoorkeuren" - -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "Scherm vergrendelen" - -# wissel/wisselen -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "Wisselen van gebruiker" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "Afsluiten…" - -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "Onbekend" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Gebruikers wisselen-applet" - -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "Account-instellingen en -status wijzigen" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Een menu om snel te wisselen tussen gebruikers" - -# wissel/wisselen -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Wisselen van gebruiker" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "User Switcher Applet Factory" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Persoonlijke _informatie bewerken" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "Info _over…" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Gebruikers en groepen be_werken" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Alleen VERSION wordt ondersteund" #: ../utils/gdmflexiserver.c:61 msgid "COMMAND" -msgstr "COMMAND" +msgstr "OPDRACHT" #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" +msgid "Ignored — retained for compatibility" msgstr "Genegeerd - aanwezig om compatibiliteitsredenen" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 @@ -1190,77 +1033,219 @@ msgid "Unable to start new display" msgstr "Kan geen nieuw scherm starten" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Schermafdruk gemaakt" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Een schermafdruk maken" -#~ msgid "Enable debugging code" -#~ msgstr "Debug-code gebruiken" +#~| msgid "Shutdown Options..." +#~ msgid "Shutdown Options…" +#~ msgstr "Afsluitopties..." + +#~ msgid "Keyboard layouts" +#~ msgstr "Toetsenbordindelingen" + +#~ msgid "_Keyboard:" +#~ msgstr "_Toetsenbord:" + +#~| msgctxt "keyboard" +#~| msgid "Other..." +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Overige…" -#~ msgid "id" -#~ msgstr "id" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Kies een toetsenbordindeling uit de lijst van beschikbare indelingen." -#~ msgid "worker exited with status %d" -#~ msgstr "opdracht afgesloten met status %d" +#~ msgid "Keyboard" +#~ msgstr "Toetsenbord" -#~ msgid "Unable establish credentials" -#~ msgstr "Kan eenmeldgegevens niet vaststellen" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Recente toetsenbordindelingen" -# wij zeggen maandag 12 feb ipv maandag feb 12 -# a=verkorte weekdag -# b=verkorte maand -# d=dag van de maand (01) -# e=dag van de maand (1) -# l=uur (1-12) -# p=lokaal equivalent van AM/PM -# H=uur (0-23) -# M=minuut -#~ msgid "%a %b %e" -#~ msgstr "%a %e %b" +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Instellen op een lijst van standaard weer te geven toetsenbordindelingen." -# a=verkorte weekdag -# b=verkorte maand -# d=dag van de maand (01) -# e=dag van de maand (1) -# l=uur (1-12) -# p=lokaal equivalent van AM/PM -# H=uur (0-23) -# M=minuut -#~ msgid "%1$s, %2$s" -#~ msgstr "%1$s, %2$s" +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Het applet voor wisselen van gebruikers is vrije software. U mag het " +#~ "herdistribueren en/of wijzigen onder de voorwaarden van de GNU General " +#~ "Public License als gepubliceerd door the Free Software Foundation; of " +#~ "versie 2, of (indien u dat verkiest) elke latere versie." -# opnieuw starten/opstarten /herstarten -# herstarten is mislukt/niet gelukt -#~ msgid "Failed to restart computer" -#~ msgstr "Kon de computer niet herstarten" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Dit programma wordt verspreid in de hoop dat het bruikbaar zal zijn, maar " +#~ "ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie voor " +#~ "VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN SPECIFIEK DOEL. Zie de GNU " +#~ "General Public License voor meer details." -# u heeft geen toestemming/u mag niet #~ msgid "" -#~ "You are not allowed to restart the computer because multiple users are " -#~ "logged in" +#~ "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 " #~ msgstr "" -#~ "U mag de computer niet herstarten omdat meerdere gebruikers aangemeld zijn" +#~ "U zou een kopie ontvangen moeten hebben van de GNU General Public License " +#~ "bij dit programma; indien dit niet het geval is, schrijf dan een brief " +#~ "naar de Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " +#~ "Boston, MA 02110-1301, USA " -# stoppen/afsluiten -#~ msgid "Failed to stop computer" -#~ msgstr "Kon de computer niet afsluiten" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Een menu om snel tussen gebruikers te wisselen." -#~ msgid "" -#~ "You are not allowed to stop the computer because multiple users are " -#~ "logged in" +#~ msgid "translator-credits" #~ msgstr "" -#~ "U mag de computer niet afsluiten omdat meerdere gebruikers aangemeld zijn" +#~ "Hein-Jan Leliveld\n" +#~ "Vincent van Adrighem\n" +#~ "Ronald Hummelink\n" +#~ "Tino Meinen\n" +#~ "Michiel Sikkes\n" +#~ "Wouter Bolsterlee\n" +#~ "Hannie Dumoleyn\n" +#~ "Kijk voor meer informatie op http://nl.gnome.org/\n" +#~ "\n" +#~ "Launchpad Contributions:\n" +#~ " Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n" +#~ " Heureka https://launchpad.net/~jan-de-ridder\n" +#~ " Redmar https://launchpad.net/~redmar\n" +#~ " Vincent van Adrighem https://launchpad.net/~adrighem\n" +#~ " cumulus007 https://launchpad.net/~cumulus-007\n" +#~ " musulini https://launchpad.net/~dmusulin" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Kan scherm niet vergrendelen: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Kan schermbeveiliging niet tijdelijk instellen op zwart scherm: %s" + +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Kan niet afmelden: %s" + +#~ msgid "Available" +#~ msgstr "Beschikbaar" + +#~ msgid "Invisible" +#~ msgstr "Onzichtbaar" + +#~ msgid "Busy" +#~ msgstr "Bezig" + +#~ msgid "Away" +#~ msgstr "Afwezig" + +#~ msgid "Account Information" +#~ msgstr "Account-informatie" + +#~ msgid "System Preferences" +#~ msgstr "Systeemvoorkeuren" + +#~ msgid "Lock Screen" +#~ msgstr "Scherm vergrendelen" + +# wissel/wisselen +#~ msgid "Switch User" +#~ msgstr "Wisselen van gebruiker" + +#~ msgid "Quit…" +#~ msgstr "Afsluiten…" + +#~ msgid "User Switch Applet" +#~ msgstr "Gebruikers wisselen-applet" + +#~ msgid "Change account settings and status" +#~ msgstr "Account-instellingen en -status wijzigen" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Een menu om snel te wisselen tussen gebruikers" + +# wissel/wisselen +#~ msgid "User Switcher" +#~ msgstr "Wisselen van gebruiker" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "User Switcher Applet Factory" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Persoonlijke _informatie bewerken" + +#~ msgid "_About" +#~ msgstr "Info _over…" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "Gebruikers en groepen be_werken" + +#~ msgid "name" +#~ msgstr "naam" + +#~ msgid "Change login screen configuration" +#~ msgstr "Instellingen van aanmeldscherm wijzigen" + +#~ msgid "Privileges are required to change the login screen configuration." +#~ msgstr "" +#~ "U heeft beheerdersrechten nodig om de instellingen van het aanmeldscherm " +#~ "te wijzigen." + +#~ msgid "Configure login screen behavior" +#~ msgstr "Gedrag van het aanmeldscherm instellen" + +#~ msgid "Login Screen" +#~ msgstr "Aanmeldscherm" + +#~ msgid "Log in as %s automatically" +#~ msgstr "Automatisch aanmelden als %s" + +#~ msgid "Allow %s seconds for anyone else to log in first" +#~ msgstr "%s seconden wachten, zodat anderen zich kunnen aanmelden" + +#~ msgid "Select %s as default session" +#~ msgstr "%s kiezen als standaardsessie" + +#~ msgid "Login Screen Settings" +#~ msgstr "Aanmeldscherm instellen" + +#~ msgid "Play login sound" +#~ msgstr "Geluid afspelen bij aanmelden" + +#~ msgid "Show list of users" +#~ msgstr "Gebruikerslijst weergeven" + +#~ msgid "When the computer starts up:" +#~ msgstr "Als de computer opstart:" + +#~ msgid "_Show the screen for choosing who will log in" +#~ msgstr "Het _scherm weergeven om de aan te melden account te kiezen" + +#~ msgid "Quit..." +#~ msgstr "Afsluiten…" + +#~ msgid "Unknown" +#~ msgstr "Onbekend" -#~ msgid "page 5" -#~ msgstr "pagina 5" +#~ msgid "_Sessions:" +#~ msgstr "_Sessies:" -#~ msgid "Enable debugging" -#~ msgstr "Debug-code gebruiken" +#~ msgid "Manager" +#~ msgstr "Beheer" -#~ msgid "Enable debugging mode for the greeter." -#~ msgstr "Debug-code gebruiken voor het aanmeldprogramma." +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "Het gebruikersbeheerobject waar deze gebruiker door beheerd wordt." diff -Nru gdm-2.32.1/po/nn.po gdm-3.0.0/po/nn.po --- gdm-2.32.1/po/nn.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/nn.po 2011-04-04 14:37:16.000000000 +0000 @@ -4,7 +4,7 @@ # Kjartan Maraas , 2001. # Roy-Magne Mo , 2001. # Åsmund Skjæveland , 2003, 2004, 2005, 2006. -# Åsmund Skjæveland , 2009, 2010. +# Åsmund Skjæveland , 2009, 2010, 2011. # Torstein Adolf Winterseth , 2009. # Torstein Adolf Winterseth , 2010. msgid "" @@ -12,33 +12,33 @@ "Project-Id-Version: nn\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-02-27 12:28+0000\n" -"PO-Revision-Date: 2010-02-28 10:11+0100\n" -"Last-Translator: Torstein Adolf Winterseth \n" -"Language-Team: Norwegian Nynorsk \n" +"POT-Creation-Date: 2011-03-08 05:40+0000\n" +"PO-Revision-Date: 2011-03-29 18:03+0200\n" +"Last-Translator: Åsmund Skjæveland \n" +"Language-Team: Norsk (nynorsk) \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=2; plural=(n != 1);\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom er ikkje ei teikn-eining" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Display-ID" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "ID" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME displayhandsamar-slave" @@ -47,86 +47,88 @@ msgid "could not find user \"%s\" on system" msgstr "klarte ikkje finna brukaren «%s» på systemet" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Klarte ikkje å starta påloggingsystemet" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Klarte ikkje å autentisera brukar" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Klarte ikkje å autorisera brukar" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Klarte ikkje å fastslå akkreditering" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 -#| msgid "Unable to authorize user" +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Klarte ikkje å opna økt" -#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1339 +#| msgid "" +#| "Could not start the X server (your graphical environment) due to some " +#| "internal error. Please contact your system administrator or check your " +#| "syslog to diagnose. In the meantime this display will be disabled. " +#| "Please restart GDM when the problem is corrected." msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." msgstr "" "Klarte ikkje starta X-tenaren (det grafiske miljøet) på grunn av ein intern " "feil. Kontakt systemansvarleg eller kontroller systemloggen for å finna ut " "kva som er feil. I mellomtida vil dette displayet verta slått av. Start GDM " "på nytt når feilen er retta." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: Klarte ikkje kopla til forelderdisplay «%s»" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "Tenaren skulle startast av brukar %s, men den brukaren finst ikkje" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Klarte ikkje setja groupid til %d" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () feila for %s" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Klarte ikkje setja brukarid til %d" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "Klarte ikkje setja groupid til 0" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +#| msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: Klarte ikkje opna loggfila for display %s!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Feil ved setjing av %s til %s" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Klarte ikkje setja tenarprioritet til %d: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Tom tenarkommando for display %s" @@ -155,222 +157,229 @@ msgid "The display device" msgstr "Display-eininga" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1064 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "feil under oppstart av samtale med autentiseringssystemet - %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1065 msgid "general failure" msgstr "uspesifikk feil" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1066 msgid "out of memory" msgstr "tom for minne" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1067 msgid "application programmer error" msgstr "programmeringsfeil" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1068 msgid "unknown error" msgstr "ukjent feil" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1075 msgid "Username:" msgstr "Brukarnamn:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1081 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +#| msgid "" +#| "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "feil under varsling av autentiseringssystemet om foretrukken " -"brukarnamndialog - %s" +"brukarnamndialog: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1095 #, c-format -msgid "error informing authentication system of user's hostname - %s" +#| msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" msgstr "" -"feil under varsling av autentiseringssystemet om vertsnamnet til brukaren - %" -"s" +"feil under varsling av autentiseringssystemet om vertsnamnet til brukaren: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1110 #, c-format -msgid "error informing authentication system of user's console - %s" +#| msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" msgstr "" -"feil under varsling av autentiseringssystemet om konsollet til brukaren - %s" +"feil under varsling av autentiseringssystemet om konsollet til brukaren: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1123 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "feil under varsling av autentiseringssystemet om display-streng - %s" +#| msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" +msgstr "feil under varsling av autentiseringssystemet om display-streng: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1138 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" +#| msgid "" +#| "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" msgstr "" -"feil under varsling av autentiseringssystemet om display-xauth-akkreditering " -"- %s" +"feil under varsling av autentiseringssystemet om " +"display-xauth-akkreditering: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1460 ../daemon/gdm-session-worker.c:1477 #, c-format msgid "no user account available" msgstr "ingen brukarkonto tilgjengeleg" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1504 msgid "Unable to change to user" msgstr "Klarte ikkje å byta til brukar" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Brukaren %s finst ikkje" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Gruppa %s finst ikkje" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Klarte ikkje laga sokkel!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "Avslo XDCMP-førespurnad frå vert %s" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "Klarte ikkje henta autentiseringsliste frå pakken" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Feil i sjekksum" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Ugyldig adresse" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Klarte ikkje lesa displayadresse" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Klarte ikkje lesa portnummeret til displayet." -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Klarte ikkje henta autentiseringsliste frå pakken" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: Feil i sjekksum" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: Fekk REQUEST frå bannlyst vert %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Klarte ikkje lesa displaynummer" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Klarte ikkje lesa tilkoplingstype" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: Klarte ikkje lesa klientadressa" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Klarte ikkje lesa autentiseringsnamn" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Klarte ikkje lesa autentiseringsdata" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Klarte ikkje lesa autoriseringslista" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Klarte ikkje lesa produsent-ID" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: Sjekksum feila for %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: Fekk Manage frå bannlyst vert %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Klarte ikkje lesa økt-ID" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Klarte ikkje lesa displayklasse" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Klarte ikkje lesa adresse" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: Fekk KEEPALIVE frå bannlyst vert %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: Klarte ikkje lesa XDMCP-hovud!" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XDMCP: Feil versjon av XDMCP!" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XDMCP: Klarte ikkje å tolka adressa" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Klarte ikkje å få tak i maskinnamnet til tenaren: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" +#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "Klarte ikkje skriva PID-fila %s. Kanskje disken er full: %s" #: ../daemon/main.c:271 @@ -423,8 +432,9 @@ msgstr "Gjer alle åtvaringar fatale" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "Avslutt etter ei tid - for feilsøking" +#| msgid "Exit after a time - for debugging" +msgid "Exit after a time (for debugging)" +msgstr "Avslutt etter ei tid (for feilsøking)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -435,20 +445,23 @@ msgstr "GNOME displayhandsamar" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Det er berre root som skal starta GDM" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME Display Manager øktarbeidar" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "AT SPI registerinnpakking" +#| msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" +msgstr "AT-SPI registerinnpakking" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1752 msgid "Login Window" msgstr "Innloggingsvindauge" @@ -473,11 +486,13 @@ msgstr "Forstørr deler av skjermen" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +#| msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "GNOME tastatur på skjermen" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" +#| msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" msgstr "Vis tastatur på skjermen" #: ../data/greeter-autostart/metacity.desktop.in.h:1 @@ -496,48 +511,48 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit autentiseringsagent" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Vel system" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: Klarte ikkje laga XDMCP-mellomlager." -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Klarte ikkje lesa XDMCP-hovud." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Verdi" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "prosent ferdig, i tid" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inaktiv tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Tekst som vert brukt i merkelappen om brukaren ikkje har gjort eit val enno" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktiv tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Tekst som vert brukt i merkelappen om brukaren har gjort eit val" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Liste synleg" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Om veljarlista er synleg" @@ -562,14 +577,6 @@ msgid "%a %l:%M:%S %p" msgstr "%a %H.%M.%S" -#. translators: This is the time format to use for the date -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:87 -#: ../gui/simple-greeter/gdm-clock-widget.c:94 -#, c-format -msgid "%x" -msgstr "%x" - #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. @@ -577,124 +584,130 @@ msgid "%a %l:%M %p" msgstr "%a %H.%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +#| msgid "Automatically logging in..." +msgid "Automatically logging in…" msgstr "Loggar inn automatisk …" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 +msgid "Select language and click Log In" +msgstr "Vel språk og klikk «Logg inn»" + #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 +#| msgid "Cancelling..." +msgid "Cancelling…" msgstr "Stoppar …" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 -msgid "Select language and click Log In" -msgstr "Vel språk og klikk «Logg inn»" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 +#| msgid "C_ustom:" +msgctxt "customsession" +msgid "Custom" +msgstr "Sjølvvald" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 +#| msgid "_Last session" +msgid "Custom session" +msgstr "Sjølvvald økt" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Avbryt" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Maskinnamn" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#| msgid "Log In" +msgid "Login" msgstr "Logg inn" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Lås opp" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versjon" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "Brukarval for avslutting …" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Gå i kvilemodus" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Start om att" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Slå av" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Ukjend tid står att" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Språk" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "S_pråk:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "S_pråk:" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +#| msgctxt "language" +#| msgid "Other..." msgctxt "language" -msgid "Other..." +msgid "Other…" msgstr "Anna …" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Vel eit språk frå den fulle lista over tilgjengelege språk." -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#| msgid "Languages" +msgid "Language" +msgstr "Språk" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Uspesifisert" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tastaturoppsett" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "_Tastatur:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "Anna …" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Vel eit tastaturoppsett frå den fulle lista over tilgjengelege oppsett." - -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Tekst på merkelapp" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "Tekst å bruka på merkelapp" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Ikonnamn" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Ikon å bruka på merkelapp" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "Standardelement" -#: ../gui/simple-greeter/gdm-option-widget.c:525 +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" msgstr "ID på standardelementet" @@ -708,8 +721,9 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "Fjerninnlogging ( Koplar til %s …)" +#| msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "Fjerninnlogging (Koplar til %s …)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -721,8 +735,9 @@ msgstr "Fjerninnlogging" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Økter:" +#| msgid "Sessions" +msgid "Session" +msgstr "Økt" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -765,52 +780,50 @@ msgstr "Ikonnamn til velkomstlogoen" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nyleg valde tastaturopsett" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nyleg valde språk" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "" -".Lag ei liste over tastaturoppsett som skal visast i påloggingsvindauget" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr ".Lag ei liste over språk som skal visast i påloggingsvindauget" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#| msgid "" +#| "Set to a list of languages to be shown by default at the login window." +msgid "Set to a list of languages to be shown by default in the login window." +msgstr "Sett til ei liste over språk som skal visast i påloggingsvindauget." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Vel draktikonet som skal brukast i velkomstlogoen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "Sett til sann for å ikkje visa kjende brukarar i påloggingsvindauget." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Sett til sann for å slå av framsyning av omstartknappane i " "påloggingsvindauget." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#| msgid "Set to true to enable the xrandr settings manager plugin." +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "" +"Sett til sann for å bruka tillegget for handsaming av XRandR-innstillingar." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Sett til sann for å bruka tillegget for bakgrunnsinnstillingshandsamaren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Sett til sann for å bruka tillegget for mediatastinnstillingshandsamaren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Sett til sann for å bruka tastatur på skjermen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -818,72 +831,74 @@ "Sett til sann for å bruka tillegget til å styra innstillingar for " "tastaturhjelpefunksjonar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Sett til sann for å bruka skjermforstørraren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Sett til sann for å bruka skjermlesaren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Sett til sann for å bruka tillegget for handsaming av lydstyring." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "" -"Sett til sann for å bruka tillegget for handsaming av xrandr-innstillingar." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Sett til sann for å bruka tillegget for styring av xsettings-innstillingar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Sett til sann for å visa tekstoverskrifta." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." -msgstr "Sett til sann for å bruka compiz som vindaugehandsamar." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#| msgid "Set to true to use compiz as the window manager." +msgid "Set to true to use Compiz as the window manager." +msgstr "Sett til sann for å bruka Compiz som vindaugehandsamar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#| msgid "" +#| "Text banner message to show on the login window when the user chooser is " +#| "empty, instead of banner_message_text." msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -"Tekstoverskrift å visa på påloggingsskjermen når brukarveljaren er tom, i " +"Tekstoverskrift å visa i påloggingsvindauget når brukarveljaren er tom, i " "staden for banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." -msgstr "Tekstoverskrift å visa på påloggingsskjermen." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#| msgid "Text banner message to show on the login window." +msgid "Text banner message to show in the login window." +msgstr "Tekstoverskrift å visa i påloggingsvindauget." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#| msgid "True if the xrandr settings manager plugin is enabled." +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "Sann om tillegget for styring av XRandR-innstillingar er i bruk." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Sann om tillegget for styring av bakgrunnsinnstillingar er i bruk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Sann om tillegget for styring av innstillingar for mediatastar er i bruk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Sann om tillegget for styring av lydinnstillingar er i bruk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "Sann om tillegget for styring av xrandr-innstillingar er i bruk." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Sann om tillegget for styring av xsettings-innstillingar er i bruk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" -msgstr "Bruk compiz som vindaugehandsamar" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#| msgid "Use compiz as the window manager" +msgid "Use Compiz as the window manager" +msgstr "Bruk Compiz som vindaugehandsamar" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -909,191 +924,50 @@ msgid "Whether the timer is currently ticking" msgstr "Om nedteljinga går" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "Handsamar" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "Brukarhandsamarobjektet denne brukaren er kontrollert av." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:769 +#, c-format +msgid "Log in as %s" +msgstr "Logg inn som %s" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:533 +#| msgctxt "user" +#| msgid "Other..." msgctxt "user" -msgid "Other..." +msgid "Other…" msgstr "Anna …" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:534 msgid "Choose a different account" msgstr "Vel ein annan konto" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:548 msgid "Guest" msgstr "Gjest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:549 +#| msgid "Login as a temporary guest" +msgid "Log in as a temporary guest" msgstr "Logg inn som mellombels gjest" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:564 msgid "Automatic Login" msgstr "Automatisk innlogging" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:565 +#| msgid "Automatically login to the system after selecting options" +msgid "Automatically log into the system after selecting options" msgstr "Logg inn på systemet automatisk etter å ha gjort val" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "Logg inn som %s" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1309 msgid "Currently logged in" msgstr "Er logga inn" -#: ../gui/user-switch-applet/applet.c:164 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Brukarbytteprogrammet er fri programvare. Du kan redistribuera og/eller " -"endra programmet under vilkåra gjevne i GNU General Public License som " -"utgjeven av Free Software Foundation; anten versjon 2 av lisensen, eller " -"(viss du ynskjer det) einkvar seinare versjon." - -#: ../gui/user-switch-applet/applet.c:168 -msgid "" -"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." -msgstr "" -"Programmet vert distribuert i håp om at programmet er nyttig, men utan NOKON " -"GARANTI, ikkje eingong implisitt garanti om at det er SALGBART eller PASSAR " -"EIT BESTEMT FORMÅL. Sjå GNU General Public License for detaljar." - -#: ../gui/user-switch-applet/applet.c:172 -msgid "" -"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 " -msgstr "" -"Du skal ha mottatt ein kopi av GNU General Public License saman med dette " -"programmet. Viss dette ikkje er tilfelle, kan du skriva til Free Software " -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " -"USA." - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "Ein meny for å byta raskt mellom brukarar." - -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "" -"Kjartan Maraas\n" -"Roy-Magne Mo\n" -"Åsmund Skjæveland\n" -"Torstein A. Winterseth\n" -"Send feilmeldingar og kommentarar til i18n-nn@lister.ping.uio.no" - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Klarte ikke låsa skjermen: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Klarte ikkje å mellombels byta til skjermsparar med blank skjerm: %s" - -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "Klarte ikkje logga ut: %s" - -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "Tilgjengeleg" - -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "Usynleg" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "Oppteken" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "Vekke" - -#: ../gui/user-switch-applet/applet.c:1133 -msgid "Account Information" -msgstr "Kontoinformasjon" - -#: ../gui/user-switch-applet/applet.c:1145 -msgid "System Preferences" -msgstr "Systembrukarval" - -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "Lås skjerm" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "Byt brukar" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "Avslutt …" - -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "Ukjend" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Program for brukarbyte" - -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "Endra kontoinnstillingar og status" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Ein meny for å byta raskt mellom brukarar" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Brukarbyte" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Factory for brukarbyteprogram" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Endra personleg _informasjon" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Om" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Endra brukarar og grupper" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Berre VERSION-kommandoen er støtta" @@ -1104,8 +978,9 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "Ignorert - teke med av kompatibilitetsomsyn" +#| msgid "Ignored - retained for compatibility" +msgid "Ignored — retained for compatibility" +msgstr "Ignorert ­– teke med av kompatibilitetsomsyn" #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 msgid "Debugging output" @@ -1129,15 +1004,163 @@ msgid "Unable to start new display" msgstr "Klarte ikkje starta nytt display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Skjermbilete teke" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Ta eit bilete av skjermen" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "Klarte ikkje setja groupid til 0" + +#~ msgid "%x" +#~ msgstr "%x" + +#~ msgid "Shutdown Options..." +#~ msgstr "Brukarval for avslutting …" + +#~ msgid "Keyboard layouts" +#~ msgstr "Tastaturoppsett" + +#~ msgid "_Keyboard:" +#~ msgstr "_Tastatur:" + +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Anna …" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Vel eit tastaturoppsett frå den fulle lista over tilgjengelege oppsett." + +#~ msgid "_Sessions:" +#~ msgstr "_Økter:" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Nyleg valde tastaturopsett" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ ".Lag ei liste over tastaturoppsett som skal visast i påloggingsvindauget" + +#~ msgid "Manager" +#~ msgstr "Handsamar" + +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "Brukarhandsamarobjektet denne brukaren er kontrollert av." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Brukarbytteprogrammet er fri programvare. Du kan redistribuera og/eller " +#~ "endra programmet under vilkåra gjevne i GNU General Public License som " +#~ "utgjeven av Free Software Foundation; anten versjon 2 av lisensen, eller " +#~ "(viss du ynskjer det) einkvar seinare versjon." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Programmet vert distribuert i håp om at programmet er nyttig, men utan " +#~ "NOKON GARANTI, ikkje eingong implisitt garanti om at det er SALGBART " +#~ "eller PASSAR EIT BESTEMT FORMÅL. Sjå GNU General Public License for " +#~ "detaljar." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Du skal ha mottatt ein kopi av GNU General Public License saman med dette " +#~ "programmet. Viss dette ikkje er tilfelle, kan du skriva til Free Software " +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " +#~ "USA." + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Ein meny for å byta raskt mellom brukarar." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Kjartan Maraas\n" +#~ "Roy-Magne Mo\n" +#~ "Åsmund Skjæveland\n" +#~ "Torstein A. Winterseth\n" +#~ "Send feilmeldingar og kommentarar til i18n-nn@lister.ping.uio.no" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Klarte ikke låsa skjermen: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Klarte ikkje å mellombels byta til skjermsparar med blank skjerm: %s" + +#~ msgid "Can't logout: %s" +#~ msgstr "Klarte ikkje logga ut: %s" + +#~ msgid "Available" +#~ msgstr "Tilgjengeleg" + +#~ msgid "Invisible" +#~ msgstr "Usynleg" + +#~ msgid "Busy" +#~ msgstr "Oppteken" + +#~ msgid "Away" +#~ msgstr "Vekke" + +#~ msgid "Account Information" +#~ msgstr "Kontoinformasjon" + +#~ msgid "System Preferences" +#~ msgstr "Systembrukarval" + +#~ msgid "Lock Screen" +#~ msgstr "Lås skjerm" + +#~ msgid "Switch User" +#~ msgstr "Byt brukar" + +#~ msgid "Quit..." +#~ msgstr "Avslutt …" + +#~ msgid "Unknown" +#~ msgstr "Ukjend" + +#~ msgid "User Switch Applet" +#~ msgstr "Program for brukarbyte" + +#~ msgid "Change account settings and status" +#~ msgstr "Endra kontoinnstillingar og status" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Ein meny for å byta raskt mellom brukarar" + +#~ msgid "User Switcher" +#~ msgstr "Brukarbyte" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Factory for brukarbyteprogram" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Endra personleg _informasjon" + +#~ msgid "_About" +#~ msgstr "_Om" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Endra brukarar og grupper" + #~ msgid "Authentication Dialog" #~ msgstr "Autentiseringsdialog" @@ -3275,9 +3298,6 @@ #~ msgid "C_ommand:" #~ msgstr "K_ommando:" -#~ msgid "C_ustom:" -#~ msgstr "E_igendefinert:" - #~ msgid "Co_lor:" #~ msgstr "_Farge:" @@ -3615,12 +3635,6 @@ #~ msgid "Change _Session" #~ msgstr "Endra _økt" -#~ msgid "Sessions" -#~ msgstr "Økter" - -#~ msgid "_Last session" -#~ msgstr "_Førre økt" - #~ msgid "Log in using the session that you have used last time you logged in" #~ msgstr "Logg inn ved å bruke økta du siste hadde då du logga på." diff -Nru gdm-2.32.1/po/or.po gdm-3.0.0/po/or.po --- gdm-2.32.1/po/or.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/or.po 2011-04-04 14:37:16.000000000 +0000 @@ -3,13 +3,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # Subhransu Behera , 2006. -# Manoj Kumar Giri , 2008, 2009, 2010. +# Manoj Kumar Giri , 2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-28 09:31+0000\n" -"PO-Revision-Date: 2010-07-29 15:05+0530\n" +"POT-Creation-Date: 2011-02-17 16:55+0000\n" +"PO-Revision-Date: 2011-03-04 15:08+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "MIME-Version: 1.0\n" @@ -22,9 +22,9 @@ "\n" "\n" "\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.1\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ଟି ଗୋଟିଏ ସମ୍ପ୍ରତିକ ଉପକରଣ ନୁହଁ" @@ -49,33 +49,28 @@ msgid "could not find user \"%s\" on system" msgstr "ତନ୍ତ୍ରରେ ଚାଳକ \"%s\" କୁ ଖୋଜି ପାଉନାହିଁ" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 msgid "Unable to initialize login system" msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 msgid "Unable to authenticate user" msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 msgid "Unable to authorize user" msgstr "ଚାଳକକୁ ପ୍ରାଧିକୃତ କରିବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 msgid "Unable to establish credentials" msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 msgid "Unable to open session" msgstr "ଅଧିବେଶନ ଖୋଲିବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1259 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -98,24 +93,23 @@ msgstr "ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "ସମୂହ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s ପାଇଁ initgroups () ବିଫଳ ହେଲା" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "ଚାଳକ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଲଗ ଫାଇଲକୁ ଖୋଲି ପାରିଲା ନାହିଁ!" @@ -159,79 +153,71 @@ msgid "The display device" msgstr "ପ୍ରଦର୍ଶନ ଉପକରଣ" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1289 #, c-format -#| msgid "error initiating conversation with authentication system - %s" msgid "error initiating conversation with authentication system: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ: %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1290 msgid "general failure" msgstr "ସାଧାରଣ ବିଫଳତା" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1291 msgid "out of memory" msgstr "ସ୍ମୃତି ସ୍ଥାନର ଅଭାବ" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1292 msgid "application programmer error" msgstr "ପ୍ରୟୋଗ ପ୍ରଗ୍ରାମ ତ୍ରୁଟି" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1293 msgid "unknown error" msgstr "ଅଜଣା ତ୍ରୁଟି" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1300 msgid "Username:" msgstr "ଚାଳକ ନାମ:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1306 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1320 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1335 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ଚାଳକର କୋନସୋଲର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1348 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ବାକ୍ୟଖଣ୍ଡ ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1363 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677 #, c-format msgid "no user account available" msgstr "କୌଣସି ଚାଳକ ଖାତା ଉପଲବ୍ଧ ନାହିଁ" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1704 msgid "Unable to change to user" msgstr "ଚାଳକକୁ ପରିବର୍ତ୍ତନ ହେବାରେ ଅସମର୍ଥ" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "ଚାଳକ %s ଅବସ୍ଥିତ ନାହିଁ" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ" @@ -375,7 +361,6 @@ #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "PID ଫାଇଲ %s କୁ ଲେଖି ପାରିବ ନାହିଁ: ସମ୍ଭବତଃ ଡିସ୍କରେ ଖାଲି ସ୍ଥାନ ନାହିଁ: %s" @@ -427,7 +412,6 @@ msgstr "ସବୁ ଚେତାବନୀଗୁଡିକୁ ମାରାତ୍ମକ କରନ୍ତୁ" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "ଗୋଟିଏ ସମୟ ପରେ ପ୍ରସ୍ଥାନକରନ୍ତୁ (ତ୍ରୁଟି ନିବାରଣ ପାଇଁ)" @@ -451,12 +435,11 @@ msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧିବେଶନ କାର୍ଯ୍ୟକର୍ତ୍ତା" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753 msgid "Login Window" msgstr "ଲଗଇନ ୱିଣ୍ଡୋ" @@ -481,12 +464,10 @@ msgstr "ପରଦାର ବର୍ଦ୍ଧିତ ଅଂଶ" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "GNOME ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "ଗୋଟିଏ ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ" @@ -506,7 +487,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "ତନ୍ତ୍ର ଚୟନ କରନ୍ତୁ" @@ -518,35 +499,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "ମୂଲ୍ଯ" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "ସମ୍ପୂର୍ଣ୍ଣ ସମୟର ପ୍ରତିଶତ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "ନିଷ୍କ୍ରିୟ ପାଠ୍ୟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "ଯଦି ଚାଳକ ଗୋଟିଏ ବସ୍ତୁ ଉଠାଇ ନଥାଏ ତେବେ ନାମପଟିରେ ବ୍ୟବହାର ହେବାକୁ ଥିବା ପାଠ୍ୟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "ସକ୍ରିୟ ପାଠ୍ୟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ଯଦି ଚାଳକ ଗୋଟିଏ ବସ୍ତୁ ଉଠାଇଛି ତେବେ ନାମପଟିରେ ବ୍ୟବହାର ହେବାକୁ ଥିବା ପାଠ୍ୟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "ଅତି କମ ଦୃଶ୍ୟମାନ ହେଉଥିବା" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "ଚୟନକାରୀ ତାଲିକାଟି ଦୃଶ୍ୟମାନ ହେବା ଉଚିତ କି ନୁହଁ" @@ -578,69 +559,70 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "ସ୍ବୟଂଚାଳିତ ଭାବରେ ଲଗଇନ କରୁଅଛି…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 msgid "Select language and click Log In" msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 msgid "Cancelling…" msgstr "ବାତିଲ କରୁଅଛି…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 +msgctxt "customsession" +msgid "Custom" +msgstr "ଇଚ୍ଛାମୁତାବକ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 +msgid "Custom session" +msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "ବାତିଲ କରନ୍ତୁ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "କମ୍ପୁଟର ନାମ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "ଲଗଇନ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "ଖୋଲନ୍ତୁ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "ସଂସ୍କରଣ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "ଫଳକ" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -#| msgid "Shutdown Options..." -msgid "Shutdown Options…" -msgstr "ବନ୍ଦ କରିବା ବିକଳ୍ପଗୁଡ଼ିକ…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "ନିଲମ୍ବନ କରନ୍ତୁ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "ପୂନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "ବନ୍ଦ କରନ୍ତୁ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "ଇଚ୍ଛାମୁତାବକ" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "କେତେ ସମୟ ବଳିଛି ଜଣାନାହିଁ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "ଫଳକ" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ଭାଷା" @@ -656,8 +638,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "ଅନ୍ଯାନ୍ଯ…" @@ -667,42 +647,13 @@ msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "ଭାଷା" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "କି ବୋର୍ଡ ବିନ୍ୟାସଗୁଡ଼ିକ" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "କି ବୋର୍ଡ (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "ଅନ୍ଯାନ୍ଯ…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "ଉପଲବ୍ଧ ବିନ୍ୟାସଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ କି ବୋର୍ଡ ବିନ୍ୟାସ ଚୟନ କରନ୍ତୁ." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "କି ବୋର୍ଡ" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "ପାଠ୍ୟକୁ ଚିହ୍ନଟ କରନ୍ତୁ" @@ -737,7 +688,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "ସୁଦୂର ଲଗଇନ (%s ସହିତ ସଂଯୋଗ କରୁଅଛି…)" @@ -751,7 +701,6 @@ msgstr "ସୁଦୂର ଲଗଇନ" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "ଅଧିବେଶନ" @@ -796,125 +745,105 @@ msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "ନିକଟରେ ବଛାଯାଇଥିବା କି ବୋର୍ଡ ବିନ୍ୟାସଗୁଡ଼ିକ" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ କି ବୋର୍ଡ ବିନ୍ୟାସ ତାଲିକାରେ ସେଟକରନ୍ତୁ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." -msgstr "ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." +msgstr "" +"ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -"banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ " -"ଯେତେବେଳେ ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" +"banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ ଯେତେବେଳେ " +"ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. " -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ" @@ -943,7 +872,7 @@ msgstr "ସମୟ ମାପକଟି ବର୍ତ୍ତମାନ ଟିକଟିକ କରୁଛି କି ନାହିଁ" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 #, c-format msgid "Log in as %s" msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ" @@ -953,173 +882,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 msgctxt "user" msgid "Other…" msgstr "ଅନ୍ଯାନ୍ଯ…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 msgid "Choose a different account" msgstr "ଗୋଟିଏ ପୃଥକ ଖାତା ଚୟନ କରନ୍ତୁ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 msgid "Guest" msgstr "ଅତିଥି" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 msgid "Log in as a temporary guest" msgstr "ଅସ୍ଥାୟୀ ଅତିଥି ଭାବରେ ଲଗଇନ କରନ୍ତୁ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 msgid "Automatic Login" msgstr "ସ୍ବୟଂଚାଳିତ ଲଗଇନ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 msgid "Automatically log into the system after selecting options" msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ବାଛିସାରିବା ପରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ତନ୍ତ୍ରରେ ଲଗଇନ ହେବା" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 msgid "Currently logged in" msgstr "ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇ ସାରିଛି" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "ଚାଳକମାନଙ୍କ ମଧ୍ଯରେ ତୁରନ୍ତ ସୁଇଚ କରିବା ପାଇଁ ଥିବା ତାଲିକା." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "ଶୁଭ୍ରାଂଶୁ ବେହେରା " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "ପରଦାକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିପାରିବେ ନାହିଁ: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "ଖାଲି ପରଦାରେ ଅସ୍ଥାୟୀ ଭାବରେ ବିନ୍ୟାସିତ ପରଦା ସଂରକ୍ଷକ: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "ଲଗଆଉଟ କରିପାରିବେ ନାହିଁ: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "ଉପଲବ୍ଧ" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "ଅଦୃଶ୍ଯ" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "ବ୍ଯସ୍ତ" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "ଅନୁପସ୍ଥିତ" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "ଖାତା ସୂଚନା" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "ତନ୍ତ୍ର ପସନ୍ଦ" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "ପରଦାକୁ ତାଲା ଦେଇ ରଖନ୍ତୁ" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "ଚାଳକ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "ପ୍ରସ୍ଥାନ କରନ୍ତୁ…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "ଅଜଣା" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "ଚାଳକ ସୁଇଚ ଆପଲେଟ" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "ଖାତା ସଂରଚନା ଏବଂ ସ୍ଥିତିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ଚାଳକମାନଙ୍କ ମଧ୍ୟରେ ତୁରନ୍ତ ସୁଇଚ କରିବା ପାଇଁ ଗୋଟିଏ ତାଲିକା" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "ଚାଳକ ପରିବର୍ତ୍ତକ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "ଚାଳକ ବଦଳାଉଥିବା ଆପଲେଟ କାରଖାନା" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "ବ୍ୟକ୍ତିଗତ ସୂଚନାକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "ବିବରଣୀ (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ଚାଳକ ଏବଂ ସମୂହକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ" @@ -1130,7 +921,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି" @@ -1156,12 +946,148 @@ msgid "Unable to start new display" msgstr "ନୂତନ ପ୍ରଦର୍ଶନକୁ ପ୍ରାରମ୍ଭ କରିପାରିବ ନାହିଁ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇଛି" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "ପରଦାର ଗୋଟିଏ ପ୍ରତିଛବି ନିଅନ୍ତୁ" +#~| msgid "Shutdown Options..." +#~ msgid "Shutdown Options…" +#~ msgstr "ବନ୍ଦ କରିବା ବିକଳ୍ପଗୁଡ଼ିକ…" + +#~ msgid "Keyboard layouts" +#~ msgstr "କି ବୋର୍ଡ ବିନ୍ୟାସଗୁଡ଼ିକ" + +#~ msgid "_Keyboard:" +#~ msgstr "କି ବୋର୍ଡ (_K):" + +#~| msgctxt "keyboard" +#~| msgid "Other..." +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "ଅନ୍ଯାନ୍ଯ…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "ଉପଲବ୍ଧ ବିନ୍ୟାସଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ କି ବୋର୍ଡ ବିନ୍ୟାସ ଚୟନ କରନ୍ତୁ." + +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "କି ବୋର୍ଡ" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "ନିକଟରେ ବଛାଯାଇଥିବା କି ବୋର୍ଡ ବିନ୍ୟାସଗୁଡ଼ିକ" + +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଭାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ କି ବୋର୍ଡ ବିନ୍ୟାସ ତାଲିକାରେ " +#~ "ସେଟକରନ୍ତୁ।" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ଚାଳକମାନଙ୍କ ମଧ୍ଯରେ ତୁରନ୍ତ ସୁଇଚ କରିବା ପାଇଁ ଥିବା ତାଲିକା." + +#~ msgid "translator-credits" +#~ msgstr "ଶୁଭ୍ରାଂଶୁ ବେହେରା " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "ପରଦାକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିପାରିବେ ନାହିଁ: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "ଖାଲି ପରଦାରେ ଅସ୍ଥାୟୀ ଭାବରେ ବିନ୍ୟାସିତ ପରଦା ସଂରକ୍ଷକ: %s" + +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "ଲଗଆଉଟ କରିପାରିବେ ନାହିଁ: %s" + +#~ msgid "Available" +#~ msgstr "ଉପଲବ୍ଧ" + +#~ msgid "Invisible" +#~ msgstr "ଅଦୃଶ୍ଯ" + +#~ msgid "Busy" +#~ msgstr "ବ୍ଯସ୍ତ" + +#~ msgid "Away" +#~ msgstr "ଅନୁପସ୍ଥିତ" + +#~ msgid "Account Information" +#~ msgstr "ଖାତା ସୂଚନା" + +#~ msgid "System Preferences" +#~ msgstr "ତନ୍ତ୍ର ପସନ୍ଦ" + +#~ msgid "Lock Screen" +#~ msgstr "ପରଦାକୁ ତାଲା ଦେଇ ରଖନ୍ତୁ" + +#~ msgid "Switch User" +#~ msgstr "ଚାଳକ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" + +#~ msgid "Quit…" +#~ msgstr "ପ୍ରସ୍ଥାନ କରନ୍ତୁ…" + +#~ msgid "Unknown" +#~ msgstr "ଅଜଣା" + +#~ msgid "User Switch Applet" +#~ msgstr "ଚାଳକ ସୁଇଚ ଆପଲେଟ" + +#~ msgid "Change account settings and status" +#~ msgstr "ଖାତା ସଂରଚନା ଏବଂ ସ୍ଥିତିକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ଚାଳକମାନଙ୍କ ମଧ୍ୟରେ ତୁରନ୍ତ ସୁଇଚ କରିବା ପାଇଁ ଗୋଟିଏ ତାଲିକା" + +#~ msgid "User Switcher" +#~ msgstr "ଚାଳକ ପରିବର୍ତ୍ତକ" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "ଚାଳକ ବଦଳାଉଥିବା ଆପଲେଟ କାରଖାନା" + +#~ msgid "Edit Personal _Information" +#~ msgstr "ବ୍ୟକ୍ତିଗତ ସୂଚନାକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_I)" + +#~ msgid "_About" +#~ msgstr "ବିବରଣୀ (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ଚାଳକ ଏବଂ ସମୂହକୁ ସମ୍ପାଦନ କରନ୍ତୁ (_E)" diff -Nru gdm-2.32.1/po/pa.po gdm-3.0.0/po/pa.po --- gdm-2.32.1/po/pa.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/pa.po 2011-04-04 14:37:16.000000000 +0000 @@ -5,23 +5,24 @@ # # Amanpreet Singh Alam , 2004. # Amanpreet Singh Alam , 2004,2005,2006, 2007,2008,2009. -# A S Alam , 2009, 2010. +# A S Alam , 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-02 11:25+0000\n" -"PO-Revision-Date: 2010-08-04 14:28+0530\n" +"cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-26 23:16+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \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" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: pa\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ਕਰੈਟਰ ਜੰਤਰ ਨਹੀਂ ਹੈ" @@ -46,36 +47,38 @@ msgid "could not find user \"%s\" on system" msgstr "ਸਿਸਟਮ ਉੱਤੇ \"%s\" ਯੂਜ਼ਰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "ਲਾਗਇਨ ਸਿਸਟਮ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "ਯੂਜ਼ਰ ਪਰਮਾਣਿਤ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "ਯੂਜ਼ਰ ਪਰਮਾਣਿਤ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "ਕਰਿਡਿਨਟਲਸ ਸਥਾਪਤ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "ਸ਼ੈਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " "diagnose. In the meantime this display will be disabled. Please restart GDM " "when the problem is corrected." msgstr "" -"ਇੱਕ ਅੰਦਰੂਨੀ ਗਲਤੀ ਕਾਰਨ X ਸਰਵਰ (ਤੁਹਾਡਾ ਗਰਾਫੀਕਲ ਇੰਵਾਰਨਮੈਂਟ) ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ ਸਕਿਆ।ਆਪਣੇ ਸਿਸਟਮ " -"ਪਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜਾਂ ਜਾਂਚ ਕਰਨ ਲਈ ਸਿਸਟਮ ਲਾਗ (syslog) ਵੇਖੋ। ਵਿਚਲੇ ਸਮੇਂ ਦੌਰਾਨ ਇਹ " +"ਇੱਕ ਅੰਦਰੂਨੀ ਗਲਤੀ ਕਾਰਨ X ਸਰਵਰ (ਤੁਹਾਡਾ ਗਰਾਫੀਕਲ ਇੰਵਾਰਨਮੈਂਟ) ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ " +"ਸਕਿਆ।ਆਪਣੇ ਸਿਸਟਮ " +"ਪਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜਾਂ ਜਾਂਚ ਕਰਨ ਲਈ ਸਿਸਟਮ ਲਾਗ (syslog) ਵੇਖੋ। ਵਿਚਲੇ ਸਮੇਂ " +"ਦੌਰਾਨ ਇਹ " "ਡਿਸਪਲੇਅ ਅਯੋਗ ਹੋਵੇਗਾ। ਜਦੋਂ ਸਮੱਸਿਆ ਠੀਕ ਹੋ ਜਾਵੇ ਤਾਂ GDM ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ।" #: ../daemon/gdm-server.c:250 @@ -89,17 +92,17 @@ msgstr "ਸਰਵਰ ਨੂੰ %s ਯੂਜ਼ਰ ਵਲੋਂ ਸਵੈਪ ਕੀਤਾ ਗਿਆ ਸੀ, ਪਰ ਉਹ ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid %d ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s ਲਈ initgroups () ਫੇਲ੍ਹ" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid %d ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" @@ -149,71 +152,72 @@ msgid "The display device" msgstr "ਡਿਸਪਲੇਅ ਜੰਤਰ" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਨਾਲ ਕਨਵਰਸੇਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਨਾਲ ਕੰਨਵਰਸੇਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ- %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "ਆਮ ਫੇਲ੍ਹਰ" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੈ" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "ਐਪਲੀਕੇਸ਼ਨ ਪਰੋਗਰਾਮਰ ਗਲਤੀ" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "ਅਣਜਾਣ ਗਲਤੀ" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "ਯੂਜ਼ਰ ਨਾਂ:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "ਪਸੰਦੀਦਾ ਯੂਜ਼ਰ-ਨਾਂ ਪਰੌਉਟ ਦੇ ਜਾਣਕਾਰੀ ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਗਲਤੀ: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "ਯੂਜ਼ਰ ਦੇ ਹੋਸਟ-ਨਾਂ ਦੇ ਜਾਣਕਾਰੀ ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਗਲਤੀ: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "ਯੂਜ਼ਰ ਦੇ ਕਨਸੋਂਲ ਦੇ ਜਾਣਕਾਰੀ ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਗਲਤੀ: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "ਡਿਸਪਲੇਅ ਲਾਈਨ ਦੇ ਹੋਸਟ-ਨਾਂ ਦੇ ਜਾਣਕਾਰੀ ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਗਲਤੀ: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "ਡਿਸਪਲੇਅ xauth ਕਰੈਡੇਂਟਿਲਸ ਲਈ ਜਾਣਕਾਰੀ ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ ਗਲਤੀ: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ਹਾਲੇ ਕੋਈ ਅਕਾਊਂਟ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "ਯੂਜ਼ਰ ਬਦਲਣ ਲਈ ਅਸਮਰੱਥ" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "ਯੂਜ਼ਰ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "ਗਰੁੱਪ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ" @@ -435,7 +439,7 @@ msgstr "AT-SPI ਰਜਿਸਟਰੀ ਰੈਪਰ" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "ਲਾਗਇਨ ਵਿੰਡੋ" @@ -447,6 +451,10 @@ msgid "Power management daemon" msgstr "ਊਰਜਾ ਪਰਬੰਧ ਡੈਮਨ" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "ਗਨੋਮ ਸ਼ੈਸ਼ਨ ਐਕਸਰਲੇਸ਼ਨਰ ਚੈੱਕਰ" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "ਗਨੋਮ ਸੈਟਿੰਗ ਡੈਮਨ" @@ -483,7 +491,7 @@ msgid "PolicyKit Authentication Agent" msgstr "ਪਾਲਸੀਕਿੱਟ ਪ੍ਰਮਾਣਿਕਤਾ ਏਜੰਟ" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "ਸਿਸਟਮ ਚੁਣੋ" @@ -495,35 +503,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP ਹੈੱਡਰ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "ਮੁੱਲ" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "ਪੂਰੇ ਹੋਏ ਟਾਈਮ ਦੀ ਫੀਸਦੀ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "ਗ਼ੈਰ-ਐਕਟਿਵ ਟੈਕਸਟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "ਲੇਬਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਟੈਕਸਟ, ਜੇ ਯੂਜ਼ਰ ਨੇ ਹਾਲੇ ਆਈਟਮ ਨਾ ਚੁਣੀ ਹੋਵੇ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "ਐਕਟਿਵ ਟੈਕਸਟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ਲੇਬਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਟੈਕਸਟ, ਜੇ ਯੂਜ਼ਰ ਨੇ ਇੱਕ ਆਈਟਮ ਚੁਣ ਲਈ ਹੋਵੇ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "ਦਿੱਖ ਲਿਸਟ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "ਕੀ ਵੇਖਣ ਲਈ ਚੋਣ ਲਿਸਟ ਉਪਲੱਬਧ ਹੋਵੇ ਜਾਂ ਨਾ" @@ -555,67 +563,69 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "ਭਾਸ਼ਾ ਚੁਣੋ ਅਤੇ ਲਾਗਇਨ ਲਈ ਦੱਬੋ" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "ਪਸੰਦੀਦਾ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "ਪਸੰਦੀਦਾ ਸ਼ੈਸ਼ਨ" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "ਰੱਦ ਕਰੋ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "ਕੰਪਿਊਟਰ ਨਾਂ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "ਲਾਗਇਨ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "ਅਣ-ਲਾਕ" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "ਵਰਜਨ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "ਪੈਨਲ" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "ਬੰਦ ਕਰਨ ਚੋਣਾਂ…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "ਸਸਪੈਂਡ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "ਮੁੜ ਚਾਲੂ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "ਬੰਦ ਕਰੋ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "ਪਸੰਦੀਦਾ" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "ਅਣਜਾਣ ਸਮਾਂ ਬਾਕੀ ਰਹਿੰਦਾ ਹੈ" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -#| msgid "Previous Session" -msgid "Custom session" -msgstr "ਪਸੰਦੀਦਾ ਸ਼ੈਸ਼ਨ" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "ਪੈਨਲ" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "ਭਾਸ਼ਾਵਾਂ" @@ -640,40 +650,13 @@ msgstr "ਉਪਲੱਬਧ ਭਾਸ਼ਾਵਾਂ ਦੀ ਪੂਰੀ ਲਿਸਟ ਤੋਂ ਇੱਕ ਭਾਸ਼ਾ ਚੁਣੋ।" #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "ਭਾਸ਼ਾ" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "ਅਣਦੱਸੀ" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "ਕੀਬੋਰਡ(_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "ਹੋਰ…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "ਉਪਲੱਬਧ ਲੇਆਉਟ ਦੀ ਪੂਰੀ ਲਿਸਟ ਵਿੱਚ ਇੱਕ ਕੀਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ।" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "ਕੀਬੋਰਡ" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "ਲੇਬਲ ਟੈਕਸਟ" @@ -721,7 +704,6 @@ msgstr "ਰਿਮੋਟ ਲਾਗਇਨ" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "ਸ਼ੈਸ਼ਨ" @@ -766,80 +748,77 @@ msgstr "ਸਵਾਗਤੀ ਲੋਗੋ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਆਈਕਾਨ ਨਾਂ" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "ਤਾਜ਼ਾ ਚੁਣੋ ਕੀਬੋਰਡ ਲੇਆਉਟ" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "ਤਾਜ਼ਾ ਚੁਣੀਆਂ ਭਾਸ਼ਾਵਾਂ" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "ਲਾਗਇਨ ਵਿੰਡੋ ਵਿੱਚ ਡਿਫਾਲਟ ਹੀ ਵੇਖਾਏ ਜਾਣ ਵਾਲੇ ਕੀਬੋਰਡ ਲੇਆਉਟ ਦੀ ਲਿਸਟ ਸੈੱਟ ਕਰੋ।" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." -msgstr "ਲਾਗਇਨ ਵਿੰਡੋ ਵਿੱਚ ਡਿਫਾਲਟ ਹੀ ਵੇਖਾਈਆਂ ਜਾਣ ਵਾਲੀਆਂ ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ ਸੈੱਟ ਕਰੋ।" +msgstr "" +"ਲਾਗਇਨ ਵਿੰਡੋ ਵਿੱਚ ਡਿਫਾਲਟ ਹੀ ਵੇਖਾਈਆਂ ਜਾਣ ਵਾਲੀਆਂ ਭਾਸ਼ਾਵਾਂ ਦੀ ਲਿਸਟ ਸੈੱਟ ਕਰੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "ਸਵਾਗਤੀ ਲੋਗੋ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਥੀਮ ਵਾਲਾ ਆਈਕਾਨ ਨਾਂ ਸੈੱਟ ਕਰੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਲਾਗਇਨ ਵਿੰਡੋ ਵਿੱਚ ਜਾਣੇ ਯੂਜ਼ਰ ਵੇਖਾਉਣੇ ਨਹੀਂ ਚਾਹੁੰਦੇ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "ਸਹੀ ਸੈੱਟ ਕਰੋ, ਜੇ ਲਾਗਇਨ ਸਕਰੀਨ ਵਿੱਚ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਬਟਨ ਵੇਖਾਉਣੇ ਨਹੀਂ ਚਾਹੁੰਦੇ।" +msgstr "" +"ਸਹੀ ਸੈੱਟ ਕਰੋ, ਜੇ ਲਾਗਇਨ ਸਕਰੀਨ ਵਿੱਚ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਬਟਨ ਵੇਖਾਉਣੇ ਨਹੀਂ ਚਾਹੁੰਦੇ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ XRandR ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਬੈਕਗਰਾਊਂਡ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਮੀਡਿਆ ਸਵਿੱਚਾਂ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" +msgstr "" +"ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਮੀਡਿਆ ਸਵਿੱਚਾਂ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਯੋਗ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ ਜੇ ਆਨਲਾਈਨ ਸਕਰੀਨ ਕੀਬੋਰਡ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." -msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਅਸੈੱਸਬਿਲਟੀ ਕੀਬੋਰਡ ਸੈਟਿੰਗ ਪਰਬੰਧ ਲਈ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" +msgstr "" +"ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਅਸੈੱਸਬਿਲਟੀ ਕੀਬੋਰਡ ਸੈਟਿੰਗ ਪਰਬੰਧ ਲਈ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਚਾਹੁੰਦੇ " +"ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਸਕਰੀਨ ਵੱਡਦਰਸ਼ੀ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਸਕਰੀਨ ਰੀਡਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਸਾਊਂਡ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ xsettings ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਬੈਨਰ ਸੁਨੇਹਾ ਟੈਕਸਟ ਵੇਖਾਉਣਾ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "ਸਹੀਂ ਸੈੱਟ ਕਰੋ, ਜੇ ਕੰਪਿਜ਼ ਨੂੰ ਵਿੰਡੋ ਮੈਨੇਜਰ ਵਜੋਂ ਵਰਤਣਾ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -847,31 +826,31 @@ "ਲਾਗਇਨ ਸਕਰੀਨ ਵਿੱਚ ਵੇਖਣ ਲਈ ਟੈਕਸਟ ਬੈਨਰ ਸੁਨੇਹਾ, ਜਦੋਂ ਯੂਜ਼ਰ ਚੋਣਕਾਰੀ ਖਾਲੀ ਹੋਵੇ, " "banner_message_text ਦੀ ਬਜਾਏ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "ਲਾਗਇਨ ਸਕਰੀਨ ਵਿੱਚ ਵੇਖਣ ਲਈ ਟੈਕਸਟ ਬੈਨਰ ਸੁਨੇਹਾ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "ਸਹੀਂ ਕਰੋ, ਜੇ XRandR ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "ਸਹੀਂ ਕਰੋ, ਜੇ ਬੈਕਗਰਾਊਂਡ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਨੂੰ ਯੋਗ ਕਰੋ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "ਸਹੀਂ ਕਰੋ, ਜੇ ਮੀਡਿਆ-ਸਵਿੱਚਾਂ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "ਸਹੀਂ ਕਰੋ, ਜੇ ਸਾਊਂਡ ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "ਸਹੀਂ ਕਰੋ, ਜੇ xsettings ਸੈਟਿੰਗ ਮੈਨੇਜਰ ਪਲੱਗਇਨ ਚਾਲੂ ਕਰਨੀ ਹੈ।" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "ਕੰਪਿਜ਼ ਨੂੰ ਵਿੰਡੋ ਮੈਨੇਜਰ ਵਜੋਂ ਵਰਤੋਂ" @@ -899,8 +878,8 @@ msgid "Whether the timer is currently ticking" msgstr "ਕੀ ਹਾਲੇ ਟਾਈਮਰ ਟਿਕ-ਟਿਕ ਕਰ ਰਿਹਾ ਹੈ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s ਵਾਂਗ ਲਾਗਇਨ" @@ -910,168 +889,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "ਹੋਰ…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "ਇੱਕ ਵੱਖਰਾ ਅਕਾਊਂਟ ਚੁਣੋ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "ਗੈੱਸਟ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "ਇੱਕ ਆਰਜ਼ੀ ਗੈੱਸਟ ਵਾਂਗ ਲਾਗਇਨ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "ਚੁਣੀਆਂ ਚੋਣਾਂ ਦੇ ਬਾਅਦ ਸਿਸਟਮ ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "ਪਹਿਲਾਂ ਹੀ ਲਾਗਇਨ ਹੈ" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"ਯੂਜ਼ਰ ਸਵਿੱਚ ਐਪਲਿਟ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ,ਜਿਸ ਨੂੰ ਫਰੀ " -"ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ 2 ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ " -"ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"ਇਸ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ,ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ ਨਹੀਂ " -"ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। " -"ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ (GNU) ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।" - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ, ਜੇਕਰ ਤੁਹਾਨੂੰਨਹੀਂ ਮਿਲੀ ਹੈ " -"ਤਾਂ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-੧੩੦੧, " -"ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "ਯੂਜ਼ਰਾਂ ਵਿੱਚ ਤੇਜ਼ੀ ਨਾਲ ਬਦਲਣ ਵਾਲਾ ਮੇਨੂ ਹੈ।" - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ, ੨੦੦੪-੨੦੦੯\n" -"ਪੰਜਾਬੀ ਓਪਨ ਸੋਰਸ ਟੀਮ http://www.satluj.com/" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "ਸਕਰੀਨ ਲਾਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਖਾਲੀ ਸਕਰੀਨ ਲਈ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "ਲਾਗਆਉਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "ਉਪਲੱਬਧ" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "ਅਦਿੱਖ" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "ਰੁਝਿਆ" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "ਦੂਰ" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "ਸਿਸਟਮ ਪਸੰਦ" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "ਸਕਰੀਨ ਲਾਕ" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "ਯੂਜ਼ਰ ਬਦਲੋ" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "ਬਾਹਰ…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "ਅਣਜਾਣ" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚ ਐਪਲਿਟ" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਅਤੇ ਹਾਲਤ ਬਦਲੋ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ਯੂਜ਼ਰ ਵਿੱਚ ਤੁਰੰਤ ਸਵਿੱਚ ਕਰਨ ਲਈ ਇੱਕ ਮੇਨੂ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚਰ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚਰ ਐਪਲਿਟ ਫੈਕਟਰੀ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸੋਧ(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "ਇਸ ਬਾਰੇ(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ਯੂਜ਼ਰ ਅਤੇ ਗਰੁੱਪ ਸੋਧ(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "ਕੇਵਲ VERSION ਕਮਾਂਡ ਹੀ ਸਹਾਇਕ ਹੈ" @@ -1107,15 +953,143 @@ msgid "Unable to start new display" msgstr "ਨਵਾਂ ਡਿਸਪਲੇਅ ਸਟਾਰਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "ਸਕਰੀਨਸ਼ਾਟ ਲਿਆ" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "ਸਕਰੀਨ ਦੀ ਤਸਵੀਰ ਲਵੋ" +#~ msgid "Shutdown Options…" +#~ msgstr "ਬੰਦ ਕਰਨ ਚੋਣਾਂ…" + +#~ msgid "Keyboard layouts" +#~ msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ" + +#~ msgid "_Keyboard:" +#~ msgstr "ਕੀਬੋਰਡ(_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "ਹੋਰ…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "ਉਪਲੱਬਧ ਲੇਆਉਟ ਦੀ ਪੂਰੀ ਲਿਸਟ ਵਿੱਚ ਇੱਕ ਕੀਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ।" + +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "ਕੀਬੋਰਡ" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "ਤਾਜ਼ਾ ਚੁਣੋ ਕੀਬੋਰਡ ਲੇਆਉਟ" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "ਲਾਗਇਨ ਵਿੰਡੋ ਵਿੱਚ ਡਿਫਾਲਟ ਹੀ ਵੇਖਾਏ ਜਾਣ ਵਾਲੇ ਕੀਬੋਰਡ ਲੇਆਉਟ ਦੀ ਲਿਸਟ ਸੈੱਟ ਕਰੋ।" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "ਯੂਜ਼ਰ ਸਵਿੱਚ ਐਪਲਿਟ ਇੱਕ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ,ਜਿਸ ਨੂੰ ਫਰੀ " +#~ "ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ 2 ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ " +#~ "ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "ਇਸ ਪਰੋਗਰਾਮ ਨੂੰ ਇਹ ਮੰਨ ਕੇ ਵੰਡਿਆ ਜਾ ਰਿਹਾ ਹੈ ਕਿ ਇਹ ਫਾਇਦੇਮੰਦ ਰਹੇਗਾ,ਪਰ ਇਸ ਦੀ ਕੋਈ ਵਾਰੰਟੀ " +#~ "ਨਹੀਂ ਲਈ ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ " +#~ "ਨਹੀਂ ਹੈ। ਹੋਰ ਵੇਰਵੇ ਲਈ ਗਨੂ (GNU) ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।" + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀ ਕਾਪੀ ਪ੍ਰਾਪਤ ਕਰੋਗੇ, ਜੇਕਰ ਤੁਹਾਨੂੰਨਹੀਂ ਮਿਲੀ " +#~ "ਹੈ ਤਾਂ ਫਰੀ ਸਾਫਟਵੇਅਰ ਫਾਊਨਡੇਸ਼ਨ, ੫੧ ਫਰਾਕਲਿੰਨ ਸਟਰੀਟ, ਪੰਜਵੀਂ ਮੰਜ਼ਲ,ਬੋਸਟਨ, ਐਮ ਏ ੦੨੧੧੦-" +#~ "੧੩੦੧, ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ਯੂਜ਼ਰਾਂ ਵਿੱਚ ਤੇਜ਼ੀ ਨਾਲ ਬਦਲਣ ਵਾਲਾ ਮੇਨੂ ਹੈ।" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ, ੨੦੦੪-੨੦੦੯\n" +#~ "ਪੰਜਾਬੀ ਓਪਨ ਸੋਰਸ ਟੀਮ http://www.satluj.com/" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "ਸਕਰੀਨ ਲਾਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "ਆਰਜ਼ੀ ਰੂਪ ਵਿੱਚ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਖਾਲੀ ਸਕਰੀਨ ਲਈ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "ਲਾਗਆਉਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s" + +#~ msgid "Available" +#~ msgstr "ਉਪਲੱਬਧ" + +#~ msgid "Invisible" +#~ msgstr "ਅਦਿੱਖ" + +#~ msgid "Busy" +#~ msgstr "ਰੁਝਿਆ" + +#~ msgid "Away" +#~ msgstr "ਦੂਰ" + +#~ msgid "Account Information" +#~ msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ" + +#~ msgid "System Preferences" +#~ msgstr "ਸਿਸਟਮ ਪਸੰਦ" + +#~ msgid "Lock Screen" +#~ msgstr "ਸਕਰੀਨ ਲਾਕ" + +#~ msgid "Switch User" +#~ msgstr "ਯੂਜ਼ਰ ਬਦਲੋ" + +#~ msgid "Quit…" +#~ msgstr "ਬਾਹਰ…" + +#~ msgid "Unknown" +#~ msgstr "ਅਣਜਾਣ" + +#~ msgid "User Switch Applet" +#~ msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚ ਐਪਲਿਟ" + +#~ msgid "Change account settings and status" +#~ msgstr "ਅਕਾਊਂਟ ਸੈਟਿੰਗ ਅਤੇ ਹਾਲਤ ਬਦਲੋ" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ਯੂਜ਼ਰ ਵਿੱਚ ਤੁਰੰਤ ਸਵਿੱਚ ਕਰਨ ਲਈ ਇੱਕ ਮੇਨੂ" + +#~ msgid "User Switcher" +#~ msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚਰ" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "ਯੂਜ਼ਰ ਸਵਿੱਚਰ ਐਪਲਿਟ ਫੈਕਟਰੀ" + +#~ msgid "Edit Personal _Information" +#~ msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸੋਧ(_I)" + +#~ msgid "_About" +#~ msgstr "ਇਸ ਬਾਰੇ(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ਯੂਜ਼ਰ ਅਤੇ ਗਰੁੱਪ ਸੋਧ(_E)" + #~ msgid "Manager" #~ msgstr "ਮੈਨੇਜਰ" diff -Nru gdm-2.32.1/po/pl.po gdm-3.0.0/po/pl.po --- gdm-2.32.1/po/pl.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/pl.po 2011-04-04 14:37:16.000000000 +0000 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-04 18:40+0200\n" -"PO-Revision-Date: 2010-09-04 13:58+0200\n" +"POT-Creation-Date: 2011-03-19 16:24+0100\n" +"PO-Revision-Date: 2011-03-19 16:25+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" "X-Poedit-Language: Polish\n" @@ -46,28 +46,28 @@ msgid "could not find user \"%s\" on system" msgstr "nie można odnaleźć użytkownika \"%s\" w systemie" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Nie można zainicjować systemu logowania" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Nie można uwierzytelnić użytkownika" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Nie można upoważnić użytkownika" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Nie można określić danych uwierzytelniania" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Nie można otworzyć sesji" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -93,17 +93,17 @@ "nie istnieje" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nie można ustawić identyfikatora grupy na %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "Funkcja initgroups () się nie powiodła dla %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nie można ustawić identyfikatora użytkownika na %d" @@ -153,77 +153,77 @@ msgid "The display device" msgstr "Nazwa urządzenia wyświetlającego" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "błąd podczas inicjowania negocjacji z systemem uwierzytelniania: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "błąd podczas inicjowania negocjacji z systemem uwierzytelniania - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "błąd ogólny" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "brak pamięci" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "błąd programisty" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "nieznany błąd" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Nazwa użytkownika:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "błąd podczas wysyłania do systemu uwierzytelniania żądanej nazwy " "użytkownika: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "błąd podczas wysyłania do systemu uwierzytelniania nazwy komputera: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "błąd podczas wysyłania do systemu uwierzytelniania informacji o konsoli: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "błąd podczas informowania systemu uwierzytelniania o ciągu wyświetlania: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "błąd podczas informowania systemu uwierzytelniania o wyświetlaniu uprawnień " "xauth: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "brak konta użytkownika" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Nie można zmienić użytkownika" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Użytkownik %s nie istnieje" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Grupa %s nie istnieje." @@ -376,7 +376,6 @@ msgid "Logdir %s does not exist or isn't a directory." msgstr "Katalog dziennika %s nie istnieje lub nie jest katalogiem." -# i w wielu niżej zmieniłem "przerwano" na "przerywanie" #: ../daemon/main.c:287 #, c-format msgid "Authdir %s does not exist. Aborting." @@ -451,7 +450,7 @@ msgstr "Wrapper rejestru AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Okno logowania" @@ -463,6 +462,10 @@ msgid "Power management daemon" msgstr "Usługa zarządzania zasilaniem" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Sprawdzanie przyspieszenia sesji GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Usługa ustawień GNOME" @@ -499,7 +502,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agent uwierzytelniania PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Wybór systemu" @@ -511,37 +514,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: nie można odczytać nagłówka XDMCP." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Wartość" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procent czasu ukończono" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Tekst nieaktywny" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "Tekst etykiety w przypadku, gdy użytkownik nie wybrał jeszcze żadnego " "elementu" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Tekst aktywny" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Tekst etykiety w przypadku, gdy użytkownik wybrał element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Widoczna lista" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Określa, czy lista wyboru jest widoczna" @@ -559,7 +562,6 @@ msgid "%a %b %e, %l:%M %p" msgstr "%a %e %b, %H:%M" -# nie wiem, czy tutaj powinien być przecinek po %a... #. translators: This is the time format to use when there is #. * no date, just weekday and time with seconds. #. @@ -574,65 +576,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Logowanie automatyczne…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Proszę wybrać język i nacisnąć przycisk Zaloguj" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Anulowanie…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Własna" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Własna sesja" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Anuluj" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nazwa komputera" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Zaloguj" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Odblokuj" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Wersja" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opcje wyłączania…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Uśpij" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Uruchom ponownie" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Wyłącz" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Własna" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Nieznany pozostały czas" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Własna sesja" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Języki" @@ -660,35 +666,10 @@ msgid "Language" msgstr "Język" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nieokreślony" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Układy klawiatury" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Klawiatura:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Inna…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Proszę wybrać układ klawiatury z pełnej listy dostępnych układów." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Klawiatura" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Tekst etykiety" @@ -780,90 +761,79 @@ msgstr "Nazwa ikony do użycia dla loga powitalnego" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Ostatnio wybrane układy klawiatury" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Ostatnio wybrane języki" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Proszę ustawić na listę układów klawiatury domyślnie wyświetlaną na ekranie " -"logowania." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Proszę ustawić na listę języków do domyślnego wyświetlenia na ekranie " "logowania." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Ustawienie na nazwę ikony motywu do użycia jako logo powitalne." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Wartość \"true\" wyłącza wyświetlanie znanych użytkowników na ekranie " "logowania." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Wartość \"true\" wyłącza wyświetlanie przycisków ponownego uruchamiania na " "ekranie logowania." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Wartość \"true\" włącza wtyczkę menedżera ustawień XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Wartość \"true\" włącza wtyczkę menedżera ustawień tła." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Wartość \"true\" włącza wtyczkę menedżera ustawień klawiszy multimedialnych." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Wartość \"true\" włącza klawiaturę ekranową." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "Wartość \"true\" włącza wtyczkę ustawień dostępności klawiatury." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Wartość \"true\" włącza lupę ekranową." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Wartość \"true\" włącza czytnik ekranowy." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Wartość \"true\" włącza wtyczkę menedżera ustawień dźwięku." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Wartość \"true\" włącza wtyczkę menedżera ustawień XSettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Wartość \"true\" włącza wyświetlanie komunikatu bannera." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Wartość \"true\" włącza Compiz jako menedżera okien." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -871,35 +841,35 @@ "Treść komunikatu bannera do wyświetlenia na ekranie logowania, kiedy lista " "wyboru użytkowników jest pusta, zamiast zmiennej banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Treść komunikatu bannera do wyświetlenia na ekranie logowania." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Wartość \"true\", gdy wtyczka menedżera ustawień XRandR jest włączona." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Wartość \"true\", gdy wtyczka menedżera ustawień tła jest włączona." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Wartość \"true\", gdy wtyczka menedżera ustawień przycisków multimedialnych " "jest włączona." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "Wartość \"true\", gdy wtyczka menedżera ustawień dźwięku jest włączona." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Wartość \"true\", gdy wtyczka menedżera ustawień XSettings jest włączona." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Użycie Compiz jako menedżera okien" @@ -928,8 +898,8 @@ msgstr "Określa, czy odbywa się odliczanie" # tooltip -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Loguje jako %s" @@ -939,174 +909,38 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Inny…" # tooltip -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Wybiera inne konto" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gość" # tooltip -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Loguje jako tymczasowego gościa" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Logowanie automatyczne" # tooltip -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" -msgstr "Automatyczne logowanie do systemu po wybraniu opcji" +msgstr "Automatyczne loguje do systemu po wybraniu opcji" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Zalogowany" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Aplet przełączania kont użytkowników jest wolnym oprogramowaniem; można go " -"rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji " -"Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania (Free Software " -"Foundation) - według wersji drugiej tej Licencji lub którejś z późniejszych " -"wersji." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " -"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " -"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " -"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz " -"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " -"- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, " -"Fifth Floor, Boston, MA 02110-130159 USA." - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Menu do szybkiego przełączania się między kontami użytkowników." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Aviary.pl , 2008, 2009, 2010" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nie można zablokować ekranu: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Nie można tymczasowo ustawić wygaszacza ekranu na wygaszenie ekranu: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Nie można się wylogować: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Dostępny" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Niewidoczny" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Zajęty" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Zaraz wracam" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informacje o koncie" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Preferencje systemu" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Zablokuj ekran" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Przełącz użytkownika" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Zakończ…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Nieznany" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Aplet przełącznika kont użytkowników" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Zmiany ustawień kont i statusów" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Menu do szybkiego przełączania się między kontami użytkowników" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Przełącznik kont użytkowników" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Generator apletu przełącznika kont użytkowników" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "_Zmodyfikuj informacje osobiste" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_O programie" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Modyfikuj użytkowników i grupy" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Obsługiwane jest tylko polecenie VERSION" @@ -1136,17 +970,17 @@ #. Option parsing #: ../utils/gdmflexiserver.c:711 msgid "- New GDM login" -msgstr "- Nowe logowanie GDM" +msgstr "- nowe logowanie GDM" #: ../utils/gdmflexiserver.c:767 msgid "Unable to start new display" msgstr "Nie można uruchomić nowego ekranu" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Pobrano zrzut ekranu" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Pobiera zrzut ekranu" diff -Nru gdm-2.32.1/po/POTFILES.in gdm-3.0.0/po/POTFILES.in --- gdm-2.32.1/po/POTFILES.in 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/POTFILES.in 2011-04-04 14:37:16.000000000 +0000 @@ -53,6 +53,7 @@ data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in data/greeter-autostart/gdm-simple-greeter.desktop.in.in data/greeter-autostart/gnome-power-manager.desktop.in.in +data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in data/greeter-autostart/gnome-settings-daemon.desktop.in.in data/greeter-autostart/gnome-mag.desktop.in data/greeter-autostart/gok.desktop.in @@ -72,22 +73,14 @@ gui/simple-greeter/gdm-language-chooser-widget.c gui/simple-greeter/gdm-language-option-widget.c gui/simple-greeter/gdm-languages.c -gui/simple-greeter/gdm-layout-chooser-dialog.c -gui/simple-greeter/gdm-layout-chooser-widget.c -gui/simple-greeter/gdm-layout-option-widget.c gui/simple-greeter/gdm-option-widget.c gui/simple-greeter/gdm-recent-option-widget.c gui/simple-greeter/gdm-remote-login-window.c gui/simple-greeter/gdm-session-option-widget.c gui/simple-greeter/gdm-simple-greeter.schemas.in gui/simple-greeter/gdm-timer.c -gui/simple-greeter/gdm-user.c gui/simple-greeter/gdm-user-chooser-widget.c gui/simple-greeter/greeter-main.c -gui/user-switch-applet/applet.c -gui/user-switch-applet/gdm-entry-menu-item.c -gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml utils/gdmflexiserver.c utils/gdm-screenshot.c diff -Nru gdm-2.32.1/po/POTFILES.skip gdm-3.0.0/po/POTFILES.skip --- gdm-2.32.1/po/POTFILES.skip 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/POTFILES.skip 2011-04-04 14:37:16.000000000 +0000 @@ -7,9 +7,9 @@ # remove these unless you fix "make distcheck" a different way. # data/gdm.schemas.in -gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in data/greeter-autostart/at-spi-registryd-wrapper.desktop.in data/greeter-autostart/gdm-simple-greeter.desktop.in data/greeter-autostart/gnome-power-manager.desktop.in +data/greeter-autostart/gnome-session-check-accelerated.desktop.in data/greeter-autostart/gnome-settings-daemon.desktop.in data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in diff -Nru gdm-2.32.1/po/pt_BR.po gdm-3.0.0/po/pt_BR.po --- gdm-2.32.1/po/pt_BR.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/pt_BR.po 2011-04-04 14:37:16.000000000 +0000 @@ -21,14 +21,16 @@ # Rodrigo L. M. Flores , 2009. # Luciano Gardim , 2009. # Antonio Fernandes C. Neto , 2010. +# Kri Apolinário , 2011 +# msgid "" msgstr "" "Project-Id-Version: gdm2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-09-07 21:10+0000\n" -"PO-Revision-Date: 2010-08-23 16:08-0300\n" -"Last-Translator: Antonio Fernandes C. Neto \n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-24 10:42+0000\n" +"PO-Revision-Date: 2011-03-24 12:00-0300\n" +"Last-Translator: Rodrigo Padula de Oliveira \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,28 +62,28 @@ msgid "could not find user \"%s\" on system" msgstr "não foi possível localizar o usuário \"%s\" no sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Não foi possível inicializar o sistema de início de sessão" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Não foi possível autenticar o usuário" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Não foi possível autorizar o usuário" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Não foi possível estabelecer credenciais" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Não foi possível abrir a sessão" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -96,7 +98,7 @@ #: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" -msgstr "%s: falha ao conectar à tela pai \"%s\"" +msgstr "%s: falha ao conectar à tela pai '%s'" #: ../daemon/gdm-server.c:365 #, c-format @@ -106,17 +108,17 @@ "existe" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Não foi possível definir o groupid para %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" -msgstr "initgroups() falhou para %s" +msgstr "initgroups () falhou para %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Não foi possível definir o userid para %d" @@ -166,79 +168,79 @@ msgid "The display device" msgstr "O dispositivo de tela" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "erro iniciando comunicação com o sistema de autenticação: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "erro iniciando comunicação com o sistema de autenticação - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "falha geral" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "sem memória" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "erro de programação de aplicativo" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "erro desconhecido" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Nome de usuário:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "erro informando o sistema de autenticação sobre nome de usuário preferido do " "prompt: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "erro informando o sistema de autenticação sobre o nome da máquina do " "usuário: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "erro informando o sistema de autenticação sobre o console do usuário: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "erro informando o sistema de autenticação sobre a exibição do texto: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "erro informando o sistema de autenticação sobre a exibição das credenciais " "xauth: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nenhuma conta de usuário disponível" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Não foi possível mudar para o usuário" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "O usuário %s não existe" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "O grupo %s não existe" @@ -419,7 +421,7 @@ #: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "Não foi possível localizar o usuário GDM \"%s\". Abortando!" +msgstr "Não foi possível localizar o usuário GDM '%s'. Abortando!" #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" @@ -428,7 +430,7 @@ #: ../daemon/main.c:421 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "Não foi possível localizar o grupo GDM \"%s\". Abortando!" +msgstr "Não foi possível localizar o grupo GDM '%s'. Abortando!" #: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" @@ -466,7 +468,7 @@ msgstr "Wrapper de registro AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Janela de início de sessão" @@ -478,6 +480,10 @@ msgid "Power management daemon" msgstr "Serviço gerenciador de energia" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Verificador de aceleração de sessão do GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Serviço de configurações do GNOME" @@ -514,7 +520,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agente de autenticação PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Selecione o sistema" @@ -526,36 +532,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Não foi possível ler o cabeçalho XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "porcentagem de tempo completado" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Texto não ativo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "O texto para usar no rótulo caso o usuário ainda não tenha escolhido um item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Texto ativo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "O texto para usar no rótulo caso o usuário já tenha escolhido um item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Lista visível" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Se a lista escolhida é visível" @@ -587,65 +593,69 @@ msgid "%a %l:%M %p" msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" -msgstr "Conectando automaticamente..." +msgstr "Conectando automaticamente…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Selecione o idioma e clique em Iniciar sessão" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" -msgstr "Cancelando..." +msgstr "Cancelando…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sessão personalizada" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancelar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nome do computador" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Iniciar sessão" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Desbloquear" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versão" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Painel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opções para desligar..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspender" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reiniciar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Desligar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizar" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Tempo restante desconhecido" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sessão personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Painel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Idiomas" @@ -663,7 +673,7 @@ #: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" msgid "Other…" -msgstr "Outro..." +msgstr "Outro…" #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." @@ -673,37 +683,10 @@ msgid "Language" msgstr "Idioma" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Não especificado" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Disposições do teclado" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teclado:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Outro..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Escolha uma disposição de teclado da lista completa de disposições " -"disponíveis." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Teclado" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Texto do rótulo" @@ -726,7 +709,7 @@ #: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" -msgstr "A id do item padrão" +msgstr "A ID do item padrão" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" @@ -739,12 +722,12 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format msgid "Remote Login (Connecting to %s…)" -msgstr "Sessão remota (Conectando a %s...)" +msgstr "Sessão remota (Conectando a %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format msgid "Remote Login (Connected to %s)" -msgstr "Sessão remota (Conectado a %s...)" +msgstr "Sessão remota (Conectado a %s)" #: ../gui/simple-greeter/gdm-remote-login-window.c:281 msgid "Remote Login" @@ -799,65 +782,54 @@ msgstr "Nome do ícone para usar como logomarca do saudador" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Disposições do teclado selecionadas recentemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Idiomas selecionados recentemente" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Defina uma lista de disposições de teclado a serem exibidas por padrão na " -"janela de início de sessão." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Defina uma lista de idiomas a serem exibidos por padrão na janela de início " "de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Defina para o nome do ícone do tema usado para a logomarca de boas-vindas." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Marque para desabilitar a exibição dos usuários conhecidos na janela de " "início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Marque para desabilitar a exibição dos botões de reinicialização na janela " "de início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Marque para habilitar o plug-in xrandr de gerenciamento de configurações." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Marque para habilitar o plug-in de gerenciamento de configurações de segundo " "plano." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Marque para habilitar o plug-in de gerenciamento de configurações de teclas " "de multimídia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Marque para habilitar o teclado virtual." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -865,35 +837,35 @@ "Marque para habilitar o plug-in para gerenciar as configurações de " "acessibilidade do teclado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Marque para habilitar o ampliador de tela." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Marque para habilitar o leitor de tela." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Marque para habilitar o plug-in de gerenciamento de configurações de som." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Marque para habilitar as configurações xsettings do gerenciador de plug-ins." # O que é esse banner? -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Marque para mostrar o texto da mensagem do banner." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Marque para usar o compiz como o gerenciador de janelas." # Que banner é esse? -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -902,39 +874,39 @@ "quando a escolha do usuário for vazia, ao invés da banner_message_text." # Que banner é esse? -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "" "Texto da mensagem do banner a ser mostrado na janela de início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "Verdadeiro se o plug-in xrandr de gereciamento de configurações estiver " "habilitado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Verdadeiro se o plug-in de configurações de segundo plano estiver habilitado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Verdadeiro se o plug-in de configurações de teclas de multimídia estiver " "habilitado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Verdadeiro se o plug-in de configurações de som estiver habilitado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Verdadeiro se as configurações xsettings do gerenciador de plug-ins estiver " "habilitado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Usar o compiz como gerenciador de janelas" @@ -962,8 +934,8 @@ msgid "Whether the timer is currently ticking" msgstr "Se o contador está marcando" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Iniciar sessão como %s" @@ -973,186 +945,36 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" -msgstr "Outro..." +msgstr "Outro…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Escolha uma conta diferente" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Convidado" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Efetuar o início de sessão como um convidado temporário" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Início automático de sessão" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "" "Iniciar sessão automaticamente no sistema depois de selecionar as opções" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Já conectado" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"O Miniaplicativo alternador de usuários é um software livre; você pode " -"redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU " -"como publicado pela Free Software Foundation; mesmo na versão 2 da Licença, " -"ou (à sua escolha) qualquer outra versão posterior." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Este programa é distribuído na esperança que será útil, mas SEM QUALQUER " -"GARANTIA; sem mesmo a garantia implicada de MERCADO ou ADEQUAÇÃO À " -"PROPÓSITOS PARTICULARES. Veja a Licença Pública Geral GNU para maiores " -"detalhes." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este " -"programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Um menu para alternar rapidamente entre usuários." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Jorge Godoy \n" -"E. A. Tacão \n" -"Francisco Petrúcio Cavalcante Junior \n" -"Gustavo Noronha Silva , 2003, 2004.\n" -"David Barzilay , 2003.\n" -"Gustavo Maciel Dias Vieira , 2004.\n" -"Afonso Celso Medina , 2004, 2005.\n" -"Alexandre Folle de Menezes , 2003, 2005-2006.\n" -"Guilherme de S. Pastore , 2006.\n" -"Washington Lins , 2007.\n" -"Raul Pereira , 2007.\n" -"Rafael Sfair , 2007.\n" -"Leonardo Ferreira Fontenelle , 2007.\n" -"Og Maciel , 2008.\n" -"Henrique P Machado , 2008.\n" -"Fábio Nogueira , 2008.\n" -"Rodrigo L. M. Flores , 2009.\n" -"Luciano Gardim , 2009.\n" -"Antonio Fernandes C. Neto , 2010." - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Não foi possível bloquear a tela: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Impossível atribuir o protetor de tela temporariamente para tela em branco: %" -"s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Não foi possível encerrar sessão: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Disponível" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Invisível" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Ocupado" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Ausente" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Informação da conta" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Preferências de sistema" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Travar tela" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Alternar usuário" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Sair..." - -#: ../gui/user-switch-applet/applet.c:1420 -msgid "User Switch Applet" -msgstr "Miniaplicativo alternador de usuários" - -#: ../gui/user-switch-applet/applet.c:1435 -msgid "Change account settings and status" -msgstr "Alterar definições e status da conta" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Um menu para alternar rapidamente entre usuários" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Alternador de usuário" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fábrica do miniaplicativo alternador de usuários" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editar _informações pessoais" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Sobre" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editar usuários e grupos" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Somente o comando VERSION é suportado" @@ -1188,15 +1010,164 @@ msgid "Unable to start new display" msgstr "Não foi possível iniciar uma nova tela" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Captura de tela tomada" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Captura uma foto da tela" +#~ msgid "Shutdown Options…" +#~ msgstr "Opções para desligar..." + +#~ msgid "Keyboard layouts" +#~ msgstr "Disposições do teclado" + +#~ msgid "_Keyboard:" +#~ msgstr "_Teclado:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Outro..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Escolha uma disposição de teclado da lista completa de disposições " +#~ "disponíveis." + +#~ msgid "Keyboard" +#~ msgstr "Teclado" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Disposições do teclado selecionadas recentemente" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Defina uma lista de disposições de teclado a serem exibidas por padrão na " +#~ "janela de início de sessão." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "O Miniaplicativo alternador de usuários é um software livre; você pode " +#~ "redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral " +#~ "GNU como publicado pela Free Software Foundation; mesmo na versão 2 da " +#~ "Licença, ou (à sua escolha) qualquer outra versão posterior." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Este programa é distribuído na esperança que será útil, mas SEM QUALQUER " +#~ "GARANTIA; sem mesmo a garantia implicada de MERCADO ou ADEQUAÇÃO À " +#~ "PROPÓSITOS PARTICULARES. Veja a Licença Pública Geral GNU para maiores " +#~ "detalhes." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com " +#~ "este programa; se não, escreva para a Free Software Foundation, Inc., 51 " +#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Um menu para alternar rapidamente entre usuários." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Jorge Godoy \n" +#~ "E. A. Tacão \n" +#~ "Francisco Petrúcio Cavalcante Junior \n" +#~ "Gustavo Noronha Silva , 2003, 2004.\n" +#~ "David Barzilay , 2003.\n" +#~ "Gustavo Maciel Dias Vieira , 2004.\n" +#~ "Afonso Celso Medina , 2004, 2005.\n" +#~ "Alexandre Folle de Menezes , 2003, 2005-2006.\n" +#~ "Guilherme de S. Pastore , 2006.\n" +#~ "Washington Lins , 2007.\n" +#~ "Raul Pereira , 2007.\n" +#~ "Rafael Sfair , 2007.\n" +#~ "Leonardo Ferreira Fontenelle , 2007.\n" +#~ "Og Maciel , 2008.\n" +#~ "Henrique P Machado , 2008.\n" +#~ "Fábio Nogueira , 2008.\n" +#~ "Rodrigo L. M. Flores , 2009.\n" +#~ "Luciano Gardim , 2009.\n" +#~ "Antonio Fernandes C. Neto , 2010." + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Não foi possível bloquear a tela: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Impossível atribuir o protetor de tela temporariamente para tela em " +#~ "branco: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Não foi possível encerrar sessão: %s" + +#~ msgid "Available" +#~ msgstr "Disponível" + +#~ msgid "Invisible" +#~ msgstr "Invisível" + +#~ msgid "Busy" +#~ msgstr "Ocupado" + +#~ msgid "Away" +#~ msgstr "Ausente" + +#~ msgid "Account Information" +#~ msgstr "Informação da conta" + +#~ msgid "System Preferences" +#~ msgstr "Preferências de sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Travar tela" + +#~ msgid "Switch User" +#~ msgstr "Alternar usuário" + +#~ msgid "Quit…" +#~ msgstr "Sair..." + +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicativo alternador de usuários" + +#~ msgid "Change account settings and status" +#~ msgstr "Alterar definições e status da conta" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Um menu para alternar rapidamente entre usuários" + +#~ msgid "User Switcher" +#~ msgstr "Alternador de usuário" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fábrica do miniaplicativo alternador de usuários" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Editar _informações pessoais" + +#~ msgid "_About" +#~ msgstr "_Sobre" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editar usuários e grupos" + #~ msgid "Unknown" #~ msgstr "Desconhecido" diff -Nru gdm-2.32.1/po/pt.po gdm-3.0.0/po/pt.po --- gdm-2.32.1/po/pt.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/pt.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,16 +1,17 @@ # gdm's Portuguese Translation -# Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 gmd +# Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 gmd # Distributed under the same licence as the gdm package -# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. +# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. # msgid "" msgstr "" -"Project-Id-Version: 2.32\n" +"Project-Id-Version: 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-05 12:51+0100\n" -"PO-Revision-Date: 2010-09-05 12:55+0000\n" +"POT-Creation-Date: 2011-03-31 08:52+0100\n" +"PO-Revision-Date: 2011-03-31 08:55+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -40,28 +41,28 @@ msgid "could not find user \"%s\" on system" msgstr "incapaz de encontrar o utilizador \"%s\" no sistema" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Incapaz de inicializar o sistema de início de sessão" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Incapaz de autenticar o utilizador" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Incapaz de autorizar o utilizador" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Incapaz de estabelecer as credenciais" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Incapaz de abrir a sessão" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -85,17 +86,17 @@ "Servidor iria ser criado pelo utilizador %s mas este utilizador não existe" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Incapaz de definir id de grupo para %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () falhou para %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Incapaz de definir id de utilizador para %d" @@ -145,78 +146,78 @@ msgid "The display device" msgstr "O dispositivo de ecrã" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "erro ao iniciar conversação com o sistema de autenticação: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "erro ao iniciar conversação com o sistema de autenticação - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "falha geral" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "sem memória livre" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "erro do programador da aplicação" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "erro desconhecido" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Utilizador:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "erro ao informar o sistema de autenticação de qual a forma preferida de " "pedir o utilizador: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "erro ao informar o sistema de autenticação de qual a máquina do utilizador: " "%s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "erro ao informar o sistema de autenticação de qual a consola do utilizador: " "%s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "erro ao informar o sistema de autenticação da expressão do ecrã: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "erro ao informar o sistema de autenticação das credenciais xauth do ecrã: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nenhuma conta de utilizador disponível" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Incapaz de alternar para o utilizador" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "O utilizador %s não existe" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "O grupo %s não existe" @@ -439,7 +440,7 @@ msgstr "Invólucro do Registo do AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Janela de Início de Sessão" @@ -451,6 +452,10 @@ msgid "Power management daemon" msgstr "Daemon de gestão de energia" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Verificador de Acelerador de Sessão GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Daemon de Definições do GNOME" @@ -487,7 +492,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agente de Autenticação PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Seleccionar o Sistema" @@ -499,37 +504,37 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Incapaz de ler cabeçalho XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valor" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "percentagem de tempo decorrido" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Texto de Inactivo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" "O texto a utilizar na etiqueta se o utilizador não tiver ainda apanhado um " "item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1477 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Texto de Activo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "O texto a utilizar na etiqueta se o utilizador tiver apanhado um item" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1487 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Lista Visível" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Se a lista de escolha é ou não visível" @@ -538,88 +543,92 @@ #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 msgid "%a %b %e, %l:%M:%S %p" -msgstr "%a %b %e, %l:%M:%S %p" +msgstr "%a %b %e, %H:%M:%S %p" #. translators: This is the time format to use when both #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 msgid "%a %b %e, %l:%M %p" -msgstr "%a %b %e, %l:%M %p" +msgstr "%a %b %e, %H:%M %p" #. translators: This is the time format to use when there is #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 msgid "%a %l:%M:%S %p" -msgstr "%a %l:%M:%S %p" +msgstr "%a %H:%M:%S %p" #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 msgid "%a %l:%M %p" -msgstr "%a %l:%M %p" +msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "A iniciar sessão automaticamente…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Definir o idioma e clicar Iniciar Sessão" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "A cancelar…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizada" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Sessão personalizada" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Cancelar" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nome do Computador" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Iniciar Sessão" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Destrancar" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versão" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Painel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Opções de Desligar…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspender" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reiniciar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Desligar" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Tempo restante desconhecido" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Sessão personalizada" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Painel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Idiomas" @@ -647,37 +656,10 @@ msgid "Language" msgstr "Idioma" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Por especificar" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Disposições de teclado" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Teclado:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Outro…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Seleccione uma disposição de teclado na lista de todas as disposições " -"disponíveis." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Teclado" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Texto da Etiqueta" @@ -770,65 +752,54 @@ msgstr "O nome do ícone a utilizar para o logo das boas vindas" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Disposições de teclado seleccionadas recentemente" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Idiomas seleccionados recentemente" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Definir com uma lista das disposições de teclado a apresentar por omissão na " -"janela de início de sessão." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Definir com uma lista dos idiomas a apresentar por omissão na janela de " "início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Definir o nome do ícone de tema a utilizar para o logo das boas vindas." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Definir como verdadeiro para desactivar a apresentação dos utilizadores " "conhecidos na janela de início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Definir como verdadeiro para desactivar a apresentação do botão de reiniciar " "na janela de início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Definir como verdadeiro para activar o plugin de gestão de definições XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Definir como verdadeiro para activar o plugin de gestão de definições de " "fundo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Definir como verdadeiro para activar o plugin de gestão de definições das " "teclas de media." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Definir como verdadeiro para activar o teclado no ecrã." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -836,35 +807,35 @@ "Definir como verdadeiro para activar o plugin de gestão de definições de " "acessibilidade de teclado." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Definir como verdadeiro para activar o ampliador de ecrã." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Definir como verdadeiro para activar a locução de ecrã." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Definir como verdadeiro para activar o plugin de gestão de definições de som." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Definir como verdadeiro para activar o plugin de gestão de definições " "xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Definir como verdadeiro para apresentar o texto de mensagem de título." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" "Definir como verdadeiro para utilizar o Compiz como o gestor de janelas." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -872,35 +843,35 @@ "Texto de título a apresentar na janela de início de sessão quando o selector " "de utilizadores estiver vazio, em vez do banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Texto de título a apresentar na janela de início de sessão." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Verdadeiro se o plugin de gestão de definições XRandR estiver activo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "Verdadeiro se o plugin de gestão de definições de fundo estiver activo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Verdadeiro se o plugin de gestão de definições das teclas de media estiver " "activo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Verdadeiro se o plugin de gestão de definições de som estiver activo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "Verdadeiro se o plugin de gestão de definições xsettings estiver activo." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Utilizar o Compiz como o gestor de janelas" @@ -928,8 +899,8 @@ msgid "Whether the timer is currently ticking" msgstr "Se o temporizador está ou não actualmente a correr" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Iniciar sessão como %s" @@ -939,170 +910,36 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Outro…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Seleccione uma conta diferente" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Convidado" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Iniciar sessão como um convidado temporário" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Início de Sessão Automático" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "" "Iniciar automaticamente uma sessão no sistema após seleccionar as opções" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Actualmente com sessão já iniciada" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"A Applet User Switch é uma aplicação livre; pode redistribuí-la e/ou alterá-" -"la sob as condições da Licença Pública Genérica GNU tal como publicada pela " -"Free Software Foundation; ou a versão 2 da Licença ou (à sua escolha) " -"qualquer versão posterior." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Esta aplicação é distribuída na expectativa de que seja útil, mas SEM " -"QUALQUER GARANTIA; sem mesmo a garantia implícita de COMERCIABILIDADE ou " -"ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Consulte a Licença Pública Genérica " -"GNU para mais detalhes." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente com " -"esta aplicação; caso contrário, escreva para a Free Software Foundation, " -"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA (em inglês)" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Um menu para alternar rapidamente entre utilizadores." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Duarte Loreto " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Incapaz de trancar o ecrã: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Incapaz de definir temporariamente a protecção de ecrã como ecrã preto: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Incapaz de terminar a sessão: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Disponível" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Invisível" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Ocupado" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Ausente" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informação de Conta" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Preferências do Sistema" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Trancar o Ecrã" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Alternar o Utilizador" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Sair…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Desconhecido" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Applet de Alternador de Utilizadores" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Alterar as definições e estado da conta" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Um menu para alternar rapidamente entre utilizadores" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Alternador de Utilizadores" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Fábrica da Applet de Alternador de Utilizadores" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editar _Informação Pessoal" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Sobre" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editar Utilizadores e Grupos" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Apenas é suportado o comando VERSION" @@ -1138,15 +975,148 @@ msgid "Unable to start new display" msgstr "Incapaz de iniciar um novo ecrã" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Realizada a captura de ecrã" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Capturar uma imagem do ecrã" +#~ msgid "Shutdown Options…" +#~ msgstr "Opções de Desligar…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Disposições de teclado" + +#~ msgid "_Keyboard:" +#~ msgstr "_Teclado:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Outro…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Seleccione uma disposição de teclado na lista de todas as disposições " +#~ "disponíveis." + +#~ msgid "Keyboard" +#~ msgstr "Teclado" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Disposições de teclado seleccionadas recentemente" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Definir com uma lista das disposições de teclado a apresentar por omissão " +#~ "na janela de início de sessão." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "A Applet User Switch é uma aplicação livre; pode redistribuí-la e/ou " +#~ "alterá-la sob as condições da Licença Pública Genérica GNU tal como " +#~ "publicada pela Free Software Foundation; ou a versão 2 da Licença ou (à " +#~ "sua escolha) qualquer versão posterior." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Esta aplicação é distribuída na expectativa de que seja útil, mas SEM " +#~ "QUALQUER GARANTIA; sem mesmo a garantia implícita de COMERCIABILIDADE ou " +#~ "ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Consulte a Licença Pública " +#~ "Genérica GNU para mais detalhes." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Deverá ter recebido uma cópia da Licença Pública Genérica GNU juntamente " +#~ "com esta aplicação; caso contrário, escreva para a Free Software " +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " +#~ "USA (em inglês)" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Um menu para alternar rapidamente entre utilizadores." + +#~ msgid "translator-credits" +#~ msgstr "Duarte Loreto " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Incapaz de trancar o ecrã: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Incapaz de definir temporariamente a protecção de ecrã como ecrã preto: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Incapaz de terminar a sessão: %s" + +#~ msgid "Available" +#~ msgstr "Disponível" + +#~ msgid "Invisible" +#~ msgstr "Invisível" + +#~ msgid "Busy" +#~ msgstr "Ocupado" + +#~ msgid "Away" +#~ msgstr "Ausente" + +#~ msgid "Account Information" +#~ msgstr "Informação de Conta" + +#~ msgid "System Preferences" +#~ msgstr "Preferências do Sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Trancar o Ecrã" + +#~ msgid "Switch User" +#~ msgstr "Alternar o Utilizador" + +#~ msgid "Quit…" +#~ msgstr "Sair…" + +#~ msgid "Unknown" +#~ msgstr "Desconhecido" + +#~ msgid "User Switch Applet" +#~ msgstr "Applet de Alternador de Utilizadores" + +#~ msgid "Change account settings and status" +#~ msgstr "Alterar as definições e estado da conta" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Um menu para alternar rapidamente entre utilizadores" + +#~ msgid "User Switcher" +#~ msgstr "Alternador de Utilizadores" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Fábrica da Applet de Alternador de Utilizadores" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Editar _Informação Pessoal" + +#~ msgid "_About" +#~ msgstr "_Sobre" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editar Utilizadores e Grupos" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Incapaz de definir id de grupo para 0" @@ -1339,8 +1309,8 @@ #~ "The User Selector's interfaces file, `%s', could not be opened. It is " #~ "likely that this application was not properly installed or configured." #~ msgstr "" -#~ "Incapaz de abrir o ficheiro de interface do Selector de Utilizadores, `%" -#~ "s'. Provavelmente esta aplicação não se encontra correctamente instalada " +#~ "Incapaz de abrir o ficheiro de interface do Selector de Utilizadores, `" +#~ "%s'. Provavelmente esta aplicação não se encontra correctamente instalada " #~ "ou configurada." #~ msgid "Users" diff -Nru gdm-2.32.1/po/ro.po gdm-3.0.0/po/ro.po --- gdm-2.32.1/po/ro.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ro.po 2011-04-04 14:37:16.000000000 +0000 @@ -3,15 +3,15 @@ # Marius Andreiana , 2000, 2002. # Dan Damian , 2001. # Mișu Moldovan , 2003 - 2009. -# Lucian Adrian Grijincu , 2009, 2010. +# Lucian Adrian Grijincu , 2009, 2010, 2011. # Adi Roiban , 2009 msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: " "http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-04 03:30+0000\n" -"PO-Revision-Date: 2010-08-04 21:31+0300\n" +"POT-Creation-Date: 2011-03-08 05:40+0000\n" +"PO-Revision-Date: 2011-03-16 23:26+0200\n" "Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian Gnome Team \n" "Language: ro\n" @@ -22,7 +22,7 @@ "20)) ? 1 : 2);;\n" "X-Generator: Virtaal 0.6.1\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom nu este un dispozitiv de tip caracter" @@ -47,28 +47,28 @@ msgid "could not find user \"%s\" on system" msgstr "nu s-a putut găsi „%s” în sistem" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Nu s-a putut inițializa sistemul de autentificare" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Nu s-a putut autentifica utilizatorul" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Nu s-a putut autoriza utilizatorul" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Nu s-au putut verifica credențialele" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Nu s-a putut deschide sesiunea" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1339 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -91,22 +91,23 @@ msgstr "Serverul trebuia pornit de utilizatorul %s, dar acesta nu există" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nu s-a putut seta „groupid” ca fiind %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () a eșuat pentru %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nu s-a putut seta „userid” ca fiind %d" #: ../daemon/gdm-server.c:435 +#, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: Nu s-a putut deschide fișierul log pentru displayul %s!" @@ -152,75 +153,82 @@ msgid "The display device" msgstr "Dispozitivul de tip display" -#: ../daemon/gdm-session-worker.c:1309 -msgid "error initiating conversation with authentication system: %s" -msgstr "eroare la inițierea conversației cu sistemul de autentificare: %s" +#: ../daemon/gdm-session-worker.c:1064 +#, c-format +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "eroare la inițierea conversației cu sistemul de autentificare - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1065 msgid "general failure" msgstr "eșec total" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1066 msgid "out of memory" msgstr "memorie insuficientă" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1067 msgid "application programmer error" msgstr "eroare de programare a aplicației" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1068 msgid "unknown error" msgstr "eroare necunoscută" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1075 msgid "Username:" msgstr "Nume utilizator:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1081 +#, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "eroare la informarea sistemului de autentificare cu privire la promptul " "preferat pentru numele de utilizator: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1095 +#, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "eroare la informarea sistemului de autentificare cu privire la numele " "calculatorului utilizatorului: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1110 +#, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "eroare la informarea sistemului de autentificare cu privire la consola " "utilizatorului: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1123 +#, c-format msgid "error informing authentication system of display string: %s" msgstr "" "eroare la informarea sistemului de autentificare cu privire la variabila " "DISPLAY: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1138 +#, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "eroare la informarea sistemului de autentificare cu privire la credențialele " "xauth: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1460 ../daemon/gdm-session-worker.c:1477 #, c-format msgid "no user account available" msgstr "nici un cont disponibil de utilizator" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1504 msgid "Unable to change to user" msgstr "Nu se poate schimba utilizatorul" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Utilizatorul %s nu există" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Grupul %s nu există" @@ -363,6 +371,7 @@ msgstr "Nu s-a putut obține numele serverului: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 +#, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Nu s-a putut scrie fișierul PID %s, probabil din lipsă de spațiu pe disc: %s" @@ -392,7 +401,8 @@ #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "" -"Authdir %s are drepturi de acces greșite %o. Ar trebui să fie %o. Se abandonează." +"Authdir %s are drepturi de acces greșite %o. Ar trebui să fie %o. Se " +"abandonează." #: ../daemon/main.c:409 #, c-format @@ -401,7 +411,8 @@ #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "Utilizatorul GDM n-ar trebui să fie administrator (root). Se abandonează!" +msgstr "" +"Utilizatorul GDM n-ar trebui să fie administrator (root). Se abandonează!" #: ../daemon/main.c:421 #, c-format @@ -444,7 +455,7 @@ msgstr "Wrapper al registrului AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1752 msgid "Login Window" msgstr "Fereastră de autentificare" @@ -493,7 +504,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agent de autentificare PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Selectare sistem" @@ -505,35 +516,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nu s-a putut citi antetul XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Valoare" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procentaj din timpul total" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Text inactiv" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Textul de utilizat în etichetă, dacă utilizatorul nu a ales un element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Text activ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Textul de utilizat în etichetă, dacă utilizatorul a ales un element" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Listă vizibilă" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Specifică dacă lista de utilizatori este vizibilă" @@ -565,65 +576,70 @@ msgid "%a %l:%M %p" msgstr "%a %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Autentificare automată în…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 msgid "Select language and click Log In" msgstr "Selectați limba și autentificați-vă" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 msgid "Cancelling…" msgstr "Se renunță…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 +msgctxt "customsession" +msgid "Custom" +msgstr "Personalizat" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 +msgid "Custom session" +msgstr "Sesiune personalizată" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Anulează" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Nume calculator" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Autentificare" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Deblochează" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Versiune" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "Panou" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "Opțiuni de oprire…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Suspendare" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Repornire" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Oprire" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "Personalizat" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Timp rămas necunoscut" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "Sesiune personalizată" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panou" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Limbi" @@ -651,36 +667,10 @@ msgid "Language" msgstr "Limbă" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nu s-a specificat" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Aranjamente de tastatură" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatură:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Alta…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Alegeți un aranjament de tastatură din lista aranjamentelor disponibile." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tastatură" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etichetă text" @@ -714,6 +704,7 @@ msgstr "Numărul maxim de elemente de păstrat în listă" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 +#, c-format msgid "Remote Login (Connecting to %s…)" msgstr "Autentificare la distanță (Conectare la %s…)" @@ -771,63 +762,52 @@ msgstr "Nume de iconiță de folosit pentru logoul greeter" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Aranjamente de tastatură recent utilizate" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Limbi recent selectate" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Precizați o listă a aranjamentelor de tastatură de afișat implicit în " -"fereastra de autentificare" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Precizați o listă de limbi de afișat implicit în fereastra de autentificare" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Precizați numele temei de iconițe de utilizat pentru logoul greeter" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Alegeți TRUE pentru a dezactiva afișarea utilizatorilor cunoscuți în " "fereastra de autentificare." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Alegeți TRUE pentru a dezactiva afișarea butoanelor de repornire în " "fereastra de autentificare." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "" "Alegeți TRUE pentru a activa modulul pentru gestionarea opțiunilor XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Alegeți TRUE pentru a activa modului pentru gestionarea opțiunilor " "fundalului." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Alegeți TRUE pentru a activa modului pentru gestionarea opțiunilor tastelor " "multimedia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Alegeți TRUE pentru a activa afișarea pe ecran a tastaturii pe ecran." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -835,33 +815,33 @@ "Alegeți TRUE pentru a activa modulul pentru gestionarea opțiunilor de " "accesibilitate a tastaturii." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Alegeți TRUE pentru a activa lupa de ecran." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Alegeți TRUE pentru a activa citirea ecranului." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Alegeți TRUE pentru a activa modulul pentru gestionarea opțiunilor de sunet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Alegeți TRUE pentru a activa modulul pentru gestionarea opțiunilor xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Alegeți TRUE pentru a afișa textului mesajului banner" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Alegeți TRUE pentru a utiliza Compiz ca administrator de ferestre." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -869,37 +849,37 @@ "Textul mesajului banner de afișat în fereastra de autentificare când lista " "de utilizatori este goală în locul textului banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Textul mesajului banner de afișat în fereastra de autentificare" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "" "TRUE atunci când modulul de gestionare a opțiunilor XRandR este activat." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "" "TRUE atunci când modulul de gestionare a opțiunilor fundalului este activat" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "TRUE atunci când modulul de gestionare a opțiunilor tastelor multimedia este " "activat" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "" "TRUE atunci când modulul de gestionare a opțiunilor de sunet este activat" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "" "TRUE atunci când modulul de gestionare a opțiunilor xsettings este activat" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Utilizează Compiz ca administrator de ferestre" @@ -927,8 +907,8 @@ msgid "Whether the timer is currently ticking" msgstr "Specifică dacă cronometrul este pornit" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:769 #, c-format msgid "Log in as %s" msgstr "Autentificare drept „%s”" @@ -938,172 +918,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:533 msgctxt "user" msgid "Other…" msgstr "Altul…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:534 msgid "Choose a different account" msgstr "Alegeți un alt cont" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:548 msgid "Guest" msgstr "Musafir" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:549 msgid "Log in as a temporary guest" msgstr "Autentificare ca musafir ocazional" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:564 msgid "Automatic Login" msgstr "Autentificare automată" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:565 msgid "Automatically log into the system after selecting options" msgstr "Autentificare automată în sistem după alegerea opțiunilor" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1309 msgid "Currently logged in" msgstr "Autentificat deja" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Miniaplicația de schimbare a utilizatorului este „free software”. Poate fi " -"redistribuită și/sau modificată în termenii licenței GNU General Public " -"License în forma publicată de Free Software Foundation, versiunea 2 sau " -"(dacă preferați) orice altă versiune ulterioară." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Acest program este distribuit în speranța că vă va fi util, dar FĂRĂ NICI O " -"GARANȚIE, nici măcar garanția unei posibile COMERCIALIZĂRI ori a UTILIZĂRII " -"PENTRU UN ANUME SCOP. Consultați licența GNU General Public License pentru " -"mai multe detalii." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Ar fi trebuit să primiți o copie a licenței GNU General Public License " -"împreună cu acest program. În caz contrar, scrieți la Free Software " -"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Un meniu pentru schimbarea utilizatorului curent." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Marius Andreiana \n" -"Dan Damian " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nu se poate bloca ecranul: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Nu s-a putut inițializa temporar economizorul de ecran pentru înnegrirea " -"ecranului: %s" - -#: ../gui/user-switch-applet/applet.c:888 -msgid "Can't log out: %s" -msgstr "Nu se poate ieși din sesiune: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Disponibil" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Invizibil" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Ocupat " - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Absent" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informații cont" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Preferințe de sistem" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Blocare ecran" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Schimbare utilizator" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Ieșire…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Nu se cunoaște" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Miniaplicație pentru schimbarea utilizatorului" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Modificare opțiuni cont și stare" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Un meniu pentru schimbarea utilizatorului" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Schimbare utilizator" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Șablon miniaplicație" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Editare _detalii personale" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Despre" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Editare utilizatori și grupuri" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Doar comanda VERSION este suportată" @@ -1139,15 +982,151 @@ msgid "Unable to start new display" msgstr "Nu s-a putut porni un nou display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "S-a capturat ecranul" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Capturează imaginea ecranului" +#~ msgid "Shutdown Options…" +#~ msgstr "Opțiuni de oprire…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Aranjamente de tastatură" + +#~ msgid "_Keyboard:" +#~ msgstr "_Tastatură:" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Alta…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Alegeți un aranjament de tastatură din lista aranjamentelor disponibile." + +#~ msgid "Keyboard" +#~ msgstr "Tastatură" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Aranjamente de tastatură recent utilizate" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Precizați o listă a aranjamentelor de tastatură de afișat implicit în " +#~ "fereastra de autentificare" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Miniaplicația de schimbare a utilizatorului este „free software”. Poate " +#~ "fi redistribuită și/sau modificată în termenii licenței GNU General " +#~ "Public License în forma publicată de Free Software Foundation, versiunea " +#~ "2 sau (dacă preferați) orice altă versiune ulterioară." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Acest program este distribuit în speranța că vă va fi util, dar FĂRĂ NICI " +#~ "O GARANȚIE, nici măcar garanția unei posibile COMERCIALIZĂRI ori a " +#~ "UTILIZĂRII PENTRU UN ANUME SCOP. Consultați licența GNU General Public " +#~ "License pentru mai multe detalii." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Ar fi trebuit să primiți o copie a licenței GNU General Public License " +#~ "împreună cu acest program. În caz contrar, scrieți la Free Software " +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " +#~ "USA" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Un meniu pentru schimbarea utilizatorului curent." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Marius Andreiana \n" +#~ "Dan Damian " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Nu se poate bloca ecranul: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Nu s-a putut inițializa temporar economizorul de ecran pentru înnegrirea " +#~ "ecranului: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "Nu se poate ieși din sesiune: %s" + +#~ msgid "Available" +#~ msgstr "Disponibil" + +#~ msgid "Invisible" +#~ msgstr "Invizibil" + +#~ msgid "Busy" +#~ msgstr "Ocupat " + +#~ msgid "Away" +#~ msgstr "Absent" + +#~ msgid "Account Information" +#~ msgstr "Informații cont" + +#~ msgid "System Preferences" +#~ msgstr "Preferințe de sistem" + +#~ msgid "Lock Screen" +#~ msgstr "Blocare ecran" + +#~ msgid "Switch User" +#~ msgstr "Schimbare utilizator" + +#~ msgid "Quit…" +#~ msgstr "Ieșire…" + +#~ msgid "Unknown" +#~ msgstr "Nu se cunoaște" + +#~ msgid "User Switch Applet" +#~ msgstr "Miniaplicație pentru schimbarea utilizatorului" + +#~ msgid "Change account settings and status" +#~ msgstr "Modificare opțiuni cont și stare" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Un meniu pentru schimbarea utilizatorului" + +#~ msgid "User Switcher" +#~ msgstr "Schimbare utilizator" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Șablon miniaplicație" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Editare _detalii personale" + +#~ msgid "_About" +#~ msgstr "_Despre" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Editare utilizatori și grupuri" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Nu s-a putut seta „groupid” ca fiind 0" diff -Nru gdm-2.32.1/po/ru.po gdm-3.0.0/po/ru.po --- gdm-2.32.1/po/ru.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ru.po 2011-04-04 14:37:16.000000000 +0000 @@ -9,40 +9,45 @@ # der_FeniX , 2010. # Yuri Kozlov , 2010. # Alexander Saprykin , 2009, 2010. +# Maxim Petrov , 2011. # msgid "" msgstr "" "Project-Id-Version: gdm trunk\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-09-20 06:50+0000\n" -"PO-Revision-Date: 2010-09-24 19:21+0400\n" -"Last-Translator: Alexander Saprykin \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-25 19:54+0000\n" +"PO-Revision-Date: 2011-03-26 19:41+0400\n" +"Last-Translator: Yuri Myaseodov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" "X-Generator: KBabel 1.11.4\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" #: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom не является символьным устройством" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" -msgstr "ID дисплея" +msgstr "Идентификатор дисплея" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +#: ../daemon/factory-slave-main.c:178 +#: ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 +#: ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "Идентификатор" -#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 -#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 +#: ../daemon/factory-slave-main.c:190 +#: ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 +#: ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Display Manager (ведомый)" @@ -51,38 +56,36 @@ msgid "could not find user \"%s\" on system" msgstr "не удалось найти в системе пользователя «%s»" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 +#: ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Не удалось инициализировать систему входа" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 +#: ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Не удалось аутентифицировать пользователя" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 +#: ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Не удалось авторизовать пользователя" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 +#: ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" -msgstr "Не удалось установить верительные данные" +msgstr "Не удалось установить мандаты" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 +#: ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Не удалось открыть сеанс" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -msgid "" -"Could not start the X server (your graphical environment) due to an internal " -"error. Please contact your system administrator or check your syslog to " -"diagnose. In the meantime this display will be disabled. Please restart GDM " -"when the problem is corrected." -msgstr "" -"Не удалось запустить X-сервер (графическое окружение) из-за внутренней " -"ошибки. Свяжитесь со своим системным администратором или проверьте системный " -"журнал. В настоящее время этот дисплей будет отключен. Перезапустите GDM, " -"когда проблема будет устранена." +#: ../daemon/gdm-factory-slave.c:677 +#: ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 +msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." +msgstr "Не удалось запустить X-сервер (графическое окружение) из-за внутренней ошибки. Свяжитесь со своим системным администратором или проверьте системный журнал. В настоящее время этот дисплей будет отключен. Перезапустите GDM, когда проблема будет устранена." #: ../daemon/gdm-server.c:250 #, c-format @@ -92,22 +95,24 @@ #: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "" -"Сервер был запущен с идентификатором (uid) %s, но такой пользователь не " -"существует" +msgstr "Сервер был запущен с идентификатором (uid) %s, но такой пользователь не существует" -#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-server.c:376 +#: ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 +#: ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Не удалось установить идентификатор группы в %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 +#: ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "сбой функции initgroups () для %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 +#: ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Не удалось установить идентификатор пользователя в %d" @@ -117,7 +122,8 @@ msgid "%s: Could not open log file for display %s!" msgstr "%s: Не удалось открыть файл журнала для дисплея %s!" -#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:446 +#: ../daemon/gdm-server.c:452 #: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" @@ -157,74 +163,72 @@ msgid "The display device" msgstr "Устройство дисплея" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "ошибка инициализации диалога с системой аутентификации: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "ошибка установки связи с системой аутентификации: %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "общий сбой" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "недостаточно памяти" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "программная ошибка приложения" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "неизвестная ошибка" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Имя пользователя:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" -msgstr "" -"ошибка извещения системы аутентификации о предпочтительном формате имени " -"пользователя: %s" +msgstr "ошибка извещения системы аутентификации о предпочтительном формате имени пользователя: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "ошибка извещения системы аутентификации об имени узла пользователя: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "ошибка извещения системы аутентификации о консоли пользователя: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "ошибка извещения системы аутентификации о строке дисплея: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" -msgstr "" -"ошибка извещения системы аутентификации о мандате xauth для дисплея: %s" +msgstr "ошибка извещения системы аутентификации о мандате xauth для дисплея: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 +#: ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "учётная запись пользователя недоступна" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Не удалось сменить пользователя" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Пользователь %s не существует" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Группа %s не существует" @@ -366,7 +370,8 @@ msgid "Could not get server hostname: %s!" msgstr "Не удалось получить имя узла от сервера: %s!" -#: ../daemon/main.c:237 ../daemon/main.c:250 +#: ../daemon/main.c:237 +#: ../daemon/main.c:250 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "Не удалось записать PID-файл %s: возможно, диск переполнен: %s" @@ -379,30 +384,22 @@ #: ../daemon/main.c:287 #, c-format msgid "Authdir %s does not exist. Aborting." -msgstr "" -"Каталог с файлами для проверки подлинности «%s» не существует. Аварийное " -"завершение работы." +msgstr "Каталог с файлами для проверки подлинности «%s» не существует. Аварийное завершение работы." #: ../daemon/main.c:291 #, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "" -"Путь «%s», где должны находиться файлы для проверки подлинности, не является " -"каталогом. Аварийное завершение работы." +msgstr "Путь «%s», где должны находиться файлы для проверки подлинности, не является каталогом. Аварийное завершение работы." #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "" -"Каталог с файлами для проверки подлинности «%s» не принадлежит пользователю %" -"d, группе %d. Аварийное завершение работы." +msgstr "Каталог с файлами для проверки подлинности «%s» не принадлежит пользователю %d, группе %d. Аварийное завершение работы." #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "" -"Каталог с файлами для проверки подлинности «%s» имеет неверные права %o. " -"Должно быть %o. Аварийное завершение работы." +msgstr "Каталог с файлами для проверки подлинности «%s» имеет неверные права %o. Должно быть %o. Аварийное завершение работы." #: ../daemon/main.c:409 #, c-format @@ -411,9 +408,7 @@ #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "" -"Пользователь GDM не может быть суперпользователем. Аварийное завершение " -"работы!" +msgstr "Пользователь GDM не может быть суперпользователем. Аварийное завершение работы!" #: ../daemon/main.c:421 #, c-format @@ -422,8 +417,7 @@ #: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" -msgstr "" -"Группа GDM не должна быть суперпользовательской. Аварийное завершение работы!" +msgstr "Группа GDM не должна быть суперпользовательской. Аварийное завершение работы!" #: ../daemon/main.c:533 msgid "Make all warnings fatal" @@ -457,7 +451,7 @@ msgstr "Оболочка реестра AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1638 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Окно входа в систему" @@ -469,6 +463,10 @@ msgid "Power management daemon" msgstr "Служба управления питанием" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Компонент проверки ускорения сеанса GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Служба настроек среды GNOME" @@ -505,7 +503,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Диалог аутентификации PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Выберите систему" @@ -517,38 +515,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Не удалось прочитать заголовок XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Значение" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "процент затраченного времени" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Неактивный текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" -msgstr "" -"Текст, используемый в качестве ярлыка, если пользователь ещё не выделил " -"элемент" +msgstr "Текст, используемый в качестве ярлыка, если пользователь ещё не выделил элемент" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Активный текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "" -"Текст, используемый в качестве ярлыка, если пользователь выделил элемент" +msgstr "Текст, используемый в качестве ярлыка, если пользователь выделил элемент" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Показывать список" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Показывает список выбора для удалённого подключения" @@ -557,88 +552,92 @@ #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 msgid "%a %b %e, %l:%M:%S %p" -msgstr "%a %b %e, %l:%M:%S %p" +msgstr "%a %b %e, %H:%M:%S" #. translators: This is the time format to use when both #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 msgid "%a %b %e, %l:%M %p" -msgstr "%a %b %e, %l:%M %p" +msgstr "%a %b %e, %H:%M" #. translators: This is the time format to use when there is #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 msgid "%a %l:%M:%S %p" -msgstr "%a %l:%M:%S %p" +msgstr "%a %H:%M:%S" #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 msgid "%a %l:%M %p" -msgstr "%a %l:%M %p" +msgstr "%a %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Автоматический вход в систему…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Выберите язык и нажмите «Войти в систему»" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Отмена…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Другой" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Другой сеанс" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Отмена" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Имя компьютера" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Войти в систему" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Разблокировать" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Версия" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Панель" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Параметры выключения…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Спящий режим" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Перезапустить" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Выключить" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Другой" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Оставшееся время неизвестно" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Другой сеанс" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Панель" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Языки" @@ -666,35 +665,10 @@ msgid "Language" msgstr "Язык" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Не указано" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Раскладки клавиатуры" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Клавиатура:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Другая…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Выберите раскладку клавиатуры из списка доступных раскладок." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Клавиатура" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Текст ярлыка" @@ -786,124 +760,98 @@ msgstr "Имя значка для отображения в качестве логотипа приветствия" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Недавние раскладки клавиатуры" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Недавно выбранные языки" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Установите список раскладок клавиатуры, отображаемых по умолчанию в окне " -"входа в систему." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." -msgstr "" -"Установите список языков, отображаемых по умолчанию в окне входа в систему." +msgstr "Установите список языков, отображаемых по умолчанию в окне входа в систему." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" -"Установите значение имени значка из темы, используемого в качестве логотипа " -"экрана приветствия." +msgstr "Установите значение имени значка из темы, используемого в качестве логотипа экрана приветствия." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." -msgstr "" -"Установите, чтобы запретить отображение списка известных пользователей в " -"окне входа в систему." +msgstr "Установите, чтобы запретить отображение списка известных пользователей в окне входа в систему." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" -"Установите, чтобы запретить отображение кнопок перезапуска в окне входа в " -"систему." +msgstr "Установите, чтобы запретить отображение кнопок перезапуска в окне входа в систему." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Установите, чтобы включить модуль управления параметрами XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Установите, чтобы включить модуль настройки фона." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Установите, чтобы включить модуль настройки мультимедийных клавиш." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Установите, чтобы включить экранную клавиатуру." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -msgid "" -"Set to true to enable the plugin to manage the accessibility keyboard " -"settings." -msgstr "" -"Установите, чтобы включить модуль управления специальными возможностями " -"клавиатуры." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." +msgstr "Установите, чтобы включить модуль управления специальными возможностями клавиатуры." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Установите, чтобы включить экранную лупу." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Установите, чтобы включить чтение с экрана." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Установите, чтобы включить модуль управления параметрами звука." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Установите, чтобы включить модуль управления xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Установите, чтобы отображать текстовый транспарант." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Установите, чтобы использовать в качестве менеджера окон Compiz." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "" -"Text banner message to show in the login window when the user chooser is " -"empty, instead of banner_message_text." -msgstr "" -"Текстовый транспарант, показываемый в окне приветствия, когда список выбора " -"пользователей пуст, вместо стандартного транспаранта." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text." +msgstr "Текстовый транспарант, показываемый в окне приветствия, когда список выбора пользователей пуст, вместо стандартного транспаранта." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Текстовый транспарант, показываемый в окне приветствия." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Установлено, если включён модуль управления настройками XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Установлено, если включён модуль настройки фона." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Установлено, если включён модуль настройки мультимедийных клавиш." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Установлено, если включён модуль настройки звука." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Установлено, если включён модуль настройки xsettings" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Использовать Compiz в качестве менеджера окон" @@ -931,8 +879,8 @@ msgid "Whether the timer is currently ticking" msgstr "Работает ли таймер в текущий момент" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Войти в систему как %s" @@ -942,168 +890,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Другой…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Выберите другую учётную запись" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Гость" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Зарегистрироваться в системе как временный гость" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Автоматический вход" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Автоматически входить в систему после выбора параметров" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Уже зарегистрирован в системе" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Апплет переключения пользователей — свободное программное обеспечение, вы " -"можете распространять и/или модифицировать его на условиях Универсальной " -"общественной лицензии GNU, опубликованной Фондом свободного программного " -"обеспечения, версии 2 или (на ваше усмотрение) более поздней." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"Эта программа распространяется в надежде, что он может быть полезен, но БЕЗ " -"КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО " -"НЕ ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И " -"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений " -"обратитесь к Универсальной общественной лицензии GNU." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"Вы должны получить копию лицензии GNU с этой программой. Если лицензия не " -"была получена, известите об этом Фонд свободного программного обеспечения по " -"адресу: Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, " -"MA 02111-1307 USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "Меню для быстрого переключения между пользователями." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"Леонид Кантер \n" -"Alexander Saprykin , 2010" - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Не удалось заблокировать экран: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Не удалось временно сменить хранитель экрана на пустой экран: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "Не удалось завершить сеанс: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "Доступен" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "Невидимый" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "Занят" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "Отошёл" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "Информация об учётной записи" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "Параметры системы" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "Заблокировать экран" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "Переключить пользователя" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "Выйти…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Апплет переключения пользователей" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "Изменить текущую учётную запись или состояние сеанса" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Меню для быстрого переключения пользователей" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Переключатель пользователей" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Фабрика апплета переключателя пользователей" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Изменить _личные данные" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_О программе" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Изменить пользователей и группы" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Поддерживается только команда VERSION" @@ -1112,12 +927,15 @@ msgid "COMMAND" msgstr "COMMAND" -#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 -#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +#: ../utils/gdmflexiserver.c:62 +#: ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 +#: ../utils/gdmflexiserver.c:66 msgid "Ignored — retained for compatibility" msgstr "Игнорируется — осталось для совместимости" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +#: ../utils/gdmflexiserver.c:64 +#: ../utils/gdm-screenshot.c:43 msgid "Debugging output" msgstr "Отладочный вывод" @@ -1139,12 +957,12 @@ msgid "Unable to start new display" msgstr "Не удалось запустить новый дисплей" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Снимок экрана готов" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Сделать снимок экрана" diff -Nru gdm-2.32.1/po/sk.po gdm-3.0.0/po/sk.po --- gdm-2.32.1/po/sk.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/sk.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,18 +1,18 @@ # Slovak translation for gdm. -# Copyright (C) 2000-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2011 Free Software Foundation, Inc. # This file is distributed under the same license as the gdm package. # Stanislav Višňovský , 2003. # Stanislav Višňovský , 2000, 2001, 2002, 2003, 2004. # Marcel Telka , 2005. -# Pavol Šimo , 2006-2010. +# Pavol Šimo , 2006-2011. # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-17 19:06+0000\n" -"PO-Revision-Date: 2010-08-29 17:30+0200\n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-29 16:34+0000\n" +"PO-Revision-Date: 2011-03-30 08:01+0200\n" "Last-Translator: Pavol Šimo \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -45,41 +45,36 @@ msgid "could not find user \"%s\" on system" msgstr "používateľ \"%s\" sa v systéme nenašiel" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Nepodarilo sa inicializovať systém prihlásenia" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Nepodarilo sa overiť totožnosť používateľa" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Nepodarilo sa autorizovať používateľa" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Nepodarilo sa ustanoviť poverenia" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Nepodarilo sa začať reláciu" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " "diagnose. In the meantime this display will be disabled. Please restart GDM " "when the problem is corrected." msgstr "" -"Nepodarilo sa spustiť X server (vaše grafické prostredie) pre internú " -"chybu. Na určenie príčiny kontaktujte, prosím, vášho správcu systému, alebo " +"Nepodarilo sa spustiť X server (vaše grafické prostredie) pre internú chybu. " +"Na určenie príčiny kontaktujte, prosím, vášho správcu systému, alebo " "skontrolujte súbor so systémovým záznamom. Zatiaľ bude tento displej " "vypnutý. Prosím, po oprave problému reštartujte GDM." @@ -94,24 +89,23 @@ msgstr "Server mal byť spustený používateľom %s, taký ale neexistuje" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Nepodarilo sa nastaviť groupid na %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () zlyhalo pre %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Nepodarilo sa nastaviť userid na %d" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: Nepodarilo sa otvoriť súbor so záznamom pre displej %s!" @@ -155,88 +149,80 @@ msgid "The display device" msgstr "Zobrazovacie zariadenie" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -#| msgid "error initiating conversation with authentication system - %s" -msgid "error initiating conversation with authentication system: %s" -msgstr "chyba pri započatí konverzácie so systémom overovania totožnosti: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "chyba pri započatí konverzácie so systémom overovania totožnosti - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "všeobecné zlyhanie" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "nedostatok pamäte" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "chyba programátora aplikácie" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "neznáma chyba" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Používateľské meno:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o preferovanej výzve na " "meno používateľa: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o názve hostiteľa " "používateľa: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "" -"chyba pri informovaní systému overovania totožnosti o používateľovej konzole: " -"%s" +"chyba pri informovaní systému overovania totožnosti o používateľovej " +"konzole: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o reťazci displeja: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o xauth oprávneniach " "displeja: %s" -#: ../daemon/gdm-session-worker.c:1679 ../daemon/gdm-session-worker.c:1696 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nie je k dispozícií žiaden používateľský účet" -#: ../daemon/gdm-session-worker.c:1723 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Nepodarilo sa zmeniť na používateľa" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Používateľ %s neexistuje" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Skupina %s neexistuje" @@ -384,7 +370,6 @@ #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Nie je možné zapísať súbor PID %s: možno nedostatok miesta na disku: %s" @@ -442,7 +427,6 @@ msgstr "Považovať všetky upozornenia za kritické" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "Skončiť po nejakom čase (na ladenie)" @@ -467,12 +451,11 @@ msgstr "Spracovávač relácie Správcu prihlásenia GNOME" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "Obaľovač AT-SPI registra" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1633 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Prihlasovacie okno" @@ -484,6 +467,10 @@ msgid "Power management daemon" msgstr "Démon správy napájania" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Overovač urýchľovania relácie GNOME" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Démon nastavení GNOME" @@ -497,12 +484,10 @@ msgstr "Zväčšiť časti obrazovky" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "Klávesnica na obrazovke GNOME" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "Použiť klávesnicu na obrazovke" @@ -522,7 +507,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Agent overovania totožnosti PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Zvoľte systém" @@ -534,36 +519,36 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nepodarilo sa prečítať hlavičku XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Hodnota" # nie je nikde v UI zobrazené - je to len pre "ukrajujúci sa koláč" pri časovanom automatickom prihlásení, text pre object introspection -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "vykonané percento času" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Neaktívny text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Text použitý v popise, ak si používateľ ešte nič nezvolil" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktívny text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Text použitý v popise, ak si už používateľ zvolil nejakú položku" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Zoznam viditeľný" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Či je viditeľný vyberací zoznam" @@ -597,69 +582,69 @@ msgid "%a %l:%M %p" msgstr "%H:%M, %a" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Prebieha automatické prihlásenie…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Zvoľte jazyk a kliknite na Prihlásiť" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Ruší sa…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Vlastná" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Vlastná relácia" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Zrušiť" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Názov počítača" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Prihlásiť" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" -msgstr "" +msgstr "Odomknúť" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Verzia" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -#| msgid "Shutdown Options..." -msgid "Shutdown Options…" -msgstr "Možnosti vypnutia…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Uspať" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Reštartovať" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Vypnúť" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Zostávajúci čas je neznámy" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Jazyky" @@ -675,54 +660,22 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#, fuzzy -#| msgid "Other" msgctxt "language" msgid "Other…" -msgstr "Ďalší" +msgstr "Ďalšie…" #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Zvoľte si jazyk z úplného zoznamu dostupných jazykov." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "Jazyk" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nešpecifikovaný" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Rozloženia klávesnice" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Klávesnica:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#, fuzzy -#| msgid "Other" -msgctxt "keyboard" -msgid "Other…" -msgstr "Ďalší" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"Zvoľte si rozloženie klávesnice z úplného zoznamu dostupných rozložení." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "Klávesnica" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Text popisu" @@ -757,7 +710,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "Vzdialené prihlásenie (Pripájanie k %s…)" @@ -771,7 +723,6 @@ msgstr "Vzdialené prihlásenie" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "Relácia" @@ -816,104 +767,82 @@ msgstr "Názov ikony použitej ako logo uvítania" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nedávno zvolené rozloženia klávesnice" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nedávno zvolené jazyky" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Nastavte na zoznam rozložení klávesnice, ktorý sa predvolene zobrazí v " -"prihlasovacej obrazovke." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Nastavte na zoznam jazykov, ktorý sa predvolene zobrazí v prihlasovacej " "obrazovke." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "" "Nastavte na názov témovateľnej ikony, ktorá sa má použiť ako logo uvítania." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Nastavte na true, ak chcete v prihlasovacej obrazovke zakázať zobrazovanie " "známych používateľov." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Nastavte na true, ak chcete v prihlasovacej obrazovke zakázať zobrazovanie " "tlačidiel pre reštartovanie." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení pozadia." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Nastavte na true, ak chcete povoliť modul správy nastavení multimediálnych " "kláves." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Nastavte na true, ak chcete povoliť klávesnicu na obrazovke." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "" -"Nastavte na true, ak chcete povoliť modul nastavení sprístupnenia " -"klávesnice." +"Nastavte na true, ak chcete povoliť modul nastavení sprístupnenia klávesnice." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Nastavte na true, ak chcete povoliť lupu obrazovky." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Nastavte na true, ak chcete povoliť čítač obrazovky." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení zvuku." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Nastavte na true, ak chcete zobraziť text uvítacej správy." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Nastavte na true, ak chcete použiť Compiz ako správcu okien." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -921,34 +850,31 @@ "Textová uvítacia správa zobrazená v prihlasovacom okne namiesto hodnoty " "banner_message_text, keď je vyberací zoznam používateľov prázdny." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Textová uvítacia správa zobrazená v prihlasovacom okne." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Ak je true, modul správy nastavení XRandR je povolený." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Ak je true, modul správy nastavení pozadia je povolený." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Ak je true, modul správy nastavení multimediálnych kláves je povolený." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Ak je true, modul správy nastavení zvuku je povolený." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Ak je true, modul správy nastavení xsettings je povolený." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Použiť Compiz ako správcu okien" @@ -976,8 +902,8 @@ msgid "Whether the timer is currently ticking" msgstr "Či časovač momentálne tiká" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Prihlásiť sa ako %s" @@ -987,179 +913,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 -#| msgid "Other" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Ďalší…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Zvoľte iný účet" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Návštevník" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Prihlásiť sa ako dočasný návštevník" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatické prihlásenie" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automaticky prihlásiť do systému po zvolení možností" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Už je prihlásený" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Prepínač používateľov je slobodný softvér; môžete ho ďalej šíriť a/alebo " -"modifikovať v súlade so znením Všeobecnej verejnej licencie GNU tak, ako " -"bola vydaná organizáciou Free Software Foundation, a to buď verzie 2\n" -"tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Tento program je rozširovaný v nádeji, že bude užitočný, avšak BEZ AKEJKOĽVEK " -"ZÁRUKY; Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI alebo VHODNOSTI " -"PRE URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte vo Všeobecnej verejnej licencii " -"GNU." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Kópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto\n" -"programom; ak sa tak nestalo, napíšte na Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Ponuka na rýchle prepnutie medzi používateľmi." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Pavol Šimo \n" -"Marcel Telka " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Nie je možné uzamknúť obrazovku: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "" -"Nie je možné dočasne nastaviť šetrič obrazovky na prázdnu obrazovku: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "Nie je možné odhlásiť sa: %s" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Prítomný" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Neviditeľný" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Zaneprázdnený" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Neprítomný" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Informácie o účte" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Nastavenia systému" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Uzamknúť obrazovku" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Prepnúť používateľa" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Neznámy" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Aplet Prepínač používateľov" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Zmeniť nastavenia účtu a stav" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Ponuka na rýchle prepnutie medzi používateľmi" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Prepínač používateľov" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Vytváracie rozhranie pre aplet Prepínač používateľov" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Upraviť osobné _informácie" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_O programe" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Upra_viť používateľov a skupiny" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Podporovaný je len príkaz VERSION" @@ -1170,7 +952,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "Ignorované — ponechané pre kompatibilitu" @@ -1196,15 +977,158 @@ msgid "Unable to start new display" msgstr "Nie je možné spustiť nový displej" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Obrazovka zosnímaná" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Odfotiť obrazovku" +#~| msgid "Shutdown Options..." +#~ msgid "Shutdown Options…" +#~ msgstr "Možnosti vypnutia…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Rozloženia klávesnice" + +#~ msgid "_Keyboard:" +#~ msgstr "_Klávesnica:" + +#, fuzzy +#~| msgid "Other" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Ďalší" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Zvoľte si rozloženie klávesnice z úplného zoznamu dostupných rozložení." + +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "Klávesnica" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Nedávno zvolené rozloženia klávesnice" + +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Nastavte na zoznam rozložení klávesnice, ktorý sa predvolene zobrazí v " +#~ "prihlasovacej obrazovke." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Prepínač používateľov je slobodný softvér; môžete ho ďalej šíriť a/alebo " +#~ "modifikovať v súlade so znením Všeobecnej verejnej licencie GNU tak, ako " +#~ "bola vydaná organizáciou Free Software Foundation, a to buď verzie 2\n" +#~ "tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskoršej " +#~ "verzie." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Tento program je rozširovaný v nádeji, že bude užitočný, avšak BEZ " +#~ "AKEJKOĽVEK ZÁRUKY; Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI " +#~ "alebo VHODNOSTI PRE URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte vo " +#~ "Všeobecnej verejnej licencii GNU." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Kópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto\n" +#~ "programom; ak sa tak nestalo, napíšte na Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Ponuka na rýchle prepnutie medzi používateľmi." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Pavol Šimo \n" +#~ "Marcel Telka " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Nie je možné uzamknúť obrazovku: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Nie je možné dočasne nastaviť šetrič obrazovky na prázdnu obrazovku: %s" + +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Nie je možné odhlásiť sa: %s" + +# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) +#~ msgid "Available" +#~ msgstr "Prítomný" + +# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) +#~ msgid "Invisible" +#~ msgstr "Neviditeľný" + +# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) +#~ msgid "Busy" +#~ msgstr "Zaneprázdnený" + +# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) +#~ msgid "Away" +#~ msgstr "Neprítomný" + +#~ msgid "Account Information" +#~ msgstr "Informácie o účte" + +#~ msgid "System Preferences" +#~ msgstr "Nastavenia systému" + +#~ msgid "Lock Screen" +#~ msgstr "Uzamknúť obrazovku" + +#~ msgid "Switch User" +#~ msgstr "Prepnúť používateľa" + +#~ msgid "Unknown" +#~ msgstr "Neznámy" + +#~ msgid "User Switch Applet" +#~ msgstr "Aplet Prepínač používateľov" + +#~ msgid "Change account settings and status" +#~ msgstr "Zmeniť nastavenia účtu a stav" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Ponuka na rýchle prepnutie medzi používateľmi" + +#~ msgid "User Switcher" +#~ msgstr "Prepínač používateľov" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Vytváracie rozhranie pre aplet Prepínač používateľov" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Upraviť osobné _informácie" + +#~ msgid "_About" +#~ msgstr "_O programe" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "Upra_viť používateľov a skupiny" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Nepodarilo sa nastaviť groupid na 0" diff -Nru gdm-2.32.1/po/sl.po gdm-3.0.0/po/sl.po --- gdm-2.32.1/po/sl.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/sl.po 2011-04-04 14:37:16.000000000 +0000 @@ -5,16 +5,17 @@ # Urban Borštnik , 2000 - 2001. # Andraž Tori , 2001 - 2002. # Matjaž Horvat , 2006. -# Matej Urbančič , 2007 - 2010. +# Matej Urbančič , 2007 - 2011. # msgid "" msgstr "" "Project-Id-Version: gdm master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-02 11:39+0000\n" -"PO-Revision-Date: 2010-07-05 07:01+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 16:37+0000\n" +"PO-Revision-Date: 2011-03-17 19:49+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,7 +24,7 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Language: Slovenian\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ni znakovna naprava" @@ -55,33 +56,33 @@ msgstr "v sistemu ni mogoče najti uporabnika \"%s\"" #: ../daemon/gdm-factory-slave.c:203 -#: ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Ni mogoče začeti sistema prijave" #: ../daemon/gdm-factory-slave.c:235 -#: ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Ni mogoče overiti uporabnika" #: ../daemon/gdm-factory-slave.c:257 -#: ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Ni mogoče pooblastiti uporabnika" #: ../daemon/gdm-factory-slave.c:279 -#: ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Ni mogoče vzpostaviti pooblastila" #: ../daemon/gdm-factory-slave.c:302 -#: ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Ni mogoče odpreti seje" -#: ../daemon/gdm-factory-slave.c:689 +#: ../daemon/gdm-factory-slave.c:677 #: ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-simple-slave.c:1366 msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." msgstr "Ni mogoče zagnati strežnika X (vašega grafičnega okolja) zaradi notranje napake. Obrnite se na vašega skrbnika sistema ali preverite vaš sistemski dnevnik. V vmesnem času bo ta zaslon izključen. Poskusite s ponovnim zagonom GDM, ko bo problem odpravljen." @@ -97,20 +98,20 @@ #: ../daemon/gdm-server.c:376 #: ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 -#: ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 +#: ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Ni mogoče nastaviti groupid na %d" #: ../daemon/gdm-server.c:382 -#: ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgrougs() ni uspel za %s" #: ../daemon/gdm-server.c:388 -#: ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Ni mogoče nastaviti userid na %d" @@ -161,72 +162,72 @@ msgid "The display device" msgstr "Naprava za prikazovanje" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "napaka začenjanje povezave s sistemom pooblastitve: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "napaka začenjanja povezave s sistemom pooblastitve - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "splošna napaka" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "primanjkuje pomnilnika" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "programerska napaka programa" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "neznana napaka" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Uporabniško ime:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "napaka obveščanja sistema pooblastitve o pozivniku uporabniškega imena: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "napaka obveščanja sistema pooblastitve o imenu gostitelja: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "napaka obveščanja sistema pooblastitve o konzoli: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "napaka obveščanja sistema pooblastitve zaslonskih niti: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "napaka obveščanja sistema pooblastitve xauth varoval: %s" -#: ../daemon/gdm-session-worker.c:1675 -#: ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 +#: ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "na voljo ni nobenega uporabniškega računa" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Ni mogoče zamenjati uporabnika" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Uporabnik %s ne obstaja" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Skupina %s ne obstaja" @@ -449,7 +450,7 @@ msgstr "Ovijalnik vpisnika AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Prijavno okno" @@ -461,6 +462,10 @@ msgid "Power management daemon" msgstr "Ozadnji program upravljalnika porabe" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Preverjalnik pospeševanja GNOME seje" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Ozadnji program GNOME nastavitev" @@ -497,7 +502,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Pogovorno okno pooblastitve" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Izbrani sistem" @@ -509,35 +514,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Ni mogoče prebrati glave XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Vrednost" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "odstotek časa zaključka" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Nedejavno besedilo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Besedilo, ki se uporablja za označevanje naslova, če uporabnik še ni določil predmeta." -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Dejavno besedilo" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Besedilo, ki se uporablja za označevanje naslova, ko uporabnik določi predmet" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Seznam je viden" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Ali naj bo seznam izbire viden" @@ -569,65 +574,69 @@ msgid "%a %l:%M %p" msgstr "%a, %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Samodejna prijava ..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Izberite jezik in kliknite na prijavo" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Preklic ..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Po meri" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Seja po meri" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Prekliči" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Ime računalnika" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Prijava" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Odkleni" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Različica" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "Pult" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "Možnosti izklopa ..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "V mirovanje" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Ponovno zaženi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Izklopi računalnik" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "Po meri" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Preostanek trajanja ni znan" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "Seja po meri" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Pult" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Jeziki" @@ -655,35 +664,10 @@ msgid "Language" msgstr "Jezik" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Nedoločeno" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Razporeditve tipkovnice" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tipkovnica:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Drugo ..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Izberite razporeditev tipkovnice s seznama naborov, ki so na voljo." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tipkovnica" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Besedilo oznake" @@ -775,106 +759,98 @@ msgstr "Ime ikone za pozdravni logo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nedavno izbrane razporeditve tipkovnice" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nedavno izbrani jeziki" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "Seznam razporeditev tipkovnice, ki bo privzeto prikazan na prijavnem oknu." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Seznam jezikov, ki bo privzeto prikazan na prijavnem oknu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Izbrana možnost določi uporabo imena tematske ikone v logotipu pozdravnega okna prijave." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "Izbrana možnost onemogoči izpis znanih uporabnikov v prijavnem oknu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "Izbrana možnost onemogoči prikaz gumba za ponovni zagon v prijavnem oknu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Izbrana možnost omogoča zagon vstavka upravljalnika nastavitev XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Izbrana možnost omogoča uporabo vstavka upravljalnika nastavitev." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Izbrana možnost omogoča uporabo vstavka upravljalnika nastavitev večpredstavnostnih tipk." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Izbrana možnost omogoča uporabo namizne tipkovnice." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." msgstr "Izbrana možnost omogoča uporabo vstavka upravljalnika nastavitev dostopnosti tipkovnice." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Izbrana možnost omogoča uporabo povečevala." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Izbrana možnost omogoča uporabo zaslonskega bralnika." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Izbrana možnost omogoča zagon vstavka nastavitev zvoka." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Izbrana možnost omogoča uporabo vstavka upravljalnika xsettings nastavitev." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Izbrana možnost omogoča prikaz pasice sporočilnega besedila." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Izbrana nastavitev omogoča uporabo compiz kot upravljalnika oken." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text." msgstr "Prikaz besedila sporočila pasice na prijavnem oknu, kadar je izbirnik uporabnikov prazen namesto banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Prikaz besedila sporočila pasice na prijavnem oknu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Možnost je omogočena, če je zagnan vstavek upravljalnika nastavitev XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Možnost je omogočena, če je zagnan vstavek upravljalnika nastavitev ozadja. " -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Omogočeno, kadar je izbrana možnost upravljalnika media-keys nastavitev" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Možnost je omogočena, če je zagnan vstavek upravljalnika nastavitev zvoka." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Omogočeno, kadar je izbrana možnost upravljalnika xsettings nastavitev" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Uporabi compiz kot upravljalnik oken" @@ -902,8 +878,8 @@ msgid "Whether the timer is currently ticking" msgstr "Ali časomer trenutno tiktaka" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Prijavite se kot %s" @@ -913,146 +889,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Drugo ..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Izbor drugega računa" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gost" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Prijavite se kot gostujoči uporabnik" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Samodejna prijava" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Samodejna prijava v sistem po izbiri možnosti" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Trenutno prijavljeni" -#: ../gui/user-switch-applet/applet.c:162 -msgid "The User Switch Applet 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." -msgstr "Aplet preklopa uporabnikov je prosta programska oprema; lahko jo širite in spreminjate pod pogoji splošne javne licence, kot je objavljena pri Free Software Foundation; različica licence 2 ali novejša." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "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." -msgstr "Ta program je na voljo v upanju, da bo uporaben, vendar je BREZ VSAKRŠNEGA JAMSTVA; tudi brez jamstva o USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO. Za več podrobnosti si oglejte besedilo splošnega javnega dovoljenja (GNU GPL)." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "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 " -msgstr "S programom bi morali dobiti tudi kopijo Splošnega Javnega dovoljenja (GNU General Public License); v primeru, da je niste, stopite v stik s Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Meni za hitro preklapljanje med uporabniki." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Matej Urbančič " - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Ni mogoče zakleniti zaslona: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Ni mogoče začasno nastaviti črnega zaslona za ohranjevalnik zaslona: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Ni se mogoče odjaviti: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Na voljo" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Nevidno" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Zaposleno" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Odsotno" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Podrobnosti računa" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Sistemske možnosti" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Zakleni zaslon" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Preklop uporabnika" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Končaj ..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Neznano" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Aplet preklopa uporabnikov" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Spremeni nastavitve računa in stanje" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Meni za hitro preklapljanje med uporabniki" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Preklopnik med uporabniki" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Tovarna apletov preklopnika med uporabniki" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Uredi osebne _podatke" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_O programu" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Uredi uporabnike in skupine" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Podprt je le ukaz VERSION" @@ -1091,172 +956,219 @@ msgid "Unable to start new display" msgstr "Ni mogoče zagnati novega zaslona" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Zaslonska slika je zajeta" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Zajemanje zaslonske slike" +#~ msgid "Keyboard layouts" +#~ msgstr "Razporeditve tipkovnice" +#~ msgid "_Keyboard:" +#~ msgstr "_Tipkovnica:" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Drugo ..." +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Izberite razporeditev tipkovnice s seznama naborov, ki so na voljo." +#~ msgid "Keyboard" +#~ msgstr "Tipkovnica" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Nedavno izbrane razporeditve tipkovnice" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Seznam razporeditev tipkovnice, ki bo privzeto prikazan na prijavnem oknu." +#~ msgid "Shutdown Options…" +#~ msgstr "Možnosti izklopa ..." +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Aplet preklopa uporabnikov je prosta programska oprema; lahko jo širite " +#~ "in spreminjate pod pogoji splošne javne licence, kot je objavljena pri " +#~ "Free Software Foundation; različica licence 2 ali novejša." +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Ta program je na voljo v upanju, da bo uporaben, vendar je BREZ " +#~ "VSAKRŠNEGA JAMSTVA; tudi brez jamstva o USTREZNOSTI ZA PRODAJO ali " +#~ "PRIMERNOSTI ZA UPORABO. Za več podrobnosti si oglejte besedilo splošnega " +#~ "javnega dovoljenja (GNU GPL)." +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "S programom bi morali dobiti tudi kopijo Splošnega Javnega dovoljenja " +#~ "(GNU General Public License); v primeru, da je niste, stopite v stik s " +#~ "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " +#~ "MA 02110-1301, USA " +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Meni za hitro preklapljanje med uporabniki." +#~ msgid "translator-credits" +#~ msgstr "Matej Urbančič " +#~ msgid "Can't lock screen: %s" +#~ msgstr "Ni mogoče zakleniti zaslona: %s" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Ni mogoče začasno nastaviti črnega zaslona za ohranjevalnik zaslona: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Ni se mogoče odjaviti: %s" +#~ msgid "Available" +#~ msgstr "Na voljo" +#~ msgid "Invisible" +#~ msgstr "Nevidno" +#~ msgid "Busy" +#~ msgstr "Zaposleno" +#~ msgid "Away" +#~ msgstr "Odsotno" +#~ msgid "Account Information" +#~ msgstr "Podrobnosti računa" +#~ msgid "System Preferences" +#~ msgstr "Sistemske možnosti" +#~ msgid "Lock Screen" +#~ msgstr "Zakleni zaslon" +#~ msgid "Switch User" +#~ msgstr "Preklop uporabnika" +#~ msgid "Quit…" +#~ msgstr "Končaj ..." +#~ msgid "User Switch Applet" +#~ msgstr "Aplet preklopa uporabnikov" +#~ msgid "Change account settings and status" +#~ msgstr "Spremeni nastavitve računa in stanje" +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Meni za hitro preklapljanje med uporabniki" +#~ msgid "User Switcher" +#~ msgstr "Preklopnik med uporabniki" +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Tovarna apletov preklopnika med uporabniki" +#~ msgid "Edit Personal _Information" +#~ msgstr "Uredi osebne _podatke" +#~ msgid "_About" +#~ msgstr "_O programu" +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Uredi uporabnike in skupine" +#~ msgid "Unknown" +#~ msgstr "Neznano" #~ msgid "Manager" #~ msgstr "Upravljalnik" - #~ msgid "The user manager object this user is controlled by." #~ msgstr "Predmet upravljalnika uporabnikov, ki nadzoruje tega uporabnika." - #~ msgid "Couldn't set groupid to 0" #~ msgstr "Ni mogoče nastaviti groupid na 0" - #~ msgid "%x" #~ msgstr "%x" - #~ msgid "Quit..." #~ msgstr "Končaj ..." - #~ msgid "Enable debugging code" #~ msgstr "Omogoči razhroščevanje kode" - #~ msgid "Authentication Dialog" #~ msgstr "Pogovorno okno pooblastitve" - #~ msgid "Enable debugging" #~ msgstr "Omogoči razhroščevanje" - #~ msgid "Enable debugging mode for the greeter." #~ msgstr "Omogoči razhroščevalni način prijavnega pozdravnega zaslona" - #~ msgid "id" #~ msgstr "ID" - #~ msgid "%a %b %e" #~ msgstr "%a %b %e" - #~ msgid "%1$s, %2$s" #~ msgstr "%1$s, %2$s" - #~ msgid "worker exited with status %d" #~ msgstr "enota zaključena s stanjem %d" - #~ msgid "Unable establish credentials" #~ msgstr "Ni mogoče vzpostaviti pooblastila" - #~ msgid "Failed to restart computer" #~ msgstr "Neuspešen ponovni zagon računalnika" - #~ msgid "" #~ "You are not allowed to restart the computer because multiple users are " #~ "logged in" #~ msgstr "" #~ "Nimate ustreznega dovoljenja za ponovni zagon računalnika, saj je v " #~ "sistem prijavljenih več uporabnikov." - #~ msgid "Failed to stop computer" #~ msgstr "Neuspešen izklop računalnika" - #~ msgid "" #~ "You are not allowed to stop the computer because multiple users are " #~ "logged in" #~ msgstr "" #~ "Nimate dovoljenja izklopiti računalnika, ker je v sistem prijavljenih več " #~ "uporabnikov." - #~ msgid "page 5" #~ msgstr "stran 5" - #~ msgid "Status" #~ msgstr "Stanje" - #~ msgid "You have the Caps Lock key on." #~ msgstr "Vključena je tipka za pisanje velikih črk." - #~ msgid "User" #~ msgstr "Uporabnik" - #~ msgid "The user this menu item represents." #~ msgstr "Uporabnik, ki ga ta menijski predmet predstavlja." - #~ msgid "Icon Size" #~ msgstr "Velikost ikone" - #~ msgid "The size of the icon to use." #~ msgstr "Velikost ikone, ki jo želite uporabiti." - #~ msgid "Indicator Size" #~ msgstr "Velikost kazalnika" - #~ msgid "Size of check indicator" #~ msgstr "Velikost nadzornega kazalnika" - #~ msgid "Indicator Spacing" #~ msgstr "Razmik kazalnika" - #~ msgid "Space between the username and the indicator" #~ msgstr "Prostor okoli uporabniškega imena in kazalnika" - #~ msgid "_Help" #~ msgstr "_Pomoč" - #~ msgid "Main Options" #~ msgstr "Glavne možnosti" - #~ msgid "Enable features that make your computer easier to use:" #~ msgstr "Omogočite možnosti, ki olajšajo uporabo računalnika:" - #~ msgid "Assistive Technology Preferences" #~ msgstr "Možnosti pomožnih tehnologij" - #~ msgid "_Hear text read aloud (Reader)" #~ msgstr "_Poslušajte prebrana besedila (Bralnik)" - #~ msgid "_Ignore duplicate keypresses (Bounce Keys)" #~ msgstr "_Prezri podvojene pritiske tipk (Skakajoče tipke)" - #~ msgid "_Make items larger (Magnifier)" #~ msgstr "_Povečaj predmete (Povečevalo)" - #~ msgid "_Only accept long held keypresses (Slow Keys)" #~ msgstr "_Sprejmi le dolgo pritisnjene tipke (Počasne tipke)" - #~ msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)" #~ msgstr "_Upoštevanje pritiska le ene tipke sočasno (lepljive tipke)" - #~ msgid "_See more contrast in colors (High Contrast)" #~ msgstr "_Okrepitev kontrasta barv (Visoko kontrastno)" - #~ msgid "_Type without the keyboard (On-screen Keyboard)" #~ msgstr "_Tipkanje brez tipkovnice (zaslonska tipkovnica)" - #~ msgid "_Use a larger font size (Large Print)" #~ msgstr "_Uporabi večjo velikost pisave (velik izpis)" - #~ msgid "gtk-close" #~ msgstr "gtk-close" - #~ msgid "gtk-disconnect" #~ msgstr "gtk-disconnect" - #~ msgid "Disable showing the accessibility button" #~ msgstr "Onemogoči prikaz gumba dostopnosti" - #~ msgid "" #~ "Set to TRUE to disable showing the accessibility button in the login " #~ "window." #~ msgstr "" #~ "Izbrana nastavitev onemogoči prikaz gumba dostopnosti na prijavnem oknu." - #~ msgid "Send the specified protocol command to GDM" #~ msgstr "Pošlji določen ukaz protokola na GDM" - #~ msgid "Xnest mode" #~ msgstr "Način Xnest" - #~ msgid "Do not lock current screen" #~ msgstr "Ne zakleni trenutnega zaslona" - #~ msgid "Authenticate before running --command" #~ msgstr "Overi pred izvedbo --command" - #~ msgid "Start new flexible session; do not show popup" #~ msgstr "Začni novo upogljivo sejo. Ne prikaži pojavnega okna" + diff -Nru gdm-2.32.1/po/sr@latin.po gdm-3.0.0/po/sr@latin.po --- gdm-2.32.1/po/sr@latin.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/sr@latin.po 2011-04-04 14:37:16.000000000 +0000 @@ -6,15 +6,15 @@ # Maintainer: Goran Rakić # Reviewed on 2005-03-06 by: Danilo Šegan # Reviewed on 2005-09-05 by: Slobodan D. Sredojević -# Miloš Popović , 2010. +# Miloš Popović , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-13 15:26+0000\n" -"PO-Revision-Date: 2010-08-18 15:44+0200\n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-19 12:10+0100\n" "Last-Translator: Miloš Popović \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom nije označeni uređaj" @@ -48,33 +48,28 @@ msgid "could not find user \"%s\" on system" msgstr "ne mogu da nađem korisnika „%s“ na sistemu" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Ne mogu da pokrenem sistem prijave" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Ne mogu da prijavim korisnika" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Ne mogu da ovlastim korisnika" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Ne mogu da pribavitim uverenja" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Ne mogu da otvorim sesiju" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -98,24 +93,23 @@ "Trebalo je da se server prikaže za korisnika %s, ali taj korisnik ne postoji" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Ne mogu da postavim groupid na %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() nije uspeo za %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Ne mogu da postavim userid na %d" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: Ne mogu da otvorim datoteku sa dnevnikom ekrana %s!" @@ -159,80 +153,73 @@ msgid "The display device" msgstr "Uređaj za prikaz" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -#| msgid "error initiating conversation with authentication system - %s" -msgid "error initiating conversation with authentication system: %s" -msgstr "greška u komunikaciji sa sistemom za prijavu: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "greška pri uspostavljanju komunikacije sa sistemom za prijavu — %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "opšta greška" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "nestalo memorije" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "programerska greška" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "nepoznata greška" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Korisničko ime:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "greška pri izveštavanju sistema za prijavu o izabranom odzivu korisnika: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "greška pri izveštavanju sistema za prijavu o domaćinu korisnika: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "greška pri izveštavanju sistema za prijavu o konzoli korisnika: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "greška pri izveštavanju sistema za prijavu o nizu za prikaz: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "greška pri izveštavanju sistema za prijavu o uverenju prikaza xauth: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "nema dostupnog korisničkog naloga" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Ne mogu da promenim korisnika" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Korisnik %s ne postoji" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Grupa %s ne postoji" @@ -377,7 +364,6 @@ # bug: why these two messages need to differ? #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Ne mogu da pišem u PIB datoteku %s: verovatno više nema prostora na disku: %s" @@ -430,7 +416,6 @@ msgstr "Neka sva upozorenja budu pogubna" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "Izlaz nakon nekog vremena (radi traženja grešaka)" @@ -454,13 +439,12 @@ msgstr "Radnik sesije za Gnomov upravnik prikaza" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "Omotač AT-SPI registra" # bug(slobo): prijavnica? #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Prozor za prijavu" @@ -472,6 +456,10 @@ msgid "Power management daemon" msgstr "Demon upravljanja potrošnjom" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Provera grafičkog sistema za Gnomovu sesiju" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Demon podešavanja Gnoma" @@ -485,12 +473,10 @@ msgstr "Uvećava delove ekrana" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "Gnomova tastatura na ekranu" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "Prikaži tastaturu na ekranu" @@ -510,7 +496,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit agent za prijave" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Izaberite sistem" @@ -522,35 +508,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: ne mogu da pročitam XDMCP zaglavlje!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Vrednost" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procenat završenog vremena" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Neaktivan tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Tekst za korišćenje u oznaci, ukoliko ga korisnik još nije izabrao" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktivan tekst" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Tekst za korišćenje u oznaci, ukoliko ga korisnik nije izabrao" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Prikaz liste" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Određuje da li je vidljiv spisak korisnika" @@ -582,69 +568,70 @@ msgid "%a %l:%M %p" msgstr "%A, %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Automatski prijavljujem…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Izaberite jezik i prijavite se" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Otkazujem…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Proizvoljno" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Proizvoljna sesija" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Otkaži" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Naziv računara" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Prijavi me" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Otključaj" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Verzija" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -#| msgid "Shutdown Options..." -msgid "Shutdown Options…" -msgstr "Opcije za isključivanje…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Obustavi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Ponovo pokreni" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Isključi" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Proizvoljno" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Nije poznato preostalo vreme" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Proizvoljna sesija" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Jezici" @@ -660,8 +647,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "Ostali…" @@ -671,42 +656,13 @@ msgstr "Izaberite jezik sa kompletnog spiska dostupnih jezika." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "Jezik" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Neodređeno" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Rasporedi tastature" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tastatura:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "Ostali…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Izaberiteraspored tastature sa kompletnog spiska dostupnih rasporeda." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "Tastatura" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Tekst oznake" @@ -741,7 +697,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "Udaljena prijava (povezujem se na %s…)" @@ -755,7 +710,6 @@ msgstr "Mrežna prijava" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "Sesija" @@ -800,67 +754,50 @@ msgstr "Naziv ikone za pozdravni logo" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Nedavno korišćeni rasporedi tastature" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Nedavno korišćeni jezici" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Omogućava da se spisak rasporeda tastature podrazumevano vidi na prozoru za " -"prijavu." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Omogućava da se spisak jezika podrazumevano vidi na prozoru za prijavu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Postavlja da logo za prijavu koristi ikonu teme." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Postavite na „true“ (tačno) kako bi onemogućili prikaz poznatih korisnika u " "pozdravnom prozoru." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Postavite na „true“ (tačno) kako bi onemogućili prikaz dugmića za ponovno " "pokretanje računara u pozdravnom prozoru." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Postavite na „true“ (tačno) da uključite XRandR dodatak za podešavanje." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Postavite na „true“ (tačno) kako bi uključili dodatak za podešavanje pozadine." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Postavite na „true“ (tačno) kako bi uključili dodatak za multimedijalne " "tastere." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Postavite na „true“ (tačno) za prikaz tastature na ekranu." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -868,37 +805,33 @@ "Postavite na „true“ (tačno) kako bi uključili dodatak za pristupačnost " "tastature." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Postavite na „true“ (tačno) kako bi uključili uvećavanje ekrana." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Postavite na „true“ (tačno) za uključivanje čitača ekrana." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Postavite na „true“ (tačno) kako bi uključili dodatak za podešavanje zvuka." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Postavite na „true“ kako bi uključili xsettings dodatak za podešavanje." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Postavlja na „true“ za prikaz teksta u baneru" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" "Postavite na „true“ (tačno) kako bi koristili Kompiz za upravljanje prozorima." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -906,34 +839,31 @@ "Tekst poruke za prikaz u zaglavlju pozdravnog prozora, ukoliko je spisak za " "izbor korisnika prazan, umesto banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Tekst poruke u zaglavlju pozdravnog prozora." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Tačno ako je uključen priključak za podešavanje XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Tačno ako je uključen priključak za podešavanje pozadine." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Tačno ako je uključen priključak za multimedijalne tastere." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Tačno ako je uključen priključak za podešavanje zvuka." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Tačno ako je uključen priključak za podešavanje xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Koristi Kompiz kao upravnika prozora" @@ -961,8 +891,8 @@ msgid "Whether the timer is currently ticking" msgstr "Da li je uključen tajmer" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Prijavite se kao %s" @@ -972,171 +902,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Ostali…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Izaberite drugi nalog" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gost" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Prijavljuje vas na sistem kao privremeni gost" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatska prijava" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Automatski vas prijavljuje na sistem nakon izbora opcija" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Trenutno ste prijavljeni" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Prebacivač korisnika je slobodan softver; možete ga širiti i/ili menjati ga " -"po uslovima GNU Opšte javne licence koju objavljuje Fondacija slobodnog " -"softvera; ili verzije 2 licence, ili (po izboru) neke novije." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Ovaj program je ponuđen u nadi da će biti koristan, ali BEZ IKAKVE " -"GARANCIJE; čak ni bez podrazumevane garancije o UPOTREBLJIVOSTI ZA NEKU " -"SVRHU. Za više detalja pogledajte GNU Opštu javnu licencu." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Trebalo bi da ste uz program dobili primerak GNU Opšte javne licence; ako " -"niste, pišite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Meni za brzu promenu korisnika." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "podaci-o-prevodiocima" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Ne mogu da zaključam ekran: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Ne mogu privremeno da postavim čuvara da polako zatamni ekran: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "Ne mogu da vas odjavim: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Dostupan" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Nevidljiv" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Zauzet" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Otsutan" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Podaci o nalogu" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Postavke sistema" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Zaključaj ekran" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Promena korisnika" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Izađi…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Nepoznato" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Programče za promenu korisnika" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Promeni podešavanja naloga i stanje" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Meni za brzu promenu korisnika" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Promena korisnika" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Pogon programčeta za promenu korisnika" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Uredi lične _podatke" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_O programu" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Uredi korisnike i grupe" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Podržano je samo IZDANJE naredbe" @@ -1147,7 +941,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "Zanemareno — zadržano radi kompatibilnosti" @@ -1173,15 +966,151 @@ msgid "Unable to start new display" msgstr "Ne mogu da otvorim novi ekran" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Snimak ekrana je uhvaćen" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Hvata snimak ekrana kao sliku" +#~| msgid "Shutdown Options..." +#~ msgid "Shutdown Options…" +#~ msgstr "Opcije za isključivanje…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Rasporedi tastature" + +#~ msgid "_Keyboard:" +#~ msgstr "_Tastatura:" + +#~| msgctxt "keyboard" +#~| msgid "Other..." +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Ostali…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Izaberiteraspored tastature sa kompletnog spiska dostupnih rasporeda." + +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "Tastatura" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Nedavno korišćeni rasporedi tastature" + +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Omogućava da se spisak rasporeda tastature podrazumevano vidi na prozoru " +#~ "za prijavu." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Prebacivač korisnika je slobodan softver; možete ga širiti i/ili menjati " +#~ "ga po uslovima GNU Opšte javne licence koju objavljuje Fondacija slobodnog " +#~ "softvera; ili verzije 2 licence, ili (po izboru) neke novije." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Ovaj program je ponuđen u nadi da će biti koristan, ali BEZ IKAKVE " +#~ "GARANCIJE; čak ni bez podrazumevane garancije o UPOTREBLJIVOSTI ZA NEKU " +#~ "SVRHU. Za više detalja pogledajte GNU Opštu javnu licencu." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Trebalo bi da ste uz program dobili primerak GNU Opšte javne licence; ako " +#~ "niste, pišite na: Free Software Foundation, Inc., 51 Franklin Street, " +#~ "Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Meni za brzu promenu korisnika." + +#~ msgid "translator-credits" +#~ msgstr "podaci-o-prevodiocima" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Ne mogu da zaključam ekran: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Ne mogu privremeno da postavim čuvara da polako zatamni ekran: %s" + +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Ne mogu da vas odjavim: %s" + +#~ msgid "Available" +#~ msgstr "Dostupan" + +#~ msgid "Invisible" +#~ msgstr "Nevidljiv" + +#~ msgid "Busy" +#~ msgstr "Zauzet" + +#~ msgid "Away" +#~ msgstr "Otsutan" + +#~ msgid "Account Information" +#~ msgstr "Podaci o nalogu" + +#~ msgid "System Preferences" +#~ msgstr "Postavke sistema" + +#~ msgid "Lock Screen" +#~ msgstr "Zaključaj ekran" + +#~ msgid "Switch User" +#~ msgstr "Promena korisnika" + +#~ msgid "Quit…" +#~ msgstr "Izađi…" + +#~ msgid "Unknown" +#~ msgstr "Nepoznato" + +#~ msgid "User Switch Applet" +#~ msgstr "Programče za promenu korisnika" + +#~ msgid "Change account settings and status" +#~ msgstr "Promeni podešavanja naloga i stanje" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Meni za brzu promenu korisnika" + +#~ msgid "User Switcher" +#~ msgstr "Promena korisnika" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Pogon programčeta za promenu korisnika" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Uredi lične _podatke" + +#~ msgid "_About" +#~ msgstr "_O programu" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Uredi korisnike i grupe" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Ne mogu da postavim groupid na 0" diff -Nru gdm-2.32.1/po/sr.po gdm-3.0.0/po/sr.po --- gdm-2.32.1/po/sr.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/sr.po 2011-04-04 14:37:16.000000000 +0000 @@ -6,15 +6,15 @@ # Maintainer: Горан Ракић # Reviewed on 2005-03-06 by: Данило Шеган # Reviewed on 2005-09-05 by: Слободан Д. Средојевић -# Милош Поповић , 2010. +# Милош Поповић , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-08-13 15:26+0000\n" -"PO-Revision-Date: 2010-08-18 15:44+0200\n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-19 12:10+0100\n" "Last-Translator: Милош Поповић \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom није означени уређај" @@ -48,33 +48,28 @@ msgid "could not find user \"%s\" on system" msgstr "не могу да нађем корисника „%s“ на систему" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Не могу да покренем систем пријаве" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Не могу да пријавим корисника" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Не могу да овластим корисника" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Не могу да прибавитим уверења" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Не могу да отворим сесију" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#| msgid "" -#| "Could not start the X server (your graphical environment) due to some " -#| "internal error. Please contact your system administrator or check your " -#| "syslog to diagnose. In the meantime this display will be disabled. " -#| "Please restart GDM when the problem is corrected." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -98,24 +93,23 @@ "Требало је да се сервер прикаже за корисника %s, али тај корисник не постоји" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Не могу да поставим groupid на %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() није успео за %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Не могу да поставим userid на %d" #: ../daemon/gdm-server.c:435 #, c-format -#| msgid "%s: Could not open logfile for display %s!" msgid "%s: Could not open log file for display %s!" msgstr "%s: Не могу да отворим датотеку са дневником екрана %s!" @@ -159,80 +153,73 @@ msgid "The display device" msgstr "Уређај за приказ" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -#| msgid "error initiating conversation with authentication system - %s" -msgid "error initiating conversation with authentication system: %s" -msgstr "грешка у комуникацији са системом за пријаву: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "грешка при успостављању комуникације са системом за пријаву — %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "општа грешка" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "нестало меморије" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "програмерска грешка" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "непозната грешка" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Корисничко име:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -#| msgid "" -#| "error informing authentication system of preferred username prompt - %s" msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "грешка при извештавању система за пријаву о изабраном одзиву корисника: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -#| msgid "error informing authentication system of user's hostname - %s" msgid "error informing authentication system of user's hostname: %s" msgstr "грешка при извештавању система за пријаву о домаћину корисника: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -#| msgid "error informing authentication system of user's console - %s" msgid "error informing authentication system of user's console: %s" msgstr "грешка при извештавању система за пријаву о конзоли корисника: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -#| msgid "error informing authentication system of display string - %s" msgid "error informing authentication system of display string: %s" msgstr "грешка при извештавању система за пријаву о низу за приказ: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -#| msgid "" -#| "error informing authentication system of display xauth credentials - %s" msgid "error informing authentication system of display xauth credentials: %s" msgstr "грешка при извештавању система за пријаву о уверењу приказа xauth: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "нема доступног корисничког налога" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Не могу да променим корисника" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Корисник %s не постоји" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Група %s не постоји" @@ -377,7 +364,6 @@ # bug: why these two messages need to differ? #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Не могу да пишем у ПИБ датотеку %s: вероватно више нема простора на диску: %s" @@ -430,7 +416,6 @@ msgstr "Нека сва упозорења буду погубна" #: ../daemon/main.c:534 -#| msgid "Exit after a time - for debugging" msgid "Exit after a time (for debugging)" msgstr "Излаз након неког времена (ради тражења грешака)" @@ -454,13 +439,12 @@ msgstr "Радник сесије за Гномов управник приказа" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#| msgid "AT SPI Registry Wrapper" msgid "AT-SPI Registry Wrapper" msgstr "Омотач AT-SPI регистра" # bug(slobo): пријавница? #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Прозор за пријаву" @@ -472,6 +456,10 @@ msgid "Power management daemon" msgstr "Демон управљања потрошњом" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Провера графичког система за Гномову сесију" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Демон подешавања Гнома" @@ -485,12 +473,10 @@ msgstr "Увећава делове екрана" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#| msgid "GNOME Onscreen Keyboard" msgid "GNOME On-Screen Keyboard" msgstr "Гномова тастатура на екрану" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#| msgid "Use an onscreen keyboard" msgid "Use an on-screen keyboard" msgstr "Прикажи тастатуру на екрану" @@ -510,7 +496,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit агент за пријаве" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Изаберите систем" @@ -522,35 +508,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: не могу да прочитам XDMCP заглавље!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Вредност" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "проценат завршеног времена" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Неактиван текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Текст за коришћење у ознаци, уколико га корисник још није изабрао" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Активан текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Текст за коришћење у ознаци, уколико га корисник није изабрао" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Приказ листе" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Одређује да ли је видљив списак корисника" @@ -582,69 +568,70 @@ msgid "%a %l:%M %p" msgstr "%A, %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#| msgid "Automatically logging in..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Аутоматски пријављујем…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Изаберите језик и пријавите се" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#| msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Отказујем…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Произвољно" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Произвољна сесија" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Откажи" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Назив рачунара" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#| msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Пријави ме" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Откључај" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Верзија" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Панел" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -#| msgid "Shutdown Options..." -msgid "Shutdown Options…" -msgstr "Опције за искључивање…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Обустави" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Поново покрени" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Искључи" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Произвољно" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Није познато преостало време" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Произвољна сесија" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Панел" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Језици" @@ -660,8 +647,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#| msgctxt "language" -#| msgid "Other..." msgctxt "language" msgid "Other…" msgstr "Остали…" @@ -671,42 +656,13 @@ msgstr "Изаберите језик са комплетног списка доступних језика." #: ../gui/simple-greeter/gdm-language-option-widget.c:262 -#| msgid "Languages" msgid "Language" msgstr "Језик" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Неодређено" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Распореди тастатуре" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Тастатура:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#| msgctxt "keyboard" -#| msgid "Other..." -msgctxt "keyboard" -msgid "Other…" -msgstr "Остали…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Изаберитераспоред тастатуре са комплетног списка доступних распореда." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -#| msgid "_Keyboard:" -msgid "Keyboard" -msgstr "Тастатура" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Текст ознаке" @@ -741,7 +697,6 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -#| msgid "Remote Login (Connecting to %s...)" msgid "Remote Login (Connecting to %s…)" msgstr "Удаљена пријава (повезујем се на %s…)" @@ -755,7 +710,6 @@ msgstr "Мрежна пријава" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -#| msgid "_Sessions:" msgid "Session" msgstr "Сесија" @@ -800,67 +754,50 @@ msgstr "Назив иконе за поздравни лого" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Недавно коришћени распореди тастатуре" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Недавно коришћени језици" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#| msgid "" -#| "Set to a list of keyboard layouts to be shown by default at the login " -#| "window." -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"Омогућава да се списак распореда тастатуре подразумевано види на прозору за " -"пријаву." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#| msgid "" -#| "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Омогућава да се списак језика подразумевано види на прозору за пријаву." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Поставља да лого за пријаву користи икону теме." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Поставите на „true“ (тачно) како би онемогућили приказ познатих корисника у " "поздравном прозору." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Поставите на „true“ (тачно) како би онемогућили приказ дугмића за поновно " "покретање рачунара у поздравном прозору." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to true to enable the xrandr settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Поставите на „true“ (тачно) да укључите XRandR додатак за подешавање." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Поставите на „true“ (тачно) како би укључили додатак за подешавање позадине." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Поставите на „true“ (тачно) како би укључили додатак за мултимедијалне " "тастере." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Поставите на „true“ (тачно) за приказ тастатуре на екрану." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -868,37 +805,33 @@ "Поставите на „true“ (тачно) како би укључили додатак за приступачност " "тастатуре." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Поставите на „true“ (тачно) како би укључили увећавање екрана." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Поставите на „true“ (тачно) за укључивање читача екрана." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Поставите на „true“ (тачно) како би укључили додатак за подешавање звука." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Поставите на „true“ како би укључили xsettings додатак за подешавање." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Поставља на „true“ за приказ текста у банеру" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#| msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "" "Поставите на „true“ (тачно) како би користили Компиз за управљање прозорима." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "" -#| "Text banner message to show on the login window when the user chooser is " -#| "empty, instead of banner_message_text." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -906,34 +839,31 @@ "Текст поруке за приказ у заглављу поздравног прозора, уколико је списак за " "избор корисника празан, уместо banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#| msgid "Text banner message to show on the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Текст поруке у заглављу поздравног прозора." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#| msgid "True if the xrandr settings manager plugin is enabled." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Тачно ако је укључен прикључак за подешавање XRandR." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Тачно ако је укључен прикључак за подешавање позадине." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Тачно ако је укључен прикључак за мултимедијалне тастере." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Тачно ако је укључен прикључак за подешавање звука." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Тачно ако је укључен прикључак за подешавање xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#| msgid "Use compiz as the window manager" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Користи Компиз као управника прозора" @@ -961,8 +891,8 @@ msgid "Whether the timer is currently ticking" msgstr "Да ли je укључен тајмер" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:196 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:478 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Пријавите се као %s" @@ -972,171 +902,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:256 -#| msgctxt "user" -#| msgid "Other..." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Остали…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:257 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Изаберите други налог" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:271 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Гост" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:272 -#| msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Пријављује вас на систем као привремени гост" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:287 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Аутоматска пријава" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:288 -#| msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Аутоматски вас пријављује на систем након избора опција" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:990 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Тренутно сте пријављени" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Пребацивач корисника је слободан софтвер; можете га ширити и/или мењати га " -"по условима ГНУ Опште јавне лиценце коју објављује Фондација слободног " -"софтвера; или верзије 2 лиценце, или (по избору) неке новије." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"Овај програм је понуђен у нади да ће бити користан, али БЕЗ ИКАКВЕ " -"ГАРАНЦИЈЕ; чак ни без подразумеване гаранције о УПОТРЕБЉИВОСТИ ЗА НЕКУ " -"СВРХУ. За више детаља погледајте ГНУ Општу јавну лиценцу." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"Требало би да сте уз програм добили примерак ГНУ Опште јавне лиценце; ако " -"нисте, пишите на: Free Software Foundation, Inc., 51 Franklin Street, Fifth " -"Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "Мени за брзу промену корисника." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "подаци-о-преводиоцима" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Не могу да закључам екран: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Не могу привремено да поставим чувара да полако затамни екран: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -#| msgid "Can't logout: %s" -msgid "Can't log out: %s" -msgstr "Не могу да вас одјавим: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Доступан" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Невидљив" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Заузет" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Отсутан" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Подаци о налогу" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Поставке система" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Закључај екран" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Промена корисника" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Изађи…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Непознато" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Програмче за промену корисника" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Промени подешавања налога и стање" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Мени за брзу промену корисника" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Промена корисника" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Погон програмчета за промену корисника" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Уреди личне _податке" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_О програму" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Уреди кориснике и групе" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Подржано је само ИЗДАЊЕ наредбе" @@ -1147,7 +941,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#| msgid "Ignored - retained for compatibility" msgid "Ignored — retained for compatibility" msgstr "Занемарено — задржано ради компатибилности" @@ -1173,15 +966,151 @@ msgid "Unable to start new display" msgstr "Не могу да отворим нови екран" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Снимак екрана је ухваћен" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Хвата снимак екрана као слику" +#~| msgid "Shutdown Options..." +#~ msgid "Shutdown Options…" +#~ msgstr "Опције за искључивање…" + +#~ msgid "Keyboard layouts" +#~ msgstr "Распореди тастатуре" + +#~ msgid "_Keyboard:" +#~ msgstr "_Тастатура:" + +#~| msgctxt "keyboard" +#~| msgid "Other..." +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Остали…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Изаберитераспоред тастатуре са комплетног списка доступних распореда." + +#~| msgid "_Keyboard:" +#~ msgid "Keyboard" +#~ msgstr "Тастатура" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Недавно коришћени распореди тастатуре" + +#~| msgid "" +#~| "Set to a list of keyboard layouts to be shown by default at the login " +#~| "window." +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Омогућава да се списак распореда тастатуре подразумевано види на прозору " +#~ "за пријаву." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Пребацивач корисника је слободан софтвер; можете га ширити и/или мењати " +#~ "га по условима ГНУ Опште јавне лиценце коју објављује Фондација слободног " +#~ "софтвера; или верзије 2 лиценце, или (по избору) неке новије." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Овај програм је понуђен у нади да ће бити користан, али БЕЗ ИКАКВЕ " +#~ "ГАРАНЦИЈЕ; чак ни без подразумеване гаранције о УПОТРЕБЉИВОСТИ ЗА НЕКУ " +#~ "СВРХУ. За више детаља погледајте ГНУ Општу јавну лиценцу." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Требало би да сте уз програм добили примерак ГНУ Опште јавне лиценце; ако " +#~ "нисте, пишите на: Free Software Foundation, Inc., 51 Franklin Street, " +#~ "Fifth Floor, Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Мени за брзу промену корисника." + +#~ msgid "translator-credits" +#~ msgstr "подаци-о-преводиоцима" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Не могу да закључам екран: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Не могу привремено да поставим чувара да полако затамни екран: %s" + +#~| msgid "Can't logout: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Не могу да вас одјавим: %s" + +#~ msgid "Available" +#~ msgstr "Доступан" + +#~ msgid "Invisible" +#~ msgstr "Невидљив" + +#~ msgid "Busy" +#~ msgstr "Заузет" + +#~ msgid "Away" +#~ msgstr "Отсутан" + +#~ msgid "Account Information" +#~ msgstr "Подаци о налогу" + +#~ msgid "System Preferences" +#~ msgstr "Поставке система" + +#~ msgid "Lock Screen" +#~ msgstr "Закључај екран" + +#~ msgid "Switch User" +#~ msgstr "Промена корисника" + +#~ msgid "Quit…" +#~ msgstr "Изађи…" + +#~ msgid "Unknown" +#~ msgstr "Непознато" + +#~ msgid "User Switch Applet" +#~ msgstr "Програмче за промену корисника" + +#~ msgid "Change account settings and status" +#~ msgstr "Промени подешавања налога и стање" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Мени за брзу промену корисника" + +#~ msgid "User Switcher" +#~ msgstr "Промена корисника" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Погон програмчета за промену корисника" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Уреди личне _податке" + +#~ msgid "_About" +#~ msgstr "_О програму" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Уреди кориснике и групе" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "Не могу да поставим groupid на 0" diff -Nru gdm-2.32.1/po/sv.po gdm-3.0.0/po/sv.po --- gdm-2.32.1/po/sv.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/sv.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,24 +1,25 @@ # Swedish messages for gdm. -# Copyright (C) 1999-2010 Free Software Foundation, Inc. +# Copyright (C) 1999-2011 Free Software Foundation, Inc. # Anders Carlsson , 1999. # Christian Rose , 2001, 2002, 2003, 2004, 2005. # Martin Norbäck , 2001. -# Daniel Nylander , 2006, 2007, 2008, 2009, 2010. +# Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-10 15:36+0200\n" -"PO-Revision-Date: 2010-08-10 15:41+0100\n" +"POT-Creation-Date: 2011-03-17 21:36+0100\n" +"PO-Revision-Date: 2011-03-17 21:37+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" +"Language: sv\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" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom är inte en teckenenhet" @@ -50,33 +51,33 @@ msgstr "kunde inte hitta användaren \"%s\" i systemet" #: ../daemon/gdm-factory-slave.c:203 -#: ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Kunde inte initiera inloggningssystemet" #: ../daemon/gdm-factory-slave.c:235 -#: ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Kunde inte autentisera användaren" #: ../daemon/gdm-factory-slave.c:257 -#: ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Kunde inte auktorisera användaren" #: ../daemon/gdm-factory-slave.c:279 -#: ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Kan inte etablera behörighet" #: ../daemon/gdm-factory-slave.c:302 -#: ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Kunde inte öppna sessionen" -#: ../daemon/gdm-factory-slave.c:689 +#: ../daemon/gdm-factory-slave.c:677 #: ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-simple-slave.c:1366 msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." msgstr "Kunde inte starta X-servern (din grafiska miljö) på grund av ett internt fel. Kontakta din systemadministratör eller kontrollera din systemlogg för att analysera felet. Under tiden kommer denna display att vara inaktiverad. Starta om GDM när problemet är åtgärdat." @@ -92,20 +93,20 @@ #: ../daemon/gdm-server.c:376 #: ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 -#: ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 +#: ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Kunde inte ställa in grupp-id till %d" #: ../daemon/gdm-server.c:382 -#: ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () misslyckades för %s" #: ../daemon/gdm-server.c:388 -#: ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Kunde inte ställa in användar-id till %d" @@ -156,72 +157,72 @@ msgid "The display device" msgstr "Visningsenheten" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "fel vid initiering av konversation med autentiseringssystemet: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "fel vid initiering av konversation med autentiseringssystemet - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "allmänt fel" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "slut på minne" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "programmeringsfel i programmet" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "okänt fel" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Användarnamn:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "fel när autentiseringssystemet informerades om föredragen prompt för användarnamn: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "fel när autentiseringssystemet informerades om användarens värdnamn: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "fel när autentiseringssystemet informerades om användarens konsoll: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "fel när autentiseringssystemet informerades om display-sträng: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "fel när autentiseringssystemet informerades om displayens xauth-behörighet: %s" -#: ../daemon/gdm-session-worker.c:1675 -#: ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 +#: ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "inget användarkonto tillgängligt" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kunde inte byta till användare" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Användaren %s finns inte" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Gruppen %s finns inte" @@ -444,7 +445,7 @@ msgstr "Omslag för AT SPI-register" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Inloggningsfönster" @@ -456,6 +457,10 @@ msgid "Power management daemon" msgstr "Strömhanteringsdemon" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Accelerationskontroll för GNOME-session" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME-inställningsdemon" @@ -492,7 +497,7 @@ msgid "PolicyKit Authentication Agent" msgstr "Autentiseringsagenten PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Välj system" @@ -504,35 +509,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Kunde inte läsa XDMCP-rubrik!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Värde" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "procentdel av tid" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Inaktiv text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Texten att använda i etiketten om användaren inte har valt ett objekt än" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Aktiv text" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Texten att använda i etiketten om användaren har valt ett objekt" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Lista synliga" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Huruvida väljarlistan är synlig" @@ -564,65 +569,69 @@ msgid "%a %l:%M %p" msgstr "%a %H.%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "Loggar in automatiskt..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Välj språk och klicka på Logga in" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "Avbryter..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Anpassad" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Anpassad session" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Avbryt" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Datornamn" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "Logga in" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Lås upp" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Version" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "Panel" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "Alternativ för avstängning..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Vänteläge" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Starta om" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Stäng av" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "Anpassad" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Okänd tid återstår" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "Anpassad session" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Språk" @@ -650,35 +659,10 @@ msgid "Language" msgstr "Språk" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Inte angivet" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Tangentbordslayouter" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "_Tangentbord:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "Annan..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Välj en tangentbordslayout från den fullständiga listan över tillgängliga layouter." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "Tangentbord" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etikettext" @@ -770,106 +754,98 @@ msgstr "Ikonnamn att använda för hälsarlogotypen" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Tidigare valda tangentbordslayouter" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Tidigare valda språk" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "Ställ in till en lista över tangentbordslayouter som ska visas som standard i inloggningsfönstret." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "Ställ in till en lista över språk som ska visas som standard i inloggningsfönstret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Ställ in temaikonnamnet att använda för hälsarlogotypen." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "Ställ in till true för att inaktivera visning av kända användare i inloggningsfönstret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "Ställ in till true för att inaktivera visning av omstartsknapparna i inloggningsfönstret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera XRandR-inställningar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera bakgrundsinställningar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera inställningar för mediatangenter." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Ställ in till true för att aktivera skärmtangentbordet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera inställningar för hjälpmedelstangentbord." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Ställ in till true för att aktivera skärmförstoraren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Ställ in till true för att aktivera skärmläsaren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera ljudinställningar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Ställ in till true för att aktivera insticksmodulen för att hantera xsettings-inställningar." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Ställ in till sant för att visa banderollmeddelandet." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "Ställ in till true för att använda Compiz som fönsterhanteraren." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text." msgstr "Banderollmeddelande att visa i inloggningsfönstret när användarväljaren är tom, istället för banner_message_text." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "Banderollmeddelande att visa i inloggningsfönstret." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "Sant om insticksmodulen för att hantera XRandR-inställningar är aktiverad." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Sant om insticksmodulen för att hantera bakgrundsinställningar är aktiverad." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "Sant om insticksmodulen för att hantera inställningar för media-keys är aktiverad." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Sant om insticksmodulen för att hantera ljudinställningar är aktiverad." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Sant om insticksmodulen för att hantera inställningar för xsettings är aktiverad." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "Använd Compiz som fönsterhanteraren" @@ -897,8 +873,8 @@ msgid "Whether the timer is currently ticking" msgstr "Huruvida tidtagaren tickar för närvarande" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "Logga in som %s" @@ -908,153 +884,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "Annat..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Välj ett annat konto" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Gäst" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "Logga in som en temporär gäst" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Automatisk inloggning" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "Logga automatiskt in i systemet efter alternativ valts" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Redan inloggad" -#: ../gui/user-switch-applet/applet.c:162 -msgid "The User Switch Applet 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." -msgstr "Panelprogrammet Användarväxlare är fri programvara; du kan distribuera det och/eller ändra det under villkoren GNU General Public License som publicerats av Free Software Foundation; antingen version 2 av licensen, eller (enligt dig) någon senare version." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "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." -msgstr "Detta program distribueras i hopp om att det ska vara användbart, men UTAN NÅGON GARANTI; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT SPECIFIKT ÄNDAMÅL. Se GNU General Public License för mer information." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "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 " -msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "En meny för att snabbt växla mellan användare." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Daniel Nylander\n" -"Christian Rose\n" -"Martin Norbäck\n" -"Anders Carlsson\n" -"\n" -"Skicka synpunkter på översättningen till\n" -"" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Kan inte låsa skärm: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Kan inte temporärt ställa in skärmsläckare till att dämpa skärmen: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "Kan inte logga ut: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "Tillgänglig" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "Osynlig" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "Upptagen" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "Frånvarande" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "Kontoinformation" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "Systeminställningar" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "Lås skärmen" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "Växla användare" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "Avsluta…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "Okänt" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "Panelprogram för användarväxling" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "Ändra kontoinställningar och status" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "En meny för att snabbt växla mellan användare" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Användarväxlare" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Panelprogramsfabrik för Användarväxlare" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Redigera personlig _information" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Om" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "R_edigera användare och grupper" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Endast VERSION-kommandot stöds" @@ -1093,15 +951,120 @@ msgid "Unable to start new display" msgstr "Kunde inte starta ny display" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Skärmbild tagen" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Ta en bild av skärmen" +#~ msgid "Keyboard layouts" +#~ msgstr "Tangentbordslayouter" +#~ msgid "_Keyboard:" +#~ msgstr "_Tangentbord:" +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "Annan..." +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Välj en tangentbordslayout från den fullständiga listan över tillgängliga " +#~ "layouter." +#~ msgid "Keyboard" +#~ msgstr "Tangentbord" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Tidigare valda tangentbordslayouter" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "Ställ in till en lista över tangentbordslayouter som ska visas som " +#~ "standard i inloggningsfönstret." +#~ msgid "Shutdown Options…" +#~ msgstr "Alternativ för avstängning..." +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Panelprogrammet Användarväxlare är fri programvara; du kan distribuera " +#~ "det och/eller ändra det under villkoren GNU General Public License som " +#~ "publicerats av Free Software Foundation; antingen version 2 av licensen, " +#~ "eller (enligt dig) någon senare version." +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Detta program distribueras i hopp om att det ska vara användbart, men " +#~ "UTAN NÅGON GARANTI; även utan underförstådd garanti om SÄLJBARHET eller " +#~ "LÄMPLIGHET FÖR ETT SPECIFIKT ÄNDAMÅL. Se GNU General Public License för " +#~ "mer information." +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Du bör ha fått en kopia av GNU General Public License tillsammans med " +#~ "detta program. Om inte, skriv till Free Software Foundation, Inc., 51 " +#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " +#~ msgid "A menu to quickly switch between users." +#~ msgstr "En meny för att snabbt växla mellan användare." +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Daniel Nylander \n" +#~ "Christian Rose\n" +#~ "Martin Norbäck\n" +#~ "Anders Carlsson\n" +#~ "\n" +#~ "Skicka synpunkter på översättningen till\n" +#~ "" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Kan inte låsa skärm: %s" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "Kan inte temporärt ställa in skärmsläckare till att dämpa skärmen: %s" +#~ msgid "Can't log out: %s" +#~ msgstr "Kan inte logga ut: %s" +#~ msgid "Available" +#~ msgstr "Tillgänglig" +#~ msgid "Invisible" +#~ msgstr "Osynlig" +#~ msgid "Busy" +#~ msgstr "Upptagen" +#~ msgid "Away" +#~ msgstr "Frånvarande" +#~ msgid "Account Information" +#~ msgstr "Kontoinformation" +#~ msgid "System Preferences" +#~ msgstr "Systeminställningar" +#~ msgid "Lock Screen" +#~ msgstr "Lås skärmen" +#~ msgid "Switch User" +#~ msgstr "Växla användare" +#~ msgid "Quit…" +#~ msgstr "Avsluta…" +#~ msgid "User Switch Applet" +#~ msgstr "Panelprogram för användarväxling" +#~ msgid "Change account settings and status" +#~ msgstr "Ändra kontoinställningar och status" +#~ msgid "A menu to quickly switch between users" +#~ msgstr "En meny för att snabbt växla mellan användare" +#~ msgid "User Switcher" +#~ msgstr "Användarväxlare" +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Panelprogramsfabrik för Användarväxlare" +#~ msgid "Edit Personal _Information" +#~ msgstr "Redigera personlig _information" +#~ msgid "_About" +#~ msgstr "_Om" +#~ msgid "_Edit Users and Groups" +#~ msgstr "R_edigera användare och grupper" +#~ msgid "Unknown" +#~ msgstr "Okänt" #~ msgid "Couldn't set groupid to 0" #~ msgstr "Kunde inte ställa in grupp-id till 0" #~ msgid "%x" diff -Nru gdm-2.32.1/po/ta.po gdm-3.0.0/po/ta.po --- gdm-2.32.1/po/ta.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/ta.po 2011-04-04 14:37:16.000000000 +0000 @@ -11,15 +11,15 @@ # Dr.T.Vasudevan , 2007, 2009, 2010. # I. Felix , 2008, 2009. # Priyadharsini , 2008. -# Dr,T,Vasudevan , 2009, 2010. +# Dr,T,Vasudevan , 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: gdm.master.ta\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 05:05+0530\n" -"PO-Revision-Date: 2010-08-02 16:51+0530\n" -"Last-Translator: Dr.T.Vasudevan \n" -"Language-Team: Tamil <>\n" +"POT-Creation-Date: 2011-04-02 21:00+0530\n" +"PO-Revision-Date: 2011-04-02 21:04+0530\n" +"Last-Translator: \n" +"Language-Team: American English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,7 +34,7 @@ "\n" "\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom ஒரு எழுத்து சாதனம் அல்ல" @@ -59,28 +59,28 @@ msgid "could not find user \"%s\" on system" msgstr "கணினியில் பயனர் \"%s\" ஐ காண முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "புகுபதிவு முறைமையை துவக்க முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "பயனரை அங்கீகரிக்க முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "பயனரை அங்கீகரிக்க முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "மதிப்புகளை கொடுக்க முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "அமர்வை துவக்க முடியவில்லை" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -103,17 +103,17 @@ msgstr "இந்த பயனர் %s சேவையகம் உருவாக்கப்பட்டது ஆனால் அந்த பயனர் இப்போது இல்லை" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "%d க்கு குழுக்குறியீடு அமைக்க முடியவில்லை" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() %sக்கு செயலிழக்கப்பட்டது" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "%dக்கு பயனர் அடையாளத்தை அமைக்க முடியவில்லை" @@ -163,71 +163,71 @@ msgid "The display device" msgstr "காட்சி சாதனம்" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "கணினியை அங்கீகரித்தலுடன் உரையாடலை துவக்குவதில் பிழை: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "அங்கீகரித்தல் அமைப்புடன் உரையாடலை துவக்குவதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "பொது தோல்வி" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "நினைவகம் இல்லை" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "பயன்பாடு நிரலாளர் பிழை" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "தெரியாத பிழை " -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "பயனர் பெயர்:" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "விருப்பட்ட பயனர்பெயரை காட்டும் போது அங்கீரிக்கும் கணினியை தெரிவிப்பதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "பயனர் புரவலன் பெயரை அங்கீரிக்கும் கணினியை தெரிவிப்பதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "பயனர் பணியகத்தை அங்கீரிக்கும் கணினியை தெரிவிப்பதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "காட்சி சரத்தை அங்கீரிக்கும் கணினியை தெரிவிப்பதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "xauth காட்சியை அங்கீரிக்கும் கணினியை தெரிவிப்பதில் பிழை: %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "பயனர் கணக்கு இல்லை" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "பயனருக்கு மாற்ற இயவில்லை" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s பயனர் வெளியேறவில்லை" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s குழு வெளியேறவில்லை" @@ -450,7 +450,7 @@ msgstr "AT-SPI தொகுபதிவக உறை" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "புகுபதிவு சாளரம்" @@ -462,6 +462,10 @@ msgid "Power management daemon" msgstr "மின் மேலாண்மை டீமான்" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "க்னோம் அமர்வு விரைவு படுத்தி சோதிப்பி" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME அமைவுகள் டீமான்" @@ -498,7 +502,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit அங்கீகார முகவர்" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "கணினியைத் தேர்ந்தெடு" @@ -510,35 +514,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP தலைப்பை வாசிக்க முடியவில்லை!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "மதிப்பு" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "முடிக்கப்பட்ட நேரத்தின் சதவீதம்" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "செயலிழந்த உரை" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "இன்னும் பயனர் எந்த உருப்படியையும் எடுக்காதவரை லேபிளில் பயன்படுத்த வேண்டிய உரை" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "செயலிலுள்ள உரை" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "இன்னும் பயனர் எந்த உருப்படியையும் எடுத்த வரை லேபிளில் பயன்படுத்த வேண்டிய உரை" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "தெரிவதை பட்டியல் இடு" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "தேர்வாளர் பட்டியல் தெரிய வேண்டுமா" @@ -570,65 +574,69 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "தானாகவே உள்நுழைதல் ..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "மொழியைத் தேர்ந்தெடுக்கவும் மற்றும் உள்நுழைய கிளிக் செய்யவும்" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "ரத்துசெய்யப்படுகிறது..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "தனிப்பயன்" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "தனிப்பயன் அமர்வு" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "ரத்து செய்" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "கணினியின் பெயர்" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "புகுபதிவு" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "பூட்டை திற" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "பதிப்பு" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "பலகம்" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "முழு நிறுத்த தேர்வுகள்..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "இடைநிறுத்தம்" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "மறுதுவக்கம்" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "பணி நிறுத்தம்" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "தனிப்பயன்" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "தெரியாத மீதமிருக்கிற நேரம்" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "தனிப்பயன் அமர்வு" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "பலகம்" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "மொழிகள்" @@ -656,36 +664,10 @@ msgid "Language" msgstr "மொழிகள்" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "குறிப்பிடப்படாத" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "விசைப்பலகை அமைப்புகள்" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "விசைப்பலகை (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "மற்ற..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "" -"இருக்கும் அமைப்புகளில் முழு பட்டியலிலிருந்து ஒரு விசைப்பலகை அமைப்பை தேர்ந்தெடுக்கவும்" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "விசைப்பலகை" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "லேபில் உரை" @@ -777,83 +759,74 @@ msgstr "வாழ்த்துரை சின்னத்தில் பயன்படுத்த வேண்டிய சின்னத்தின் பெயர்" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "சமீபத்தில் தேர்ந்தெடுக்கப்பட்ட விசைப்பலகை அமைப்புகள்" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "சமீபத்தில் தேர்ந்தெடுக்கப்பட்ட மொழிகள்" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "" -"விசைப்பலகை அமைப்புகளின் பட்டியலை அமைக்க புகுபதிவு சாளரத்தில் முன்னிருப்பாக அமைக்கவும்." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "மொழிகளின் பட்டியலை அமைக்க புகுபதிவு சாளரத்தில் முன்னிருப்பாக அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "தீம் செய்யப்பட்ட சின்னத்தின் பெயருக்கு அமைத்து வாழ்த்துரை சின்னத்தை பயன்படுத்த." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "புகுபதிவு சாளரத்தில் தெரிந்த பயனரை காட்டுவதை செயல்நீக்க உண்மையென என அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "புகுபதிவு சாளரத்தில் மறுதுவக்க பொத்தான்களை காட்டுவதை செயல்நீக்க உண்மையென என அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "XRandR அமைவுகள் மேலாளர் சொருகியை செயல்படுத்த உண்மையென அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "பின்னணி அமைவுகள் மேலாளர் சொருகியை செயல்படுத்த உண்மையென என அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "ஊடக விசைகள் அமைவுகள் மேலாளர் சொருகியை செயல்படுத்த உண்மையென என அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "திரையில் விசைப்பலகையை செயல்படுத்த உண்மை என்று அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "" "அணுகல் விசைப்பலகை அமைவுகளில் மேலாண்மை சொருகியை இயலுமை செய்ய உண்மையென என அமைக்கவும்." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "திரை பெரிதாக்கியை செயல்படுத்த உண்மையென அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr " திரை வாசிப்பியை செயல்படுத்த உண்மையென அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr " ஒலி அமைவுகள் மேலாளர் சொருகியை செயல்படுத்த உண்மையென அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr " xsettings அமைவுகள் மேலாளர் சொருகியை செயல்படுத்த உண்மையென அமை" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "உண்மையென அமைத்து பேனர் செய்தி உரையை காட்டு." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "உண்மையென அமைத்து compizஐ சாளர மேலாளராக பயன்படுத்து." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -861,31 +834,31 @@ "தேர்வாளர் காலியாக இருக்கும்போது உள்நுழை சாளரத்தில் banner_message_text க்கு பதில் " "காட்ட வேண்டிய உரை பேனர் செய்தி." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "உள்நுழை சாளரத்தின் உரை பேனர் செய்தி காட்டப்படுகிறது." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr " XRandR அமைவுகள் மேலாளர் கூடுதல் இணைப்பு செயல்படுத்தப்பட்டால் உண்மை." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "பின்னணி அமைவுகள் மேலாளர் கூடுதல் இணைப்பு செயல்படுத்தப்பட்டால் உண்மை." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "மீடியா-விசைகள் அமைவுகள் மேலாளர் கூடுதல் இணைப்பு செயல்படுத்தப்பட்டால் உண்மை." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "ஒலிஅமைவுகள் மேலாளர் கூடுதல் இணைப்பு செயல்படுத்தப்பட்டால் உண்மை." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "xsettings அமைவுகள் மேலாளர் கூடுதல் இணைப்பு செயல்படுத்தப்பட்டால் உண்மை." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "compizஐ சாளர மேலாளாராக பயன்படுத்து" @@ -913,8 +886,8 @@ msgid "Whether the timer is currently ticking" msgstr "நேரம் காட்டி தற்போது டிக் செய்கிறதா" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s ஆக உள்நுழை" @@ -924,168 +897,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "மற்ற..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "வேறுப்பட்ட கணக்கினை தேர்ந்தெடுக்கவும்" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "விருந்தினர்" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "தற்காலிக விருந்தினராக புகுபதிவு செய்" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "தானாகவே உள்நுழைதல்" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "விருப்பங்களை தேர்ந்தெடுத்த பின் தானாகவே கணினிக்குள் உள்நுழையவும்" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:972 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "தற்போது உள்நுழைந்தது" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"The User Switch Applet 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." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"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." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"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 " - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "பயனர்களுக்கு இடையில் ஒரு மெனு விரைவாக மாற்றப்பட்டது." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "I. Felix 2008" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "திரையினை மூட இயலவில்லை: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "தற்காலிகமாக ஸ்கிரீன்சேவரை காலித் திரையாக அமைக்க முடியவில்லை: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "வெளியேற இயலவில்லை: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "கிடைக்கக்கூடிய" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "பார்க்கமுடியாத" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "பரபரப்பாக" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "அப்பால்" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "கணக்கு தகவல்" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "கணினி முன்னுரிமைகள்" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "திரையை மூடு" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "பயனர் மாற்றி" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "வெளிச்செல்…" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "தெரியாத" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "பயனர் மாற்றி ஆப்லெட்" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "கணக்கின் அமைப்புகளையும் மற்றும் நிலைகளையும் மாற்றவும்" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "பயனர்களுக்கு இடையில் ஒரு மெனு விரைவாக மாற்றப்பட்டது." - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "பயனர் மாற்றி" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "பயனர் மாற்றி ஆப்லெட் பாக்டெரி" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "தனிப்பட்ட தகவலை திருத்தவும் (_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "பற்றி (_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "பயனர்கள் மற்றும் குழுக்களை திருத்து (_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "வெர்ஷன் கட்டளைக்கு மட்டுமே ஆதரவுள்ளது" @@ -1121,15 +961,145 @@ msgid "Unable to start new display" msgstr "புதிய காட்சியை துவக்க முடியவில்லை" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "திரைப்பிடிப்பு எடுக்கப்பட்டது" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "திரையை ஒரு படமெடுக்கவும்" +#~ msgid "Shutdown Options…" +#~ msgstr "முழு நிறுத்த தேர்வுகள்..." + +#~ msgid "Keyboard layouts" +#~ msgstr "விசைப்பலகை அமைப்புகள்" + +#~ msgid "_Keyboard:" +#~ msgstr "விசைப்பலகை (_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "மற்ற..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "இருக்கும் அமைப்புகளில் முழு பட்டியலிலிருந்து ஒரு விசைப்பலகை அமைப்பை தேர்ந்தெடுக்கவும்" + +#~ msgid "Keyboard" +#~ msgstr "விசைப்பலகை" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "சமீபத்தில் தேர்ந்தெடுக்கப்பட்ட விசைப்பலகை அமைப்புகள்" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "விசைப்பலகை அமைப்புகளின் பட்டியலை அமைக்க புகுபதிவு சாளரத்தில் முன்னிருப்பாக " +#~ "அமைக்கவும்." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "The User Switch Applet 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." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "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." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "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 " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "பயனர்களுக்கு இடையில் ஒரு மெனு விரைவாக மாற்றப்பட்டது." + +#~ msgid "translator-credits" +#~ msgstr "I. Felix 2008" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "திரையினை மூட இயலவில்லை: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "தற்காலிகமாக ஸ்கிரீன்சேவரை காலித் திரையாக அமைக்க முடியவில்லை: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "வெளியேற இயலவில்லை: %s" + +#~ msgid "Available" +#~ msgstr "கிடைக்கக்கூடிய" + +#~ msgid "Invisible" +#~ msgstr "பார்க்கமுடியாத" + +#~ msgid "Busy" +#~ msgstr "பரபரப்பாக" + +#~ msgid "Away" +#~ msgstr "அப்பால்" + +#~ msgid "Account Information" +#~ msgstr "கணக்கு தகவல்" + +#~ msgid "System Preferences" +#~ msgstr "கணினி முன்னுரிமைகள்" + +#~ msgid "Lock Screen" +#~ msgstr "திரையை மூடு" + +#~ msgid "Switch User" +#~ msgstr "பயனர் மாற்றி" + +#~ msgid "Quit…" +#~ msgstr "வெளிச்செல்…" + +#~ msgid "Unknown" +#~ msgstr "தெரியாத" + +#~ msgid "User Switch Applet" +#~ msgstr "பயனர் மாற்றி ஆப்லெட்" + +#~ msgid "Change account settings and status" +#~ msgstr "கணக்கின் அமைப்புகளையும் மற்றும் நிலைகளையும் மாற்றவும்" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "பயனர்களுக்கு இடையில் ஒரு மெனு விரைவாக மாற்றப்பட்டது." + +#~ msgid "User Switcher" +#~ msgstr "பயனர் மாற்றி" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "பயனர் மாற்றி ஆப்லெட் பாக்டெரி" + +#~ msgid "Edit Personal _Information" +#~ msgstr "தனிப்பட்ட தகவலை திருத்தவும் (_I)" + +#~ msgid "_About" +#~ msgstr "பற்றி (_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "பயனர்கள் மற்றும் குழுக்களை திருத்து (_E)" + #~ msgid "Couldn't set groupid to 0" #~ msgstr "0 விற்கு குழு அடையாளம் அமைக்க முடியவில்லை" diff -Nru gdm-2.32.1/po/te.po gdm-3.0.0/po/te.po --- gdm-2.32.1/po/te.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/te.po 2011-04-04 14:37:16.000000000 +0000 @@ -4,14 +4,15 @@ # This file is distributed under the same license as the gdm package. # # Krishna Babu K , 2008, 2009, 2010. +# Krishnababu Krothapalli , 2011. msgid "" msgstr "" "Project-Id-Version: te\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-29 09:37+0000\n" -"PO-Revision-Date: 2010-07-29 18:06+0530\n" -"Last-Translator: Krishna Babu K \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-04-01 16:31+0530\n" +"Last-Translator: Krishnababu Krothapalli \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,9 +24,9 @@ "\n" "\n" "\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.1\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom అక్షర పరికరం కాదు" @@ -48,31 +49,30 @@ #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "సిస్టమ్ లో వినియోగదారి \"%s\" కనిపించుటలేదు" +msgstr "సిస్టమ్ లో వాడుకరి \"%s\" కనిపించుటలేదు" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "లాగిన్ సిస్టమ్ ను సిద్దపరచ లేదు" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" -msgstr "వినియోగదారి ని దృవీకరించలేము" +msgstr "వాడుకరి ని దృవీకరించలేము" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" -msgstr "వినియోగదారికి అధికారీగా చేయలేము" +msgstr "వాడుకరికి అధికారీగా చేయలేము" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "సాధకములను ఎర్పరచలేము" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "సెషన్‌ను తెరువలేదు" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 -#, fuzzy +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -91,26 +91,26 @@ #: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "%s వినియోగదారి చేత సేవిక ఉంచబడింది అయితే ఆ వినియోగదారి లేదు." +msgstr "%s వాడుకరి చేత సేవిక ఉంచబడింది అయితే ఆ వాడుకరి లేదు." #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "%d కు సమూహం id ని అమర్చలేము" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () %s కొరకు విఫలమైంది" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" -msgstr "%d కు వినియోగదారి id ని అమర్చలేము" +msgstr "%d కు వాడుకరి id ని అమర్చలేము" #: ../daemon/gdm-server.c:435 -#, fuzzy, c-format +#, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: లాగ్‌ఫైలును %s ప్రదర్శన కొరకు తెరువలేదు!" @@ -132,19 +132,19 @@ #: ../daemon/gdm-session-auditor.c:90 msgid "Username" -msgstr "వినియోగదారునినామం" +msgstr "వినియోగదారునిపేరు" #: ../daemon/gdm-session-auditor.c:91 msgid "The username" -msgstr "వినియోగదారుని నామము" +msgstr "వినియోగదారుని పేరు" #: ../daemon/gdm-session-auditor.c:95 msgid "Hostname" -msgstr "అతిధేయనామము" +msgstr "అతిధేయపేరు" #: ../daemon/gdm-session-auditor.c:96 msgid "The hostname" -msgstr "ఆ అతిధేయనామము" +msgstr "ఆ అతిధేయపేరు" #: ../daemon/gdm-session-auditor.c:101 msgid "Display Device" @@ -154,71 +154,71 @@ msgid "The display device" msgstr "ప్రదర్శన పరికరం" -#: ../daemon/gdm-session-worker.c:1309 -#, fuzzy, c-format -msgid "error initiating conversation with authentication system: %s" +#: ../daemon/gdm-session-worker.c:1066 +#, c-format +msgid "error initiating conversation with authentication system - %s" msgstr "దృవీకరణ సిస్టమ్ తో సంభాషణ ప్రారంభించుటలో దోషం - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "సాధారణ వైఫల్యం" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "మెమొరీ మించిపోయింది" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "అప్లికేషన్ ప్రోగ్రామర్ దోషం" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "తెలియని దోషం" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" -msgstr "వినియోగదారునినామము:" +msgstr "వినియోగదారునిపేరు:" -#: ../daemon/gdm-session-worker.c:1326 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1083 +#, c-format msgid "error informing authentication system of preferred username prompt: %s" -msgstr "అభీష్ట వినియోగదారుని దృవీకరణ సిస్టమ్ తెలియజేయుటలో దోషం - %s" +msgstr "అభీష్ట వాడుకరిపేరు యొక్క దృవీకరణ సిస్టమ్ తెలియజేయుటలో దోషం - %s" -#: ../daemon/gdm-session-worker.c:1340 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1097 +#, c-format msgid "error informing authentication system of user's hostname: %s" -msgstr "వినియోగదారుని అతిధేయ నామము యొక్క దృవీకరణ సిస్టమ్ ను తెలియజేయుటలో దోషం - %s" +msgstr "వాడుకరి అతిధేయ పేరు యొక్క దృవీకరణ సిస్టమ్ ను తెలియజేయుటలో దోషం - %s" -#: ../daemon/gdm-session-worker.c:1355 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1112 +#, c-format msgid "error informing authentication system of user's console: %s" -msgstr "వినియోగదారుని కన్సోల్ యొక్క సిస్టమ్ దృవీకరణను తెలియజేయుటలో దోషం - %s" +msgstr "వాడుకరి కన్సోల్ యొక్క సిస్టమ్ దృవీకరణను తెలియజేయుటలో దోషం - %s" -#: ../daemon/gdm-session-worker.c:1368 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1125 +#, c-format msgid "error informing authentication system of display string: %s" msgstr "ప్రదర్శన స్ట్రింగ్ యొక్క దృవీకరణ సిస్టమ్ తెలియజేయుటలో దోషము - %s" -#: ../daemon/gdm-session-worker.c:1383 -#, fuzzy, c-format +#: ../daemon/gdm-session-worker.c:1140 +#, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "ప్రదర్శన xauth ఆనవాళ్ళ యొక్క దృవీకరణ సిస్టమ్ తెలియజేయుటలో దోషము - %s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ఏ వినియోగదారుని ఖాతా అందుబాటులోలేదు" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" -msgstr "వినియోగదారికి మారలేదు" +msgstr "వాడుకరికి మారలేదు" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" -msgstr "వినియోగదారి %s లేదు" +msgstr "వాడుకరి %s లేదు" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "సమూహం %s లేదు" @@ -358,12 +358,12 @@ #: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" -msgstr "సేవిక యొక్క అతిధేయ నామము పొందలేకపోయింది: %s!" +msgstr "సేవిక యొక్క అతిధేయ పేరు పొందలేకపోయింది: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 -#, fuzzy, c-format +#, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" -msgstr "PID దస్త్రం %s ను వ్రాయలేదు: సాద్యమైనంతవరకు డిస్కు ఖాళీ అయిపోయింది: %s" +msgstr "PID ఫైల్ %s ను వ్రాయలేదు: సాద్యమైనంతవరకు డిస్కు ఖాళీ అయిపోయింది: %s" #: ../daemon/main.c:271 #, c-format @@ -383,7 +383,7 @@ #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "Authdir %s వినియోగదారి %d,సమూహం %d చేత కలిగిలేదు. తిరస్కరించబడింది." +msgstr "Authdir %s వాడుకరి %d,సమూహం %d చేత కలిగిలేదు. తిరస్కరించబడింది." #: ../daemon/main.c:372 #, c-format @@ -393,11 +393,11 @@ #: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "GDM వినియోగదారి '%s' ని కనుగొనలేకపోయింది. తిరస్కరించబడింది!" +msgstr "GDM వాడుకరి '%s' ని కనుగొనలేకపోయింది. తిరస్కరించబడింది!" #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "GDM వినియోగదారి రూట్ అవకూడదు. తిరస్కరించబడింది!" +msgstr "GDM వాడుకరి రూట్ అవకూడదు. తిరస్కరించబడింది!" #: ../daemon/main.c:421 #, c-format @@ -413,9 +413,8 @@ msgstr "అన్ని హెచ్చరికలను దుర్భలమైనవిగా చేయుము" #: ../daemon/main.c:534 -#, fuzzy msgid "Exit after a time (for debugging)" -msgstr "ఒక సమయం తరువాత నిష్క్రమించు - డీబగ్గింగ్ కొరకు" +msgstr "ఒక సమయం తరువాత నిష్క్రమించు (డీబగ్గింగ్ కొరకు)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -428,7 +427,7 @@ #. make sure the pid file doesn't get wiped #: ../daemon/main.c:616 msgid "Only the root user can run GDM" -msgstr "GDM ను రూట్ వినియోగదారి మాత్రమే నడుపగలరు" +msgstr "GDM ను రూట్ వాడుకరి మాత్రమే నడుపగలరు" #. Translators: worker is a helper process that does the work #. of starting up a session @@ -437,12 +436,11 @@ msgstr "GNOME ప్రదర్శన నిర్వహకి భాగపు పనికారిణి" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -#, fuzzy msgid "AT-SPI Registry Wrapper" -msgstr "SPI రిజిస్ట్రీ వ్రాపర్ వద్ద" +msgstr "AT-SPI రిజిస్ట్రీ వ్రాపర్" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "లాగిన్ విండో" @@ -454,6 +452,10 @@ msgid "Power management daemon" msgstr "పవర్ నిర్వాహకి డెమోన్" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME సెషన్ యాక్సెల్‌రేషన్ పరిశీలకి" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME అమర్పుల డెమోన్" @@ -467,14 +469,12 @@ msgstr "తెరయొక్క భాగములను పెద్దవిచేయుము" #: ../data/greeter-autostart/gok.desktop.in.h:1 -#, fuzzy msgid "GNOME On-Screen Keyboard" -msgstr "GNOME తెరపైని కీబోర్డు" +msgstr "GNOME తెర-పైని కీబోర్డు" #: ../data/greeter-autostart/gok.desktop.in.h:2 -#, fuzzy msgid "Use an on-screen keyboard" -msgstr "తెర-పైన కీబోర్డును ‌వుపయోగించుము" +msgstr "తెర-పైన కీబోర్డును ‌వుపయోగించు" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -492,7 +492,7 @@ msgid "PolicyKit Authentication Agent" msgstr "పాలసీకిట్ దృవీకరణ ప్రతినిది" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "సిస్టమ్‌ను ఎంపికచేయుము" @@ -504,35 +504,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: అనునది XDMCP పీఠికను చదువలేదు!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "విలువ" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "పూర్తైన సమయంయొక్క శాతం" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "అచేతనమైన పాఠ్యము" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "వినియోగదారుడు ఇంకనూ ఒక అంశమును తీసుకొనకపోతే లేబుల్ నందు ఉపయోగింపబడు పాఠ్యము" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "చేతనమైన పాఠ్యము" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "వినియోగదారి ఒక అంశమును తీసుకొనినట్లైతే లేబుల్ నందు ఉపయోగింపబడు పాఠ్యము" +msgstr "వాడుకరి ఒక అంశమును తీసుకొనినట్లైతే లేబుల్ నందు ఉపయోగింపబడు పాఠ్యము" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "కనిపించునవి జాబితాచేయుము" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "ఎంపికకారి జాబితా దర్శనీయం కావాలా లేదా" @@ -564,69 +564,70 @@ msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "స్వయంచాలకంగా లాగిన్ అవుట..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" -msgstr "భాషను యెంపికచేసికొని లాగ్ ఇన్ నొక్కుము" +msgstr "భాషను యెంపికచేసికొని లాగిన్ నొక్కుము" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 -#, fuzzy +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "రద్దుచేయుచున్నది..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "మలచిన" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "మలచిన సెషన్" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -msgid "Computer Name" -msgstr "కంప్యూటర్ నామము" +#| msgid "Panel" +msgid "Cancel" +msgstr "రద్దు" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -#, fuzzy -msgid "Login" -msgstr "లాగ్ ఇన్" +msgid "Computer Name" +msgstr "కంప్యూటర్ పేరు" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 -msgid "Unlock" -msgstr "" +msgid "Login" +msgstr "లాగిన్" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "అన్‌లాక్" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "వర్షన్" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "ప్యానల్" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -#, fuzzy -msgid "Shutdown Options…" -msgstr "మూసివేయు ఐచ్చికములు..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "అర్ధాంతరనిలుపుదల" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "పునఃప్రారంభించు" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "మూసివేయి" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "తెలియని సమయం మిగిలివుంది" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "ప్యానల్" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "భాషలు" @@ -642,7 +643,6 @@ #. * with a list of languages to choose from #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 -#, fuzzy msgctxt "language" msgid "Other…" msgstr "ఇతర..." @@ -655,36 +655,10 @@ msgid "Language" msgstr "భాష" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "తెలుపబడని" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "కీబోర్డ్‍ మాదిరిలు" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "కీబోర్డ్‍ (_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -#, fuzzy -msgctxt "keyboard" -msgid "Other…" -msgstr "ఇతర..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "అందుబాటులోవున్న మాదిరిల పూర్తి జాబితానుండి కీబోర్డ్‍ మాదిరిని ఎంచుకొనుము." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "కీబోర్డ్" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "లేబుల్ టెక్స్ట్‍" @@ -695,7 +669,7 @@ #: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" -msgstr "ప్రతిమ నామము" +msgstr "ప్రతిమ పేరు" #: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" @@ -718,7 +692,7 @@ msgstr "జాబితా లో ఉంచవలిసిన అంశముల యొక్క గరిష్ఠ సంఖ్య" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 -#, fuzzy, c-format +#, c-format msgid "Remote Login (Connecting to %s…)" msgstr "దూరస్థ లాగిన్ (%s కు అనుసంధానం అవుతోంది...)" @@ -773,124 +747,107 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 msgid "Icon name to use for greeter logo" -msgstr "అభినందని లోగోకు వుపయోగించుటకు ప్రతిమ నామము" +msgstr "అభినందని లోగోకు వుపయోగించుటకు ప్రతిమ పేరు" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "ఇటీవల యెంచుకొనిన కీబోర్డ్‍ మాదిరిలు" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "ఇటీవల యెంచుకొనిన భాషలు" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -#, fuzzy -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "లాగిన్ విండోవద్ద అప్రమేయంగా చూపుటకు కీబోర్డ్‍ మాదిరిల జాబితాకు అమర్చుము." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "లాగిన్ విండోనందు అప్రమేయంగా చూపుటకు భాషల జాబితాకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "అభినందని లోగోకు వుపయోగించుటకు థీమ్‌డ్ ప్రతిమ నామమకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "లాగిన్ విండోనందు తెలిసిన వినియోగదారులను చూపుట అచేతనంచేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "లాగిన్ విండోనందు పునఃప్రారంభ బటన్‌లు చూపుట అచేతనంచేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "xrandr అమరికల నిర్వాహకి ప్లగ్ఇన్‌ను చేతనపరుచుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "బ్యాక్‌గ్రౌండు అమరికల నిర్వాహకి ప్లగ్ఇన్ ను చేతనపరుచుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "మీడియా-కీస్ అమరికల నిర్వాహకి ప్లగ్ఇన్ ను చేతనపరుచుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "తెర-పైన కీబోర్డును చేతనంచేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "యాక్సిస్‌బిలిటి కీబోర్డు అమరికలను నిర్వహించుటకు ప్లగ్ఇన్‌ను చేతనం చేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "తెర పెంచుదానిని చేతనంచేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "తెర చదువుదానిని చేతనంచేయుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "సౌండ్ అమరికల నిర్వాహకి ప్లగ్ఇన్‌ను చేతనపరుచుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings అమరికల నిర్వాహకి ప్లగ్ఇన్ ను చేతనపరుచుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "బ్యానర్ సందేశం టెక్స్ట్‍‌ను చూపుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "compizను విండో నిర్వాహికలాగా వుపయోగించుటకు సత్యంకు అమర్చుము." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" -"banner_message_text బదులుగా, వినియోగదారి యెంపిక ఖాళీగావున్నప్పుడు లాగిన్ విండోనందు చూపుటకు " +"banner_message_text బదులుగా, వాడుకరి యెంపిక ఖాళీగావున్నప్పుడు లాగిన్ విండోనందు చూపుటకు " "టెక్స్ట్‍ బ్యానర్ సందేశం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "లాగిన్ విండోనందు చూపుటకు టెక్స్ట్‍ బ్యానర్ సందేశం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "xrandr అమరికల నిర్వాహకి ప్లగ్ఇన్ చేతనమైతే సత్యం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "బ్యాక్‌గ్రౌండు అమరికల నిర్వాహకి ప్లగ్ఇన్ చేతనమైతే సత్యం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "మీడియా-కీల అమరికల నిర్వాహకి ప్లగ్ఇన్ చేతనమైతే సత్యం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "సౌండ్ అమరికల నిర్వాహకి ప్లగ్ఇన్ చేతనమైతే సత్యం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "xsettings అమరికల నిర్వాహకి ప్లగ్ఇన్ చేతనమైతే సత్యం." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -#, fuzzy +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "compizను విండో నిర్వాహికలాగా వుపయోగించుము" @@ -918,8 +875,8 @@ msgid "Whether the timer is currently ticking" msgstr "టైమర్ ప్రస్తుతం నడుస్తోందా" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s లాగా లాగిన్ అవ్వుము" @@ -929,167 +886,34 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "ఇతర..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "భిన్నమైన ఖాతాను ఎంచుకొనుము" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "అతిధేయి" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" -msgstr "తాత్కాలిక అతిధేయి లాగా లాగ్ఇన్ అవ్వుము" +msgstr "తాత్కాలిక అతిధేయి లాగా లాగిన్ అవ్వుము" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "స్వయంచాలక లాగిన్" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 -#, fuzzy +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "ఐచ్చికాలను ఎంపికచేసిన తర్వాత స్వయంచాలకంగా సిస్టమ్‌కు లాగిన్ అవ్వండి" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" -msgstr "ప్రస్తుతం దీనినందు లాగ్ఇన్ అయ్యింది" - -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"వినియోగదారిని మార్చు ఆప్లెట్ ఉచిత సాఫ్టువేర్; ఉచిత సాఫ్టువేర్ సంస్థ తరుపున ప్రచురితమైనGNU జనరల్ పబ్లిక్ " -"లైసెన్సు కు లోబడి దీనిని మీరు పునఃపంపిణి మరియు/లేదాసవరణ చేయవచ్చు; మీరు అనుసరించవలిసినది లైసెన్సు యొక్క " -"వర్షన్ 2, లేదా(మీ ఐచ్చికం వద్ద) దాని తరువాతి వర్షన్ కాని." - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"ఈ ప్రోగ్రామ్ అది ఉపయోగపడుతుందనే నమ్మకం తో పంపిణీ చేయబడింది,అయితే ఏ హామి లేదు; వ్యాపారసంబంధితంగా కాని లేదా " -"ప్రతిపాదిత ప్రయోజనం కొరకుకాని హామీ లేదు. అధికవివరములకొరకు GNU జనరల్ పబ్లిక్ లైసెన్సు నుచూడండి." - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"ఈ ప్రోగ్రామ్ తో మీరు GNU జనరల్ పబ్లిక్ లైసెన్సు నకలు ను పొంది ఉంటారు;పొందకపోతే, Free Software " -"Foundation, Inc., 51 Franklin Street, FifthFloor, Boston. MA 02110-1301, " -"USA కు వ్రాయండి" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "వినియోగదారుల మద్య వేగముగా మారుటకు మెనూ." - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "KrishnaBabu K 2008." - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "తెరను లాక్‌చేయలేదు: %s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "తెరకాపరిని తాత్కాలికంగా బ్లాంక్ తెరకు అమర్చలేదు: %s" - -#: ../gui/user-switch-applet/applet.c:888 -#, fuzzy, c-format -msgid "Can't log out: %s" -msgstr "లాగ్అవుట్ కాలేదు: %s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "అందుబాటులోవుంది" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "కనిపించని" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "రద్దీ(బ్యుజీ)" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "దూరంగా" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "ఖాతా సమాచారము" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "సిస్టమ్ అభీష్టాలు" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "తెరను లాక్‌చేయుము" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "వినియోగదారిని మార్చుము" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "" - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "తెలియని" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "వినియోగదారిని మార్చు ఆప్లెట్" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "ఖాతా అమర్పులను మరియు స్థితిని మార్చుము" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "వినియోగదారుల మధ్య త్వరగా మారుటకు ఒక మెనూ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "వినియోగదారుని మార్చునది" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "వినియోగదారి మార్చుదాని ఆప్లెట్ ఫాక్టరీ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "వ్యక్తిగత సమాచారమును సరిచేయుము(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "గురించి(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "వినియోగదారులను మరియు సమూహాలను సరిచేయి(_E)" +msgstr "ప్రస్తుతం దీనినందు లాగిన్ అయ్యింది" #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" @@ -1101,7 +925,6 @@ #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -#, fuzzy msgid "Ignored — retained for compatibility" msgstr "వదిలివేయబడింది - సారూప్యతకొరకు వుంచబడింది" @@ -1127,15 +950,140 @@ msgid "Unable to start new display" msgstr "కొత్త ప్రదర్శనను ప్రారంభించలేక పోయింది" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "స్క్రీన్‌షాట్ తీసుకొనబడింది" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "తెరయొక్క చిత్రమును తీసుకొనుము" +#, fuzzy +#~ msgid "Shutdown Options…" +#~ msgstr "మూసివేయు ఐచ్చికములు..." + +#~ msgid "Keyboard layouts" +#~ msgstr "కీబోర్డ్‍ మాదిరిలు" + +#~ msgid "_Keyboard:" +#~ msgstr "కీబోర్డ్‍ (_K):" + +#, fuzzy +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "ఇతర..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "అందుబాటులోవున్న మాదిరిల పూర్తి జాబితానుండి కీబోర్డ్‍ మాదిరిని ఎంచుకొనుము." + +#~ msgid "Keyboard" +#~ msgstr "కీబోర్డ్" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "ఇటీవల యెంచుకొనిన కీబోర్డ్‍ మాదిరిలు" + +#, fuzzy +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "లాగిన్ విండోవద్ద అప్రమేయంగా చూపుటకు కీబోర్డ్‍ మాదిరిల జాబితాకు అమర్చుము." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "వినియోగదారిని మార్చు ఆప్లెట్ ఉచిత సాఫ్టువేర్; ఉచిత సాఫ్టువేర్ సంస్థ తరుపున ప్రచురితమైనGNU జనరల్ " +#~ "పబ్లిక్ లైసెన్సు కు లోబడి దీనిని మీరు పునఃపంపిణి మరియు/లేదాసవరణ చేయవచ్చు; మీరు అనుసరించవలిసినది " +#~ "లైసెన్సు యొక్క వర్షన్ 2, లేదా(మీ ఐచ్చికం వద్ద) దాని తరువాతి వర్షన్ కాని." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "ఈ ప్రోగ్రామ్ అది ఉపయోగపడుతుందనే నమ్మకం తో పంపిణీ చేయబడింది,అయితే ఏ హామి లేదు; వ్యాపారసంబంధితంగా కాని " +#~ "లేదా ప్రతిపాదిత ప్రయోజనం కొరకుకాని హామీ లేదు. అధికవివరములకొరకు GNU జనరల్ పబ్లిక్ లైసెన్సు నుచూడండి." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "ఈ ప్రోగ్రామ్ తో మీరు GNU జనరల్ పబ్లిక్ లైసెన్సు నకలు ను పొంది ఉంటారు;పొందకపోతే, Free Software " +#~ "Foundation, Inc., 51 Franklin Street, FifthFloor, Boston. MA 02110-1301, " +#~ "USA కు వ్రాయండి" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "వినియోగదారుల మద్య వేగముగా మారుటకు మెనూ." + +#~ msgid "translator-credits" +#~ msgstr "KrishnaBabu K 2008." + +#~ msgid "Can't lock screen: %s" +#~ msgstr "తెరను లాక్‌చేయలేదు: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "తెరకాపరిని తాత్కాలికంగా బ్లాంక్ తెరకు అమర్చలేదు: %s" + +#, fuzzy +#~ msgid "Can't log out: %s" +#~ msgstr "లాగ్అవుట్ కాలేదు: %s" + +#~ msgid "Available" +#~ msgstr "అందుబాటులోవుంది" + +#~ msgid "Invisible" +#~ msgstr "కనిపించని" + +#~ msgid "Busy" +#~ msgstr "రద్దీ(బ్యుజీ)" + +#~ msgid "Away" +#~ msgstr "దూరంగా" + +#~ msgid "Account Information" +#~ msgstr "ఖాతా సమాచారము" + +#~ msgid "System Preferences" +#~ msgstr "సిస్టమ్ అభీష్టాలు" + +#~ msgid "Lock Screen" +#~ msgstr "తెరను లాక్‌చేయుము" + +#~ msgid "Switch User" +#~ msgstr "వినియోగదారిని మార్చుము" + +#~ msgid "Unknown" +#~ msgstr "తెలియని" + +#~ msgid "User Switch Applet" +#~ msgstr "వినియోగదారిని మార్చు ఆప్లెట్" + +#~ msgid "Change account settings and status" +#~ msgstr "ఖాతా అమర్పులను మరియు స్థితిని మార్చుము" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "వినియోగదారుల మధ్య త్వరగా మారుటకు ఒక మెనూ" + +#~ msgid "User Switcher" +#~ msgstr "వినియోగదారుని మార్చునది" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "వినియోగదారి మార్చుదాని ఆప్లెట్ ఫాక్టరీ" + +#~ msgid "Edit Personal _Information" +#~ msgstr "వ్యక్తిగత సమాచారమును సరిచేయుము(_I)" + +#~ msgid "_About" +#~ msgstr "గురించి(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "వినియోగదారులను మరియు సమూహాలను సరిచేయి(_E)" + #~ msgid "Force X to start on active vt" #~ msgstr "క్రియాశీల vt పై ప్రారంభమగుటకు Xను బలవంతం చేయుము" diff -Nru gdm-2.32.1/po/tr.po gdm-3.0.0/po/tr.po --- gdm-2.32.1/po/tr.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/tr.po 2011-04-04 14:37:16.000000000 +0000 @@ -7,42 +7,39 @@ # Görkem Çetin , 2003. # # Baris Cicek , 2004, 2009. +# Muhammet Kara , 2011. +# msgid "" msgstr "" "Project-Id-Version: gdm2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 18:41+0300\n" -"PO-Revision-Date: 2009-08-30 18:18+0300\n" -"Last-Translator: Baris Cicek \n" +"POT-Creation-Date: 2011-04-04 06:46+0300\n" +"PO-Revision-Date: 2011-03-27 16:01+0200\n" +"Last-Translator: Muhammet Kara \n" "Language-Team: Turkish \n" +"Language: tr\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" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" -msgstr "/dev/urandom karakter aygıtı değil" - -#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516 -#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137 -#: ../daemon/simple-slave-main.c:179 ../daemon/xdmcp-chooser-slave-main.c:179 -msgid "Enable debugging code" -msgstr "Hata ayıklama kodunu etkinleştir" +msgstr "/dev/urandom bir karakter aygıtı değil" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" -msgstr "Görüntü ID" +msgstr "Görüntü Kimliği (ID)" -#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175 -#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180 -msgid "id" -msgstr "kimlik" +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 +msgid "ID" +msgstr "Kimlik" -#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187 -#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:192 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "GNOME Görüntü Yöneticisi Yedeği" @@ -51,82 +48,83 @@ msgid "could not find user \"%s\" on system" msgstr "kullanıcı \"%s\" sistemde bulunamadı" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:220 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Giriş sistemi başlatılamadı" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:256 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Kullanıcının kimliği doğrulanamadı" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:310 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Kullanıcı yetkilendirilemiyor" -#: ../daemon/gdm-factory-slave.c:281 ../daemon/gdm-simple-slave.c:432 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Giriş koşulları sağlanamadı" -#: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1111 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 +msgid "Unable to open session" +msgstr "Oturum açılamıyor" + +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." -msgstr "" -"X sunucusu (sizin grafik ortamınız) dahili bir hata yüzünden başlatılamadı. " -"Lütfen sistem yöneticinizle temasa geçin veya sorunu anlamak için " -"syslog'ları kontrol edin. Bu sırada bu görüntü etkinsizleştirilecektir. " -"Lütfen hata düzeltildiğinde GDM'i yeniden başlatın." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Bir iç hata nedeniyle X sunucusu (grafiksel ortamınız) başlatılamadı. Lütfen " +"sistem yöneticinize başvurun ya da teşhis için syslog'unuza bakın. Bu sırada " +"bu ekran devre dışı kalacaktır. Sorun çözüldüğünde lütfen GDM'yi yeniden " +"başlatın." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: '%s' üst ekranına bağlanılırken başarısız olundu" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "" "Sunucu %s kullanıcısı tarafından yeniden başlatılmalı ama bu kullanıcı yok" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "groupid %d olarak değiştirilemedi" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s için initgroups () başarısız oldu" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "userid %d olarak değiştirilemedi" -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464 -msgid "Couldn't set groupid to 0" -msgstr "groupid 0 olarak değiştirilemedi" - -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" msgstr "%s: %s ekranı için günlük dosyası açılamadı!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: %s ayarı %s olarak atarken hata" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Sunucu önceliği %d olarak atanamadı: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: %s ekranı için boş sunucu komutu" @@ -155,295 +153,302 @@ msgid "The display device" msgstr "Görüntü aygıtı" -#: ../daemon/gdm-session-worker.c:1105 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "kimlik doğrulama sistemi ile iletişim başlatılırken hata -%s" -#: ../daemon/gdm-session-worker.c:1106 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "genel başarısızlık" -#: ../daemon/gdm-session-worker.c:1107 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "bellek yetersiz" -#: ../daemon/gdm-session-worker.c:1108 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "uygulama programcısı hatası" -#: ../daemon/gdm-session-worker.c:1109 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "bilinmeyen hata" -#: ../daemon/gdm-session-worker.c:1116 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Kullanıcı adı:" -#: ../daemon/gdm-session-worker.c:1122 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" msgstr "" -"tercih ettiğiniz kullanıcı adı isteminin kimlik doğrulama sistemi " -"bildirilirken hata - %s" +"tercih edilen kullanıcı adı isteminin kimlik denetimi sistemine bilgi " +"verilirken hata oluştu: %s" -#: ../daemon/gdm-session-worker.c:1136 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" msgstr "" -"kullanıcının makine isminin kimlik doğrulama sistemi bildirilirken hata -%s" +"kullanıcının makine adının kimlik denetimi sistemine bilgi verilirken hata " +"oluştu: %s" -#: ../daemon/gdm-session-worker.c:1151 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "kullanıcı konsolunun kimlik doğrulama sistemi bildirilirken hata -%s" +msgid "error informing authentication system of user's console: %s" +msgstr "" +"kullanıcı konsolunun kimlik denetimi sistemi bilgilendirilirken hata oluştu: " +"%s" -#: ../daemon/gdm-session-worker.c:1164 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "ekran dizgisinin kimlik doğrulama sistemi bildirilirken hata - %s" +msgid "error informing authentication system of display string: %s" +msgstr "" +"ekran dizgisinin kimlik denetimi sistemi bilgilendirilirken hata oluştu: %s" -#: ../daemon/gdm-session-worker.c:1179 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" msgstr "" -"ekran xauth koşullarının kimlik doğrulama sistemi bildirilirken hata -%s" +"ekran xauth tanıtımlarının kimlik denetimi sistemi bilgilendirilirken hata " +"oluştu: %s" -#: ../daemon/gdm-session-worker.c:1459 ../daemon/gdm-session-worker.c:1477 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "hiçbir kullanıcı hesabı mevcut değil" -#: ../daemon/gdm-session-worker.c:1504 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Kullanıcıya değiştirilemiyor" -#: ../daemon/gdm-welcome-session.c:426 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "%s kullanıcısı mevcut değil" -#: ../daemon/gdm-welcome-session.c:433 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "%s grubu mevcut değil" -#: ../daemon/gdm-xdmcp-display-factory.c:595 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Soket oluşturulamadı!" -#: ../daemon/gdm-xdmcp-display-factory.c:862 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "%s sunucusundan gelen XDMCP isteği reddedildi" -#: ../daemon/gdm-xdmcp-display-factory.c:1019 -#: ../daemon/gdm-xdmcp-display-factory.c:1240 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "Paketten authlist çıkartılamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:1032 -#: ../daemon/gdm-xdmcp-display-factory.c:1255 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Doğrulama toplamında (checksum) hata" -#: ../daemon/gdm-xdmcp-display-factory.c:1506 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Hatalı adres" -#: ../daemon/gdm-xdmcp-display-factory.c:1587 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: Ekran adresi okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:1595 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: Görüntü port numarası okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:1604 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: Paketten doğrulama listesi çıkartılamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:1624 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: Doğrulama toplamında (checksum) hata var" -#: ../daemon/gdm-xdmcp-display-factory.c:2133 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: Yasaklanmış %s sunucusundan REQUEST alındı" -#: ../daemon/gdm-xdmcp-display-factory.c:2143 -#: ../daemon/gdm-xdmcp-display-factory.c:2498 -#: ../daemon/gdm-xdmcp-display-factory.c:2750 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: Ekran Numarası okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2150 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: Bağlantı Türü okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2157 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: İstemci Adresi okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: Kimlik Doğrulama İsimleri okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2174 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: Kimlik Doğrulama Bilgileri okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2184 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: Kimlik Doğrulama Listesi okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2203 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: Üretici ID'si okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2230 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: %s konumundan doğrulama toplamı (checksum) başarısız oldu" -#: ../daemon/gdm-xdmcp-display-factory.c:2482 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: Yasaklanmış %s makinesinden yönetme isteği alındı" -#: ../daemon/gdm-xdmcp-display-factory.c:2491 -#: ../daemon/gdm-xdmcp-display-factory.c:2757 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: Oturum ID'si okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: Görüntü sınıfı okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2610 -#: ../daemon/gdm-xdmcp-display-factory.c:2660 -#: ../daemon/gdm-xdmcp-display-factory.c:2666 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: Adres okunamadı" -#: ../daemon/gdm-xdmcp-display-factory.c:2740 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: Yasaklanmış %s makinesinden KEEPALIVE alındı" -#: ../daemon/gdm-xdmcp-display-factory.c:2829 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: XDMCP başlığı okunamadı!" -#: ../daemon/gdm-xdmcp-display-factory.c:2835 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: Geçersiz XDMCP sürümü!" -#: ../daemon/gdm-xdmcp-display-factory.c:2841 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: Adres çözümlenemedi" -#: ../daemon/gdm-xdmcp-display-factory.c:3286 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Sunucu adı alınamadı: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "PID dosyası %s yazılamıyor: muhtemelen disk dolu: %s" -#: ../daemon/main.c:270 +#: ../daemon/main.c:271 #, c-format msgid "Logdir %s does not exist or isn't a directory." msgstr "Logdir %s yok veya bir dizin değil." -#: ../daemon/main.c:283 +#: ../daemon/main.c:287 #, c-format msgid "Authdir %s does not exist. Aborting." msgstr "Authdir %s yok. İptal ediliyor." -#: ../daemon/main.c:287 +#: ../daemon/main.c:291 #, c-format msgid "Authdir %s is not a directory. Aborting." msgstr "Authdir %s dizin değil. İptal ediliyor." -#: ../daemon/main.c:361 +#: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "Authdir %s sahibi kullanıcı %d, grup %d değil. İptal ediliyor." -#: ../daemon/main.c:368 +#: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "Authdir %s sahip olduğu izinler %o yanlış. %o olmalı. İptal ediliyor." -#: ../daemon/main.c:405 +#: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" msgstr "GDM kullanıcısı '%s' bulunamadı. İptal ediliyor!" -#: ../daemon/main.c:411 +#: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" msgstr "GDM kullanıcısının 'root' olmaması gerekiyor. İptal ediliyor!" -#: ../daemon/main.c:417 +#: ../daemon/main.c:421 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" msgstr "GDM grubu '%s' bulunamadı. İptal ediliyor!" -#: ../daemon/main.c:423 +#: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" msgstr "GDM grubu 'root' olmaması gerekiyor. İptal ediliyor!" -#: ../daemon/main.c:517 +#: ../daemon/main.c:533 msgid "Make all warnings fatal" msgstr "Tüm uyarıları ölümcül yap" -#: ../daemon/main.c:518 -msgid "Exit after a time - for debugging" -msgstr "Bir süre sonra çık - hata ayıklama için" +#: ../daemon/main.c:534 +msgid "Exit after a time (for debugging)" +msgstr "Bir süre sonra çık (hata ayıklama için)" -#: ../daemon/main.c:519 +#: ../daemon/main.c:535 msgid "Print GDM version" msgstr "GDM sürümünü yazdır" -#: ../daemon/main.c:534 +#: ../daemon/main.c:550 msgid "GNOME Display Manager" msgstr "GNOME Görüntü Yöneticisi" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:595 -msgid "Only root wants to run GDM" -msgstr "Sadece root GDM çalıştırmak ister" - -#: ../daemon/session-worker-main.c:149 +#: ../daemon/main.c:616 +msgid "Only the root user can run GDM" +msgstr "Yalnızca yetkili kullanıcı GDM'yi çalıştırabilir" + +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "GNOME Görüntü Yöneticisi Oturum Çalıştırıcısı" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "AT SPI Kayıt İşleyici" +msgid "AT-SPI Registry Wrapper" +msgstr "AT SPI Kayıt Sarıcısı" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1767 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Giriş Penceresi" @@ -455,6 +460,10 @@ msgid "Power management daemon" msgstr "Güç yönetimi servisi" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME Oturum Hızlandırma Denetleyicisi" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME Ayarlar Servisi" @@ -468,12 +477,12 @@ msgstr "Ekranın parçalarını büyütün" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "GNOME Ekran Klavyesi" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" -msgstr "Bir ekran klavyesi kullanın" +msgid "Use an on-screen keyboard" +msgstr "Ekran klavyesi kullan" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -487,135 +496,153 @@ msgid "Present on-screen information as speech or braille" msgstr "Konuşma ya da körler alfabesi olarak mevcut ekran bilgisini sun" -#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.h:1 +#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 msgid "PolicyKit Authentication Agent" msgstr "PolicyKit Kimlik Doğrulama Aracı" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Sistem Seç" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: XDMCP tamponu oluşturulamadı!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP başlığı okunamadı!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:253 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Değer" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:254 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "tamamlanan zaman yüzdesi" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1321 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Kapalı Metin" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1322 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Kullanıcı henüz bir öğe seçmemişken kullanmak için etiket metni" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1330 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Etkin Metin" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1331 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Kullanıcı bir öğe seçmişken kullanmak için etiket metni" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1340 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Liste Görünür" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1341 -msgid "Whether or not the chooser list is visible" -msgstr "Seçici listesinin görünür olup olmadığı" - -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M:%S %p" -msgstr "%H:%M:%S" - -#: ../gui/simple-greeter/gdm-clock-widget.c:66 -msgid "%l:%M %p" -msgstr "%H:%M" - -#. translators: replace %e with %d if, when the day of the -#. * month as a decimal number is a single digit, it -#. * should begin with a 0 in your locale (e.g. "May -#. * 01" instead of "May 1"). +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 +msgid "Whether the chooser list is visible" +msgstr "Seçme listesinin görünür olup olmayacağı" + +#. translators: This is the time format to use when both +#. * the date and time with seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:72 -msgid "%a %b %e" -msgstr "%e %b %a" - -#. translators: reverse the order of these arguments -#. * if the time should come before the -#. * date on a clock in your locale. +#: ../gui/simple-greeter/gdm-clock-widget.c:70 +msgid "%a %b %e, %l:%M:%S %p" +msgstr "%a %b %e, %l:%M:%S %p" + +#. translators: This is the time format to use when both +#. * the date and time without seconds are being shown together. #. -#: ../gui/simple-greeter/gdm-clock-widget.c:77 -#, c-format -msgid "%1$s, %2$s" -msgstr "%1$s, %2$s" +#: ../gui/simple-greeter/gdm-clock-widget.c:76 +msgid "%a %b %e, %l:%M %p" +msgstr "%a %b %e, %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:291 -msgid "Automatically logging in..." -msgstr "Otomatik giriş yapılıyor..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time with seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:83 +msgid "%a %l:%M:%S %p" +msgstr "%a %l:%M:%S %p" -#. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:758 -msgid "Cancelling..." -msgstr "İptal ediliyor..." +#. translators: This is the time format to use when there is +#. * no date, just weekday and time without seconds. +#. +#: ../gui/simple-greeter/gdm-clock-widget.c:92 +msgid "%a %l:%M %p" +msgstr "%a %l:%M %p" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" +msgstr "Otomatik olarak oturum açılıyor..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1185 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Bir dil seçin ve Giriş'e tıklayın" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 -msgid "Authentication Dialog" -msgstr "Kimlik Doğrulama Penceresi" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" +msgstr "İptal ediliyor..." -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Özel" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Özel oturum" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "Vazgeç" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Bilgisayar Adı" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 -msgid "Log In" -msgstr "Giriş" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +msgid "Login" +msgstr "Oturum aç" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Kilidi Aç" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +msgid "Version" +msgstr "Sürüm" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +msgid "Suspend" +msgstr "Askıya Al" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Yeniden Başlat" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Kapat" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 -msgid "Suspend" -msgstr "Askıya Al" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Bilinmeyen bir süre kaldı" -#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 -msgid "Version" -msgstr "Sürüm" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:554 +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 msgid "Panel" msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Diller" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:272 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "_Diller:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:273 -#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "_Dil:" @@ -624,62 +651,44 @@ #. #: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" -msgid "Other..." +msgid "Other…" msgstr "Diğer..." #: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Mevcut tüm dillerin listesinden bir dil seçin." -#: ../gui/simple-greeter/gdm-languages.c:609 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "Dil" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Belirtilmemiş" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Klavye düzenleri" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "_Keyboard:" -msgstr "_Klavye:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other..." -msgstr "Diğer" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Mevcut tüm düzenlerin listesinden bir klavye düzeni seçin." - -#: ../gui/simple-greeter/gdm-option-widget.c:494 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Etiket Metni" -#: ../gui/simple-greeter/gdm-option-widget.c:495 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "Etiket olarak kullanmak için metin " -#: ../gui/simple-greeter/gdm-option-widget.c:502 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Simge ismi" -#: ../gui/simple-greeter/gdm-option-widget.c:503 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Etiket ile kullanmak için simge" -#: ../gui/simple-greeter/gdm-option-widget.c:511 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "Öntanımlı Öğe" -#: ../gui/simple-greeter/gdm-option-widget.c:512 -msgid "The id of the default item" -msgstr "Öntanımlı öğenin id'si" +#: ../gui/simple-greeter/gdm-option-widget.c:523 +msgid "The ID of the default item" +msgstr "Öntanımlı öğenin kimliği (ID)" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" @@ -691,8 +700,8 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "Uzaktan Giriş (%s ile bağlantı kuruluyor...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "Uzaktan Giriş (%s ile bağlantı kuruluyor...)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format @@ -704,8 +713,8 @@ msgstr "Uzaktan Giriş" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Oturumlar:" +msgid "Session" +msgstr "Oturum" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" @@ -728,86 +737,73 @@ msgstr "Erişilebilir klavye eklentisini etkinleştir" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 -msgid "Enable debugging" -msgstr "Hata ayıklamayı etkinleştir" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 -msgid "Enable debugging mode for the greeter." -msgstr "Karşılayıcı için hata ayıklama kipini etkinleştir." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 msgid "Enable on-screen keyboard" msgstr "Ekran klavyesini etkinleştir" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 msgid "Enable screen magnifier" msgstr "Ekran büyütecini etkinleştir" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 msgid "Enable screen reader" msgstr "Ekran okuyucuyu etkinleştir" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 msgid "Enable showing the banner message" msgstr "Afiş mesajı göstermeyi etkinleştir" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 msgid "Icon name to use for greeter logo" msgstr "Karşılayıcı logosu için kullanılacak simge adı" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Recently selected keyboard layouts" -msgstr "Son olarak seçilen klavye düzenleri" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 msgid "Recently selected languages" msgstr "Son olarak seçilen diller" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "" -"Giriş penceresinde öntanımlı olarak gösterilecek klavye düzenlerin listesini " -"atayın." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to a list of languages to be shown by default at the login window." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +msgid "Set to a list of languages to be shown by default in the login window." msgstr "" "Giriş penceresinde öntanımlı olarak gösterilecek dillerin listesini atayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "Karşılayıcı logosu olarak kullanılacak temalı simge ismini ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "" "Bilinen kullanıcıların giriş pencerede gösterilmesini devre dışı bırakmak " "için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" "Giriş pencerede yeniden başlatma düğmelerini göstermeyi devre dışı bırakmak " "için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "" +"Xrandr ayarları yöneticisi eklentisini etkinleştirmek için doğru (true) " +"şeklinde ayarlayın." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "" "Arkaplan ayarları yöneticisi eklentisini etkinleştirmek için doğru şeklinde " "ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" "Ortam-tuşları ayarları yöneticisi eklentisini etkinleştirmek için doğru " "şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Ekran klavyesini etkinleştirmek için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." @@ -815,77 +811,73 @@ "Erişilebilirlik klavye ayarlarını yönetmek için eklentiyi etkinleştirmek " "için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Ekran büyütecini etkinleştirmek için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Ekran okuyucuyu etkinleştirmek için doğru şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "" "Ses ayarları yöneticisi eklentisini etkinleştirmek için doğru şeklinde " "ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "" -"Xrandr ayarları yöneticisi eklentisini etkinleştirmek için doğru şeklinde " -"ayarlayın." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "" "Xsettings ayarlar yöneticisi eklentisini etkinleştirmek için doğru şeklinde " "ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Afiş mesajı metnini göstermek için TRUE şeklinde ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Set to true to use compiz as the window manager." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +msgid "Set to true to use Compiz as the window manager." msgstr "" -"Pencere yöneticisi olarak Compiz kullanmak için TRUE şeklinde ayarlayın." +"Pencere yöneticisi olarak Compiz kullanmak için doğru (true) şeklinde " +"ayarlayın." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" -"Text banner message to show on the login window when the user chooser is " +"Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "Seçici boş olduğunda, banner_message_text yerine giriş penceresinde " -"göstermek için metin afişi mesajı." +"gösterilecek metin afişi mesajı." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 -msgid "Text banner message to show on the login window." -msgstr "Giriş penceresinde göstermek için metin afişi mesajı." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +msgid "Text banner message to show in the login window." +msgstr "Giriş penceresinde gösterilecek için metin afişi mesajı." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "" +"Eğer XRandR ayarları yöneticisi eklentisi etkinleştirilirse doğru (true)." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "Eğer arka plan ayarları yönetici eklentisi etkinleştirilirse TRUE." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "" "Eğer ortam tuşları ayarlarını yöneticisi eklentisi etkinleştirilirse TRUE." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "Eğer ses ayarları yönetici eklentisi etkinleştirilirse TRUE." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "Eğer xrandr ayarları yöneticisi eklentisi etkinleştirilirse TRUE." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:37 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "Eğer xsettings ayarları yöneticisi eklentisi etkinleştirilirse TRUE." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:38 -msgid "Use compiz as the window manager" -msgstr "Pencere yöneticisi olarak Compiz kullan" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" +msgstr "Pencere yöneticisi olarak Compiz'i kullan" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -908,218 +900,215 @@ msgstr "Çalışmıyor mu?" #: ../gui/simple-greeter/gdm-timer.c:166 -msgid "Whether or not the timer is currently ticking" -msgstr "Zamanlayıcının halen işliyor olup olmadığı" +msgid "Whether the timer is currently ticking" +msgstr "Zamanlayıcının şu anda çalışıp çalışmadığı" -#: ../gui/simple-greeter/gdm-user.c:247 -msgid "Manager" -msgstr "Yönetici" - -#: ../gui/simple-greeter/gdm-user.c:248 -msgid "The user manager object this user is controlled by." -msgstr "Bu kullanıcının kontrol edildiği kullanıcı yöneticisi nesnesi." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "%s olarak giriş yap" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:164 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" -msgid "Other..." -msgstr "Diğerleri..." +msgid "Other…" +msgstr "Diğer..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:165 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Başka bir hesap seç" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:177 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Konuk" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:178 -msgid "Login as a temporary guest" -msgstr "Geçici bir konuk olarak giriş yap" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" +msgstr "Geçici konuk olarak oturum aç" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:191 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Otomatik Giriş" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192 -msgid "Automatically login to the system after selecting options" -msgstr "Seçenekleri seçtikten sonra kendiliğinden sisteme giriş yap" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:383 -#, c-format -msgid "Log in as %s" -msgstr "%s olarak giriş yap" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" +msgstr "Seçenekleri seçtikten sonra sisteme otomatik olarak giriş yap" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:737 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Şu anda girişi bulunan " -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" +#: ../utils/gdmflexiserver.c:61 +msgid "Only the VERSION command is supported" +msgstr "Sadece SÜRÜM (VERSION) komutu destekleniyor" -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" +#: ../utils/gdmflexiserver.c:61 +msgid "COMMAND" +msgstr "KOMUT" -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +msgid "Ignored — retained for compatibility" +msgstr "Yok Sayılıyor - uyum için korunmuştur" -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "" -"Kullanıcılar arasında hızlı bir şekilde geçiş yapabileceğiniz bir menü." +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +msgid "Debugging output" +msgstr "Hata ayıklama çıktısı" -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "Barış Çiçek " +#: ../utils/gdmflexiserver.c:68 +msgid "Version of this application" +msgstr "Bu uygulamanın sürümü" -#: ../gui/user-switch-applet/applet.c:647 -#: ../gui/user-switch-applet/applet.c:784 -#: ../gui/user-switch-applet/applet.c:823 +#: ../utils/gdmflexiserver.c:675 #, c-format -msgid "Can't lock screen: %s" -msgstr "Ekran kilitlenemedi: %s" +msgid "Could not identify the current session." +msgstr "Geçerli oturum tespit edilemedi." -#: ../gui/user-switch-applet/applet.c:669 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Ekran koruyucu geçici olarak boş ekran olarak ayarlanamıyor: %s" +#. Option parsing +#: ../utils/gdmflexiserver.c:711 +msgid "- New GDM login" +msgstr "- Yeni GDM girişi" -#: ../gui/user-switch-applet/applet.c:882 -#, c-format -msgid "Can't logout: %s" -msgstr "Çıkış yapılamadı: %s" +#: ../utils/gdmflexiserver.c:767 +msgid "Unable to start new display" +msgstr "Yeni görüntü başlatılamadı" -#: ../gui/user-switch-applet/applet.c:966 -msgid "Available" -msgstr "Mevcut" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "Ekran görüntüsü alındı" -#: ../gui/user-switch-applet/applet.c:967 -msgid "Invisible" -msgstr "Görünmez" +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "Ekranın bir resmini çek" -#: ../gui/user-switch-applet/applet.c:968 -msgid "Busy" -msgstr "Meşgul" +#~ msgid "Enable debugging code" +#~ msgstr "Hata ayıklama kodunu etkinleştir" -#: ../gui/user-switch-applet/applet.c:969 -msgid "Away" -msgstr "Uzakta" +#~ msgid "id" +#~ msgstr "kimlik" -#: ../gui/user-switch-applet/applet.c:1129 -msgid "Account Information..." -msgstr "Hesap Bilgileri..." +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "groupid 0 olarak değiştirilemedi" -#: ../gui/user-switch-applet/applet.c:1141 -msgid "System Preferences..." -msgstr "Sistem Tercihleri..." +#~ msgid "%a %b %e" +#~ msgstr "%e %b %a" -#: ../gui/user-switch-applet/applet.c:1157 -msgid "Lock Screen" -msgstr "Ekranı Kilitle" +#~ msgid "%1$s, %2$s" +#~ msgstr "%1$s, %2$s" -#: ../gui/user-switch-applet/applet.c:1168 -msgid "Switch User" -msgstr "Kullanıcı Değiştir" +#~ msgid "Authentication Dialog" +#~ msgstr "Kimlik Doğrulama Penceresi" -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1179 -msgid "Quit..." -msgstr "Çık..." +#~ msgid "Keyboard layouts" +#~ msgstr "Klavye düzenleri" -#: ../gui/user-switch-applet/applet.c:1294 -msgid "Unknown" -msgstr "Bilinmiyor" +#~ msgid "_Keyboard:" +#~ msgstr "_Klavye:" -#: ../gui/user-switch-applet/applet.c:1412 -msgid "User Switch Applet" -msgstr "Kullanıcı Değiştirici Uygulamacığı" +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Diğer" -#: ../gui/user-switch-applet/applet.c:1421 -msgid "Change account settings and status" -msgstr "Hesap ayarlarını ve durumunu değiştir" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Mevcut tüm düzenlerin listesinden bir klavye düzeni seçin." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Kullanıcılar arasında hızlı bir şekilde geçiş yapmak için bir menü" +#~ msgid "Enable debugging" +#~ msgstr "Hata ayıklamayı etkinleştir" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Kullanıcı Değiştirici" +#~ msgid "Enable debugging mode for the greeter." +#~ msgstr "Karşılayıcı için hata ayıklama kipini etkinleştir." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Kullanıcı Değiştirici Uygulamacık Üreticisi" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Son olarak seçilen klavye düzenleri" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Kişisel _Bilgileri Düzenle" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "Giriş penceresinde öntanımlı olarak gösterilecek klavye düzenlerin " +#~ "listesini atayın." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Hakkında" +#~ msgid "Manager" +#~ msgstr "Yönetici" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "Kullanıcıları ve Grupları _Düzenle" +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "Bu kullanıcının kontrol edildiği kullanıcı yöneticisi nesnesi." -#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62 -#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65 -#: ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "Yok Sayılan - uyum için korunmuştur" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "" +#~ "Kullanıcılar arasında hızlı bir şekilde geçiş yapabileceğiniz bir menü." -#: ../utils/gdmflexiserver.c:61 -msgid "COMMAND" -msgstr "KOMUT" +#~ msgid "translator-credits" +#~ msgstr "Barış Çiçek " -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -msgid "Debugging output" -msgstr "Hata ayıklama çıktısı" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Ekran kilitlenemedi: %s" -#: ../utils/gdmflexiserver.c:68 -msgid "Version of this application" -msgstr "Bu uygulamanın sürümü" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Ekran koruyucu geçici olarak boş ekran olarak ayarlanamıyor: %s" -#: ../utils/gdmflexiserver.c:675 -#, c-format -msgid "Could not identify the current session." -msgstr "Geçerli oturum tespit edilemedi." +#~ msgid "Can't logout: %s" +#~ msgstr "Çıkış yapılamadı: %s" -#. Option parsing -#: ../utils/gdmflexiserver.c:711 -msgid "- New GDM login" -msgstr "- Yeni GDM girişi" +#~ msgid "Available" +#~ msgstr "Mevcut" -#: ../utils/gdmflexiserver.c:767 -msgid "Unable to start new display" -msgstr "Yeni görüntü başlatılamadı" +#~ msgid "Invisible" +#~ msgstr "Görünmez" -#: ../utils/gdm-screenshot.c:219 -msgid "Screenshot taken" -msgstr "Ekran görüntüsü alındı" +#~ msgid "Busy" +#~ msgstr "Meşgul" -#. Option parsing -#: ../utils/gdm-screenshot.c:284 -msgid "Take a picture of the screen" -msgstr "Ekranın bir resmini çek" +#~ msgid "Away" +#~ msgstr "Uzakta" + +#~ msgid "Account Information..." +#~ msgstr "Hesap Bilgileri..." + +#~ msgid "System Preferences..." +#~ msgstr "Sistem Tercihleri..." + +#~ msgid "Lock Screen" +#~ msgstr "Ekranı Kilitle" + +#~ msgid "Switch User" +#~ msgstr "Kullanıcı Değiştir" + +#~ msgid "Quit..." +#~ msgstr "Çık..." + +#~ msgid "Unknown" +#~ msgstr "Bilinmiyor" + +#~ msgid "User Switch Applet" +#~ msgstr "Kullanıcı Değiştirici Uygulamacığı" + +#~ msgid "Change account settings and status" +#~ msgstr "Hesap ayarlarını ve durumunu değiştir" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Kullanıcılar arasında hızlı bir şekilde geçiş yapmak için bir menü" + +#~ msgid "User Switcher" +#~ msgstr "Kullanıcı Değiştirici" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Kullanıcı Değiştirici Uygulamacık Üreticisi" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Kişisel _Bilgileri Düzenle" + +#~ msgid "_About" +#~ msgstr "_Hakkında" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "Kullanıcıları ve Grupları _Düzenle" #~ msgid "worker exited with status %d" #~ msgstr "işçi %d statüsü ile çıktı" diff -Nru gdm-2.32.1/po/ug.po gdm-3.0.0/po/ug.po --- gdm-2.32.1/po/ug.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/ug.po 2011-04-04 14:37:16.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gdm gnome-2-32\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-11-13 21:07+0000\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" "PO-Revision-Date: 2010-07-30 07:44+0000\n" "Last-Translator: Sahran \n" "Language-Team: Uyghur Computer Science Association \n" @@ -41,28 +41,28 @@ msgid "could not find user \"%s\" on system" msgstr "سىستېمىدىن ئىشلەتكۈچى \"%s\" تېپىلمىدى" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "كىرىش سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "ئىشلەتكۈچىنى تونۇيالمىدى" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "مۇۋاپىق ئىشلەتكۈچى دەپ ھۆكۈم قىلغىلى بولمىدى" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "ئىشەنچلىك ئىشلەتكۈچى دەپ قاراشقا بولمىدى" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "ئەڭگىمەنى باشلىغىلى بولمىدى" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -81,17 +81,17 @@ msgstr "مۇلازىمېتىرنى ئىشلەتكۈچى %s قوزغىتىپتۇ. بىراق بۇنداق ئىشلەتكۈچى مەۋجۇت ئەمەس" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "گۇرۇپپا ID سىنى %d غا تەڭشىگىلى بولمىدى" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s نى ئىجرا قىلىۋاتقاندا initgroups () مەغلۇپ بولدى" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "ئىشلەتكۈچى ID سىنى %d غا تەڭشىگىلى بولمىدى" @@ -141,71 +141,72 @@ msgid "The display device" msgstr "كۆرسىتىش ئۈسكۈنىسى" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "دەلىللەش سىستېما سۆزلىشىشىنى دەسلەپلەشتۈرگەندە خاتالىق كۆرۈلدى: %s" +#| msgid "error initiating conversation with authentication system: %s" +msgid "error initiating conversation with authentication system - %s" +msgstr "دەلىللەش سىستېمىسى بىلەن كۆرۈشۈشتە دەسلەپلەشتۈرۈش خاتالىقى يۈز بەردى - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "ئادەتتىكى مەغلۇبىيەت" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "ئەسلەك يېتىشمىدى" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "پروگراممىدىكى كەمتۈك" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "نامەلۇم خاتالىق" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "ئىشلەتكۈچى ئاتى:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "دەلىللەش سىستېمىسىدا ئىشلەتكۈچى ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "دەلىللەش سىستېمىسىدا كومپيۇتېر ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "ئىشلەتكۈچى تىزگىن سۇپىسىنى دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "ھەرپ تىزمىسىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "xauth گۇۋاھنامىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "ئىشلەتكۈچى ھېسابى يوق" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "ئىشلەتكۈچى ئالماشتۇرغىلى بولمىدى" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "ئىشلەتكۈچى %s مەۋجۇت ئەمەس" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "گۇرۇپپا %s مەۋجۇت ئەمەس" @@ -427,7 +428,7 @@ msgstr "AT-SPI رويخەت تۈرى" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1646 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "كىرىش كۆزنىكى" @@ -439,6 +440,10 @@ msgid "Power management daemon" msgstr "توك مەنبە باشقۇرغۇ نازارەتچىسى" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME ئەڭگىمە تېزلەتكۈچنى تەكشۈرگۈچ" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME تەڭشەك نازارەتچىسى" @@ -475,7 +480,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit دەلىللەش پروگراممىسى" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "سىستېما تاللاڭ" @@ -487,35 +492,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: XDMCP قېشىنى ئوقۇغىلى بولمىدى!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "قىممىتى" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "تاماملانغان ۋاقىتنىڭ پىرسەنتى" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "بىئاكتىپ تېكىست" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "ئىشلەتكۈچى تېزى ھېچقانداق تۇرنى تاللىمىغان ۋاقىتتا ئەندە كۆرسىتىلىدىغان تېكىست" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "ئاكتىپ تېكىست" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "ئىشلەتكۈچى بىرەر تۇرنى تاللىغان ۋاقىتتا ئەندە كۆرسىتىلىدىغان تېكىست" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "تىزىملىك كۆرۈنسۇن" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "تىزىملىك كۆرۈنەمدۇ تاللايدۇ" @@ -524,14 +529,14 @@ #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 msgid "%a %b %e, %l:%M:%S %p" -msgstr "%a %b %e, %l:%M:%S %p" +msgstr "%a %b %e، %l:%M:%S %p" #. translators: This is the time format to use when both #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 msgid "%a %b %e, %l:%M %p" -msgstr "%a %b %e, %l:%M %p" +msgstr "%a %b %e، %l:%M %p" #. translators: This is the time format to use when there is #. * no date, just weekday and time with seconds. @@ -547,65 +552,70 @@ msgid "%a %l:%M %p" msgstr "%p%l:%M (%a)" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "ئۆزلۈكىدىن كىرىۋاتىدۇ…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "ۋاز كېچىۋاتىدۇ…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "ئىختىيارى" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "ئىختىيارى ئەڭگىمە" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "ۋاز كەچ" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "كومپيۇتېر ئاتى" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "تىزىمغا كىر" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" -msgstr "قۇلۇپ ئاچ" +msgstr "قۇلۇپسىزلا" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "نەشرى" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "تاختا" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "تاقاش تاللانما…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" -msgstr "ۋاقىتلىق توختىتىش" +msgstr "توڭلات" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "قايتا قوزغات" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" -msgstr "تاقا" +msgstr "تاقاش" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "ئىختىيارى" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "ئېشىپ قالغان ۋاقىت نامەلۇم" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "ئىختىيارى ئەڭگىمە" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "تاختا" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "تىللار" @@ -633,35 +643,10 @@ msgid "Language" msgstr "تىل" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "بەلگىلەنمىگەن" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "ھەرپتاختا(_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "باشقا…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "ھەرپتاختا تىزىملىكىدىن ھەرپتاختا تاللاڭ." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "ھەرپتاختا" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "ئەن تېكىستى" @@ -753,111 +738,102 @@ msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگە ئاتى" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "ئالدىنقى قېتىم تاللانغان ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "ئالدىنقى قېتىم تاللانغان تىل" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى ھەرپتاختا ئورۇنلاشتۇرۇش تەڭشىكى." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى تىللار تەڭشىكى." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگىنىڭ ئات تەڭشىكى." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچى ئاتىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "قوشۇمچە ئىقتىدارلىق ھەرپتاختا تەڭشەك قىستۇرمىسى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "ئېكران چوڭايتقۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "ئېكران ئوقۇغۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "compiz نى ئېكران باشقۇرغۇ قىلىپ ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "ئىشلەتكۈچى لەۋھە ئۇچۇرى تېكىستنى تاللىمىغاندا banner_message_text نىڭ ئورنىغا كۆرسىتىلىدىغان تېكىست." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "compiz نى كۆزنەك باشقۇرغۇ قىلىپ ئىشلەت" @@ -885,8 +861,8 @@ msgid "Whether the timer is currently ticking" msgstr "ۋاقىت خاتىرىلىگۈچ ئۆزگىرىۋاتامدۇ يوق" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ" @@ -896,163 +872,42 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "باشقا…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "باشقا ھېساب تاللاڭ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "مېھمان" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "ۋاقىتلىق مېھمان سۈپىتىدە كىرىدۇ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "ئۆزلۈكىدىن تىزىمغا كىر" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "تاللانمىلار تاللانغاندىن كېيىن سىستېمىغا ئۆزلۈكىدىن كىرىدۇ" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "كىرىپ بولغان" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "مەزكۇر ئىشلەتكۈچى ئالماشتۇرۇش قوللانچىقى ھەقسىز دېتالدۇر. سىز ئەركىن يۇمشاق دېتال ۋەخپىسى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە ئۇنى قايتا تارقىتىپ ياكى ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ ئىككىنچى نەشرى ياكى يۇقىرى نەشرىنى ئىشلەتسىڭىز بولىدۇ." - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "بۇ پروگراممىنى تارقىتىشتىكى مەقسەت سىزگە قۇلايلىق ئېلىپ كېلىش، ئەمما سودا ياكى باشقا ئالاھىدە قوللىنىشقا نىسبەتەن ھېچقانداق كاپالەت يوق. GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنى كۆرۈپ تېخىمۇ كۆپ تەپسىلاتقا ئېرىشىڭ." - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "مەزكۇر پروگرامما بىلەن بىرگە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىن بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئۇنداق بولمىسا Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA بىلەن ئالاقە قىلىڭ. " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "ئىشلەتكۈچىلەرنى تېز ئالماشتۇرۇش ئۈچۈن ئىشلىتىلىدىغان تىزىملىك." - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "Sahran \n" -"Gheyret T.Kenji \n" -"Zeper \n" -"Abduxukur Abdurixit " - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "ئېكراننى قۇلۇپلىغىلى بولمىدى: %s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "ئېكران قوغدىغۇچنى ۋاقىتلىق قۇرۇق ئېكران قىلىپ تەڭشىگىلى بولمىدى: %s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "تىزىمدىن چىقالمىدى: %s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "ئىشلىتىلىشچان" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "يوشۇرۇن" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "ئالدىراش" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "يوق" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "ھېساب ئۇچۇرى" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "سىستېما مايىللىقى" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "ئېكراننى قۇلۇپلا" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "ئىشلەتكۈچى ئالماشتۇر" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "چېكىن…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "ئىشلەتكۈچى ئالماشتۇرۇش قوللانچاق پروگراممىسى" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "ھېساب تەڭشەكلىرى ۋە ھالەتنى ئۆزگەرت" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "ئىشلەتكۈچىلەرنى چاپسان ئالماشتۇرۇش تىزىملىكى" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ قوللانچاق زاۋۇتى" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلە(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "ھەققىدە(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "ئىشلەتكۈچى ۋە گۇرۇپپا تەھرىرلە(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "پەقەت VERSION نىڭ بۇيرۇقىنىلا ئىشلەتكىلى بولىدۇ" #: ../utils/gdmflexiserver.c:61 msgid "COMMAND" -msgstr "COMMAND" +msgstr "بۇيرۇق" #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 @@ -1081,15 +936,144 @@ msgid "Unable to start new display" msgstr "يېڭى ئېكراننى باشلىغىلى بولمىدى" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "ئېكران كەسمىسى تۇتۇلدى" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "ئېكراننى رەسىمگە تۇت" +#~ msgid "Shutdown Options…" +#~ msgstr "تاقاش تاللانما…" + +#~ msgid "Keyboard layouts" +#~ msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" + +#~ msgid "_Keyboard:" +#~ msgstr "ھەرپتاختا(_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "باشقا…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "ھەرپتاختا تىزىملىكىدىن ھەرپتاختا تاللاڭ." + +#~ msgid "Keyboard" +#~ msgstr "ھەرپتاختا" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "ئالدىنقى قېتىم تاللانغان ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "" +#~ "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى ھەرپتاختا ئورۇنلاشتۇرۇش " +#~ "تەڭشىكى." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "مەزكۇر ئىشلەتكۈچى ئالماشتۇرۇش قوللانچىقى ھەقسىز دېتالدۇر. سىز ئەركىن " +#~ "يۇمشاق دېتال ۋەخپىسى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە " +#~ "ئۇنى قايتا تارقىتىپ ياكى ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ " +#~ "ئىككىنچى نەشرى ياكى يۇقىرى نەشرىنى ئىشلەتسىڭىز بولىدۇ." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "بۇ پروگراممىنى تارقىتىشتىكى مەقسەت سىزگە قۇلايلىق ئېلىپ كېلىش، ئەمما سودا " +#~ "ياكى باشقا ئالاھىدە قوللىنىشقا نىسبەتەن ھېچقانداق كاپالەت يوق. GNU " +#~ "ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنى كۆرۈپ تېخىمۇ كۆپ تەپسىلاتقا ئېرىشىڭ." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "مەزكۇر پروگرامما بىلەن بىرگە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىن " +#~ "بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئۇنداق بولمىسا Free Software Foundation, Inc., " +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA بىلەن ئالاقە " +#~ "قىلىڭ. " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "ئىشلەتكۈچىلەرنى تېز ئالماشتۇرۇش ئۈچۈن ئىشلىتىلىدىغان تىزىملىك." + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Gheyret Kenji \n" +#~ "Sahran" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "ئېكراننى قۇلۇپلىغىلى بولمىدى: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "" +#~ "ئېكران قوغدىغۇچنى ۋاقىتلىق قۇرۇق ئېكران قىلىپ تەڭشىگىلى بولمىدى: %s" + +#~ msgid "Can't log out: %s" +#~ msgstr "تىزىمدىن چىقالمىدى: %s" + +#~ msgid "Available" +#~ msgstr "بار" + +#~ msgid "Invisible" +#~ msgstr "يوشۇرۇن" + +#~ msgid "Busy" +#~ msgstr "ئالدىراش" + +#~ msgid "Away" +#~ msgstr "يوق" + +#~ msgid "Account Information" +#~ msgstr "ھېساب ئۇچۇرى" + +#~ msgid "System Preferences" +#~ msgstr "سىستېما مايىللىقى" + +#~ msgid "Lock Screen" +#~ msgstr "ئېكراننى قۇلۇپلاش" + +#~ msgid "Switch User" +#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش" + +#~ msgid "Quit…" +#~ msgstr "چېكىن…" + +#~ msgid "User Switch Applet" +#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش قوللانچاق پروگراممىسى" + +#~ msgid "Change account settings and status" +#~ msgstr "ھېساب تەڭشەكلىرى ۋە ھالەتنى ئۆزگەرت" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "ئىشلەتكۈچىلەرنى چاپسان ئالماشتۇرۇش تىزىملىكى" + +#~ msgid "User Switcher" +#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ قوللانچاق زاۋۇتى" + +#~ msgid "Edit Personal _Information" +#~ msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلە(_I)" + +#~ msgid "_About" +#~ msgstr "ھەققىدە(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "ئىشلەتكۈچى ۋە گۇرۇپپا تەھرىرلە(_E)" + #~ msgid "Unknown" #~ msgstr "نامەلۇم" diff -Nru gdm-2.32.1/po/uk.po gdm-3.0.0/po/uk.po --- gdm-2.32.1/po/uk.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/uk.po 2011-04-04 14:37:16.000000000 +0000 @@ -4,135 +4,135 @@ # Maxim Dziumanenko , 2002-2006 # Oleksandr Kovalenko , 2009 # wanderlust , 2009. +# Korostil Daniel , 2011. msgid "" msgstr "" "Project-Id-Version: gdm 2.5.90.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-26 14:11+0200\n" -"PO-Revision-Date: 2010-03-25 16:41+0300\n" -"Last-Translator: Maxim Dziumanenko \n" -"Language-Team: Ukrainian \n" +"POT-Creation-Date: 2011-03-17 18:30+0200\n" +"PO-Revision-Date: 2011-03-17 18:32+0300\n" +"Last-Translator: Korostil Daniel \n" +"Language-Team: translation@linux.org.ua\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.6.1\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom не є символьним пристроєм" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" -msgstr "ID дисплею" +msgstr "Ідентифікатор екрана" -#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" -msgstr "ID" +msgstr "Ідентифікатор" -#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "Підлеглий менеджер стільниці GNOME" #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "неможливо знайти користувача \"%s\" у системі" +msgstr "неможливо знайти користувача «%s» у системі" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" -msgstr "Неможливо ініціалізувати систему входу" +msgstr "Неможливо запустити систему входу" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" -msgstr "Не вдається автентифікувати користувача" +msgstr "Не вдалось автентифікувати користувача" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Неможливо авторизувати користувача" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" -msgstr "Не вдається встановити довірені відносини" +msgstr "Не вдалось встановити реєстраційні дані" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Неможливо відкрити сеанс" -#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" -"Could not start the X server (your graphical environment) due to some " -"internal error. Please contact your system administrator or check your " -"syslog to diagnose. In the meantime this display will be disabled. Please " -"restart GDM when the problem is corrected." -msgstr "" -"Не вдається запустити X-сервер (ваше графічне середовище) через внутрішню " -"помилку. Зверніться до системного адміністратора або перегляньте системний " -"журнал.Через деякий час цей дисплей буде вимкнено. Будь ласка, " -"перезавантажте GDM, коли проблема буде вирішена." +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Не вдалось запустити сервер X (ваше графічне середовище) через внутрішню " +"помилку. Будь ласка, зверніться до системного адміністратора або перегляньте " +"системний журнал. Через деякий час цей дисплей буде вимкнено. Будь ласка, " +"перезавантажте GDM, коли проблема буде вирішено." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" -msgstr "%s: не вдається з'єднатись з батьківським дисплеєм '%s'" +msgstr "%s: не вдалось з'єднатись з батьківським екраном «%s»" -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "Сервер був запущений користувачем %s, але цей користувач не існує" +msgstr "Сервер запущено користувачем %s, але цього користувача не існує" -#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" -msgstr "Не вдається встановити groupid %d" +msgstr "Не вдалось встановити groupid для %d" -#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "Помилка initgroups() для %s" -#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" -msgstr "Не вдається встановити userid у %d" - -#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "Не вдається встановити groupid у 0" +msgstr "Не вдалось встановити userid для %d" -#: ../daemon/gdm-server.c:431 +#: ../daemon/gdm-server.c:435 #, c-format -msgid "%s: Could not open logfile for display %s!" -msgstr "%s: Не вдається відкрити файл журналу для дисплея %s!" +msgid "%s: Could not open log file for display %s!" +msgstr "%s: не вдалось відкрити файл журналу для екрана %s!" -#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" -msgstr "%s: Помилка встановлення %s у %s" +msgstr "%s: помилка налаштування %s для %s" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" -msgstr "%s: Пріоритет сервера треба встановити у %d: %s" +msgstr "%s: Пріоритет сервера неможливо вказати для %d: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" -msgstr "%s: Не вказана команда програми сервера для дисплея %s" +msgstr "%s: порожня команда програми сервера для екрана %s" #: ../daemon/gdm-session-auditor.c:90 msgid "Username" -msgstr "Ім'я користувача" +msgstr "Користувач" #: ../daemon/gdm-session-auditor.c:91 msgid "The username" -msgstr "Ім'я користувача" +msgstr "Користувач" #: ../daemon/gdm-session-auditor.c:95 msgid "Hostname" @@ -144,226 +144,223 @@ #: ../daemon/gdm-session-auditor.c:101 msgid "Display Device" -msgstr "Пристрій відображення" +msgstr "Пристрій показу" #: ../daemon/gdm-session-auditor.c:102 msgid "The display device" -msgstr "Пристрій відображення" +msgstr "Пристрій показу" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" -msgstr "помилка початкового обміну з системою автентифікації - %s" +msgstr "помилка початкового обміну з системою автентифікації — %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" -msgstr "загальна відмова в роботі" +msgstr "загальна помилка" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "немає вільної пам'яті" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" -msgstr "помилка програміста системи" +msgstr "помилка програміста програми" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "невідома помилка" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Користувач:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" -msgstr "" -"помилка сповіщення автентифікаційної системи підтримуваного запиту імені " -"користувача - %s" +msgid "error informing authentication system of preferred username prompt: %s" +msgstr "помилка сповіщення системи автентифікації запиту користувача: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "" -"помилка сповіщення автентифікаційної системи назви вузла користувача - %s" +msgid "error informing authentication system of user's hostname: %s" +msgstr "помилка сповіщення системи автентифікації назви вузла користувача: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "помилка сповіщення автентифікаційної системи консолі користувача - %s" +msgid "error informing authentication system of user's console: %s" +msgstr "помилка сповіщення системи автентифікації консолі користувача: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "помилка сповіщення автентифікаційної системи рядка екрану - %s" +msgid "error informing authentication system of display string: %s" +msgstr "помилка сповіщення системи автентифікації рядка екрана: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" -msgstr "помилка сповіщення автентифікаційної системи паролю екрану xauth - %s" +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "" +"помилка сповіщення системи автентифікації реєстрації даних екрана xauth: %s" -#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "недоступний обліковий запис користувача" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Неможливо змінити користувача" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Користувач %s не існує" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Група %s не існує" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" -msgstr "Не вдається створити сокет!" +msgstr "Не вдалось створити гніздо!" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" -msgstr "Отримано відмову на запит XDMCP від комп'ютера %s" +msgstr "Отримано відмову на запит XDMCP від вузла %s" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" -msgstr "Не вдається виділити перелік авторизації з пакету" +msgstr "Не вдалось виділити перелік авторизації з пакету" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Помилка в контрольній сумі" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" -msgstr "Невірна адреса" +msgstr "Неправильна адреса" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" -msgstr "%s: не вдається зчитати адресу дисплея" +msgstr "%s: не вдалось зчитати адресу екрана" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" -msgstr "%s: не вдається зчитати номер порта дисплея" +msgstr "%s: не вдалось зчитати номер порту екрана" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" -msgstr "%s: не вдається виділити список авторизації з пакету" +msgstr "%s: не вдалось виділити список авторизації з пакету" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: помилка в контрольній сумі" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" -msgstr "%s: отримано REQUEST(запит) від забороненого комп'ютера %s" +msgstr "%s: отримано REQUEST від заблокованого вузла %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" -msgstr "%s: не вдається зчитати номер дисплея" +msgstr "%s: не вдалось зчитати номер екрана" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" -msgstr "%s: не вдається зчитати тип з'єднання" +msgstr "%s: не вдалось зчитати тип з'єднання" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" -msgstr "%s: не вдається зчитати адресу клієнта" +msgstr "%s: не вдалось зчитати адресу клієнта" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" -msgstr "%s: не вдається зчитати імена автентифікації" +msgstr "%s: не вдалось зчитати назви автентифікації" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" -msgstr "%s: не вдається зчитати дані автентифікації" +msgstr "%s: не вдалось зчитати дані автентифікації" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" -msgstr "%s: не вдається зчитати список авторизації" +msgstr "%s: не вдалось зчитати список авторизації" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" -msgstr "%s: Не вдається зчитати ідентифікатор виробника" +msgstr "%s: Не вдалось зчитати ідентифікатор виробника" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" -msgstr "%s: Неправильна контрольна сума з %s" +msgstr "%s: помилкова контрольна сума з %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" -msgstr "" -"%s: отримано Manage(запит обслуговування) від забороненого комп'ютера %s" +msgstr "%s: отримано Manage від заблокованого вузла %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" -msgstr "%s: не вдається зчитати ідентифікатор сеансу" +msgstr "%s: не вдалось зчитати ідентифікатор сеансу" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" -msgstr "%s: не вдається зчитати клас дисплея" +msgstr "%s: не вдалось зчитати клас екрана" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" -msgstr "%s: не вдається зчитати адресу" +msgstr "%s: не вдалось зчитати адресу" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" -msgstr "%s: Отримано KEEPALIVE від забороненого комп'ютера %s" +msgstr "%s: Отримано KEEPALIVE від заблокованого вузла %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -msgstr "GdmXdmcpDisplayFactory: не вдається прочитати заголовок XDMCP!" +msgstr "GdmXdmcpDisplayFactory: не вдалось прочитати заголовок XDMCP!" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" -msgstr "XMDCP: невірна версія XDMCP!" +msgstr "XMDCP: неправильна версія XDMCP!" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: неможливо розібрати адресу" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" -msgstr "Не вдається отримати назву сервера: %s!" +msgstr "Не вдалось отримати назву вузла: %s!" #: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" -msgstr "Неможливо записати PID-файл %s: можливо, немає місця на диску: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" +msgstr "Неможливо записати файл PID %s: можливо, немає місця на диску: %s" #: ../daemon/main.c:271 #, c-format @@ -373,108 +370,110 @@ #: ../daemon/main.c:287 #, c-format msgid "Authdir %s does not exist. Aborting." -msgstr "Каталог авторизації %s не існує. Аварійне завершення." +msgstr "Каталог авторизації %s не існує. Скасування." #: ../daemon/main.c:291 #, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "Каталог авторизації %s не є каталогом. Аварійне завершення." +msgstr "Каталог авторизації %s не є каталогом. Скасування." #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "" -"Каталог авторизації %s не належить користувачу %d, групі %d. Аварійне " -"завершення!" +"Каталог авторизації %s не належить користувачу %d, групі %d. Скасування." #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "" -"Каталог авторизації %s має помилкові права %o. Мають бути %o. Аварійне " -"завершення!" +"Каталог авторизації %s має помилкові права %o. Мають бути %o. Скасування." #: ../daemon/main.c:409 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "Не знайдено користувача GDM '%s'. Аварійне завершення!" +msgstr "Не знайдено користувача GDM «%s». Скасування!" #: ../daemon/main.c:415 msgid "The GDM user should not be root. Aborting!" -msgstr "Користувачем GDM не може бути root. Аварійне завершення!" +msgstr "Користувачем GDM не може бути root. Скасування!" #: ../daemon/main.c:421 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "Не знайдено групу GDM %s. Аварійне завершення!" +msgstr "Не знайдено групу GDM «%s». Скасування!" #: ../daemon/main.c:427 msgid "The GDM group should not be root. Aborting!" -msgstr "Група GDM не повинна бути групою root. Припинення роботи!" +msgstr "Група GDM не повинна бути групою root. Скасування!" #: ../daemon/main.c:533 msgid "Make all warnings fatal" -msgstr "Робити всі застереження критичними" +msgstr "Зробити всі попередження критичними" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "Вийти після сплину часу - для налагодження" +msgid "Exit after a time (for debugging)" +msgstr "Вийти через деякий час (для зневадження)" #: ../daemon/main.c:535 msgid "Print GDM version" -msgstr "Вивести версію GDM" +msgstr "Показати версію GDM" #: ../daemon/main.c:550 msgid "GNOME Display Manager" -msgstr "Менеджер робочого столу GNOME" +msgstr "Менеджер стільниці GNOME" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Лише адміністратор (root) може запускати GDM" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" -msgstr "GNOME Display Manager Session Worker" +msgstr "Менеджер роботи стільничого сеансу GNOME" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "" -"Пакувальник реєстру постачальника послуг інтерфейсу зручних технологій (AT " -"SPI)" +msgid "AT-SPI Registry Wrapper" +msgstr "Обгортка реєстру AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Вікно входу в систему" #: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 msgid "Power Manager" -msgstr "Керівник живленням" +msgstr "Керування живленням" #: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 msgid "Power management daemon" -msgstr "Даемон керування живленням" +msgstr "Служба керування живленням" + +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Сеанс прискореної перевірки GNOME" #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" -msgstr "Даемон налаштування GNOME" +msgstr "Служба налаштування GNOME" #: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 msgid "GNOME Screen Magnifier" -msgstr "Лупа стільниці GNOME" +msgstr "Лупа для екрана GNOME" #: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 msgid "Magnify parts of the screen" -msgstr "Збільшити частини екрану" +msgstr "Збільшити частини екрана" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "Екранна клавіатура GNOME" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" -msgstr "Використовувати наекранну клавіатуру" +msgid "Use an on-screen keyboard" +msgstr "Використовувати екранну клавіатуру" #: ../data/greeter-autostart/metacity.desktop.in.h:1 msgid "Metacity" @@ -482,7 +481,7 @@ #: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 msgid "Orca Screen Reader" -msgstr "Читач екрану Orca" +msgstr "Зчитувач екрана Orca" #: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 msgid "Present on-screen information as speech or braille" @@ -492,50 +491,50 @@ msgid "PolicyKit Authentication Agent" msgstr "Агент автентифікації PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Виберіть систему" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" -msgstr "XDMCP: Не вдається створити буфер XDMCP!" +msgstr "XDMCP: не вдалось створити буфер XDMCP!" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" -msgstr "XDMCP: не вдається прочитати заголовок XDMCP!" +msgstr "XDMCP: не вдалось прочитати заголовок XDMCP!" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Значення" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "відсотків часу до завершення" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Неактивний текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "" -"Текст, що буде вкористаний, в мітках, якщо користувач ще не вибрав значення" +"Текст, що буде використано в мітках, якщо користувач ще не вибрав об'єкт" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Активний текст" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "Текст, що буде використаний, в мітках, якщо користувач вибрав значення" +msgstr "Текст, що буде використано в мітках, якщо користувач вибрав об'єкт" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" -msgstr "Показувати список" +msgstr "Список видимий" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" -msgstr "Чи виводиться список входу" +msgstr "Чи показувати список вибору" #. translators: This is the time format to use when both #. * the date and time with seconds are being shown together. @@ -558,14 +557,6 @@ msgid "%a %l:%M:%S %p" msgstr "%a %k:%M:%S" -#. translators: This is the time format to use for the date -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:87 -#: ../gui/simple-greeter/gdm-clock-widget.c:94 -#, c-format -msgid "%x" -msgstr "%x" - #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. @@ -573,155 +564,153 @@ msgid "%a %l:%M %p" msgstr "%a %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." -msgstr "Автоматичний вхід у систему..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +msgid "Automatically logging in…" +msgstr "Автоматичний вхід у систему…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 +msgid "Select language and click Log In" +msgstr "Виберіть мову та натисніть «Увійти»" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +msgid "Cancelling…" msgstr "Скасування..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 -msgid "Select language and click Log In" -msgstr "Виберіть мову та натисніть \"Увійти\"" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Власне" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Власний сеанс" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -msgid "Computer Name" -msgstr "Назва компьютера" +msgid "Cancel" +msgstr "Скасувати" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" -msgstr "Увійти" +msgid "Computer Name" +msgstr "Назва комп'ютера" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 -msgid "Version" -msgstr "Версія" +msgid "Login" +msgstr "Увійти" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "Панель" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Розблокувати" -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "Параметри вимикання..." +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 +msgid "Version" +msgstr "Версія" -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" -msgstr "Режим сну" +msgstr "Приспати" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Перезапустити" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Вимкнути" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Залишилась невідома кількість часу" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Панель" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Мови" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "_Мови:" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "_Мова:" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 msgctxt "language" -msgid "Other..." -msgstr "Інший..." +msgid "Other…" +msgstr "Інша…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Виберіть мову з повного переліку наявних мов." -#: ../gui/simple-greeter/gdm-languages.c:698 -msgid "Unspecified" -msgstr "Не визначено" - -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Розкладки клавіатури" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "_Клавіатура:" +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +msgid "Language" +msgstr "Мова" -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "Інший..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Виберіть розкладку клавіатури з повного переліку наявних розкладок." +#: ../gui/simple-greeter/gdm-languages.c:709 +msgid "Unspecified" +msgstr "Не вказано" -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Текст міток" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "Текст, що використовується у мітках" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Назва піктограми" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Піктограма, що використовується з міткою" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" -msgstr "Елемент за замовчуванням" +msgstr "Типовий об'єкт" -#: ../gui/simple-greeter/gdm-option-widget.c:525 +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" -msgstr "ID типового елемента" +msgstr "ID типового об'єкта" #: ../gui/simple-greeter/gdm-recent-option-widget.c:310 msgid "Max Item Count" -msgstr "Найбільша кількість елементів" +msgstr "Найбільша кількість об'єктів" #: ../gui/simple-greeter/gdm-recent-option-widget.c:311 msgid "The maximum number of items to keep around in the list" -msgstr "Найбільша кількість елементів у переліку" +msgstr "Найбільша кількість об'єктів у переліку" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "Віддалений вхід (з'єднання з %s...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "Віддалений вхід (з'єднання з %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format msgid "Remote Login (Connected to %s)" -msgstr "Віддвлений вхід (Connected to %s)" +msgstr "Віддалений вхід (з'єднано з %s)" #: ../gui/simple-greeter/gdm-remote-login-window.c:281 msgid "Remote Login" msgstr "Віддалений вхід" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Сеанси:" +msgid "Session" +msgstr "Сеанс" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" -msgstr "Текст повідомлення заголовку" +msgstr "Текст повідомлення заголовка" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 msgid "Banner message text when chooser is empty" @@ -741,7 +730,7 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 msgid "Enable on-screen keyboard" -msgstr "Увімкнути наекранну клавіатуру" +msgstr "Увімкнути екранну клавіатуру" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 msgid "Enable screen magnifier" @@ -749,136 +738,122 @@ #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 msgid "Enable screen reader" -msgstr "Увімкнути читача екрану" +msgstr "Увімкнути зчитувача екрана" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 msgid "Enable showing the banner message" -msgstr "Увімкнути показ повідомлення заголовку" +msgstr "Увімкнути показ повідомлення заголовка" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 msgid "Icon name to use for greeter logo" msgstr "Назва піктограми, що буде використана для логотипу привітання" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Нещодавно вибрані розкладки клавіатури" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Нещодавно вибрані мови" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +msgid "Set to a list of languages to be shown by default in the login window." +msgstr "Встановити перелік мов, що типово буде показано у вікні входу." + #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default at the login window." +msgid "Set to the themed icon name to use for the greeter logo." msgstr "" -"Встановити перелік розкладок клавіатури, що будуть показані за замовчуванням " -"у вікні входу." +"Встановити тематичну назву піктограм для використання у логотипі привітання." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr "" -"Встановити перелік мов, що будуть показані за замовчуванням у вікні входу." +msgid "Set to true to disable showing known users in the login window." +msgstr "Встановити так, щоб вимкнути показ відомих користувачів у вікні входу." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "Set to the themed icon name to use for the greeter logo." +msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" -"Встановити тематичну назву піктограм для використання у логотипі привітання." +"Встановити так, щоб вимкнути показ кнопки перезавантаження у вікні входу." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to true to disable showing known users in the login window." -msgstr "" -"Встановити \"Так\", щоб вимкнути показ відомих користувачів у вікні входу." +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "Встановити так, щоб увімкнути додаток менеджера налаштувань XRandR." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 -msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" -"Встановити \"Так\", щоб вимкнути показ кнопки перезавантаження у вікні входу." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the background settings manager plugin." -msgstr "Встановити \"Так\", щоб увімкнути додаток менеджера параметрів тла." +msgstr "Встановити так, щоб увімкнути додаток менеджера налаштування тла." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "" -"Встановити \"Так\", щоб увімкнути додаток менеджера параметрів медіа-клавіш." +"Встановити так, щоб увімкнути додаток менеджера налаштувань медіаклавіш." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." -msgstr "Встановити \"Так\", щоб увімкнути додаток екранної клавіатури." +msgstr "Встановити так, щоб увімкнути додаток екранної клавіатури." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "" -"Встановити \"Так\", щоб увімкнути додаток керування доступністю налаштувань " +"Встановити так, щоб увімкнути додаток керування доступністю налаштувань " "клавіатури." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." -msgstr "Встановити \"Так\", щоб увімкнути екранну лупу." +msgstr "Встановити так, щоб увімкнути екранну лупу." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." -msgstr "Встановити \"Так\", щоб увімкнути читач екрану." +msgstr "Встановити так, щоб увімкнути зчитувача екрана." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." -msgstr "Встановити \"Так\", щоб увімкнути додаток налаштувань звуку." +msgstr "Встановити так, щоб увімкнути додаток налаштувань звуку." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +msgid "Set to true to enable the xsettings settings manager plugin." +msgstr "Встановити так, щоб увімкнути додаток менеджера налаштувань xsettings." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "Встановити \"Так\", щоб увімкнути додаток менеджера параметрів xrandr." +msgid "Set to true to show the banner message text." +msgstr "Встановити так, щоб показати текст повідомлення заголовка." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 -msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "" -"Встановити \"Так\", щоб увімкнути додаток менеджера параметрів xsettings." +msgid "Set to true to use Compiz as the window manager." +msgstr "Встановити так, щоб використати Compiz як менеджер вікон." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -msgid "Set to true to show the banner message text." -msgstr "Встановити \"Так\", щоб показати текст повідомлення заголовку" +msgid "" +"Text banner message to show in the login window when the user chooser is " +"empty, instead of banner_message_text." +msgstr "" +"Текст повідомлення, що буде показано у вікні входу, коли воно порожнє, " +"замість banner_message_text." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." -msgstr "Встановити \"Так\", щоб використовувати compiz як менеджер вікон" +msgid "Text banner message to show in the login window." +msgstr "Текст повідомлення заголовка, що буде показано у вікні входу." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "" -"Text banner message to show on the login window when the user chooser is " -"empty, instead of banner_message_text." -msgstr "" -"Текст повідомлення, що буде показаний у вікні входу, коли воно порожнє, " -"замість banner_message_text" +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "Так, якщо додаток менеджера налаштувань XRandR увімкнено." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." -msgstr "Текст повідомлення заголовку, що буде показаний у вікні входу." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the background settings manager plugin is enabled." -msgstr "\"Так\", якщо додаток фонового менеджера параметрів увімкнений." +msgstr "Так, якщо додаток менеджера налаштувань тла ввімкнено." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." -msgstr "\"Так\", якщо додаток менеджера параметрів медіа-клавіш увімкнений." +msgstr "Так, якщо додаток менеджера налаштувань медіаклавіш увімкнено." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." -msgstr "\"Так\", якщо додаток менеджера параметрів звуку увімкнений." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "\"Так\", якщо додаток менеджера параметрів xrandr увімкнений." +msgstr "Так, якщо додаток менеджера налаштувань звуку ввімкнено." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." -msgstr "\"Так\", якщо додаток менеджера параметрів xsettings увімкнений." +msgstr "Так, якщо додаток менеджера налаштувань xsettings увімкнено." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" -msgstr "Використовувати compiz у якості менеджера вікон" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +msgid "Use Compiz as the window manager" +msgstr "Використати Compiz як менеджер вікон" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -886,7 +861,7 @@ #: ../gui/simple-greeter/gdm-timer.c:150 msgid "Number of seconds until timer stops" -msgstr "Кількість секунд до того як таймер зупиниться" +msgstr "Кількість секунд, поки таймер не зупиниться" #: ../gui/simple-greeter/gdm-timer.c:157 msgid "Start time" @@ -894,240 +869,240 @@ #: ../gui/simple-greeter/gdm-timer.c:158 msgid "Time the timer was started" -msgstr "Час, коли запущений таймер" +msgstr "Час, коли запущено таймер" #: ../gui/simple-greeter/gdm-timer.c:165 msgid "Is it Running?" -msgstr "Запущений?" +msgstr "Запущено?" #: ../gui/simple-greeter/gdm-timer.c:166 msgid "Whether the timer is currently ticking" -msgstr "Увімкнений чи ні зараз таймер" +msgstr "Чи таймер зараз увімкнено" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "Керівник" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "Об'єкт керівника користувача, яким керується користувач." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "Увійти як %s" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" -msgid "Other..." -msgstr "Інші..." +msgid "Other…" +msgstr "Інший…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" -msgstr "Виберіть інший обліковий запис" +msgstr "Вибрати інший обліковий запис" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Гість" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +msgid "Log in as a temporary guest" msgstr "Увійти як тимчасовий користувач" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Автоматичний вхід" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" -msgstr "Автоматично входити у систему після вибору опцій" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "Увійшов як %s" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +msgid "Automatically log into the system after selecting options" +msgstr "Автоматично входити у систему після вибору параметрів" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" -msgstr "Вже увішов" +msgstr "Уже увійшов" -#: ../gui/user-switch-applet/applet.c:164 -msgid "" -"The User Switch Applet 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." -msgstr "" -"Аплет перемикання користувачів є вільним програмним забезпеченням; ви можете " -"розповсюджувати та/або змінювати його в рамках GNU General Public License що " -"видана Free Software Foundation; або версії 2 ліцензії або (на ваш вибір) " -"пізнішою версією." +#: ../utils/gdmflexiserver.c:61 +msgid "Only the VERSION command is supported" +msgstr "Підтримується лише команда VERSION" -#: ../gui/user-switch-applet/applet.c:168 -msgid "" -"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." -msgstr "" -"Ця програма розповсюджується з надією, що буде корисною, але БЕЗ БУДЬ-ЯКИХ " -"ЗОБОВ'ЯЗАНЬ; навіть без зобов'язань КОМЕРЦІЙНИХ СПРОМОЖНОСТЕЙ або КОРИСНОСТІ " -"ДЛЯ ЗАДАНОЇ МЕТИ. Дивіться General Public License для подробиць." +#: ../utils/gdmflexiserver.c:61 +msgid "COMMAND" +msgstr "КОМАНДА" -#: ../gui/user-switch-applet/applet.c:172 -msgid "" -"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 " -msgstr "" -"Вам слід отримати копію GNU General Public License разом з цією програмиою; " -"якщо ні, напишіть до Free Software Foundation, Inc., 51 Franklin Street, " -"Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "Меню для швидкого перемикання між користувачами." +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +msgid "Ignored — retained for compatibility" +msgstr "Пропущено — збережено для сумісності" -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "" -"Yuri Syrota \n" -"Maxim Dziumanenko \n" -"Oleksandr Kovalenko " +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +msgid "Debugging output" +msgstr "Вивід зневадження" -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Неможливо заблокувати екран: %s" +#: ../utils/gdmflexiserver.c:68 +msgid "Version of this application" +msgstr "Версія цієї програми" -#: ../gui/user-switch-applet/applet.c:671 +#: ../utils/gdmflexiserver.c:675 #, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Неможливо тимчасово встановити зберігач екрану у порожній екран: %s" +msgid "Could not identify the current session." +msgstr "Неможливо розпізнати поточний сеанс." -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "Неможливо вийти: %s" +#. Option parsing +#: ../utils/gdmflexiserver.c:711 +msgid "- New GDM login" +msgstr "— Новий вхід GDM" -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "Доступий" +#: ../utils/gdmflexiserver.c:767 +msgid "Unable to start new display" +msgstr "Не вдалось запустити новий екран" -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "Невидимий" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "Знімок екрана зроблено" -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "Зайнятий" +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "Зробити знімок екрана" -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "Відійшов" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "Не вдається встановити groupid у 0" -#: ../gui/user-switch-applet/applet.c:1133 -msgid "Account Information" -msgstr "Інформація про обліковий запис" +#~ msgid "%x" +#~ msgstr "%x" -#: ../gui/user-switch-applet/applet.c:1145 -msgid "System Preferences" -msgstr "Параметри системи" +#~ msgid "Log In" +#~ msgstr "Увійти" -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "Заблокувати" +#~ msgid "Shutdown Options..." +#~ msgstr "Параметри вимикання..." -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "Змінити користувача" +#~ msgid "Keyboard layouts" +#~ msgstr "Розкладки клавіатури" -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "Вийти..." +#~ msgid "_Keyboard:" +#~ msgstr "_Клавіатура:" -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "Невідомо" +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Інший..." -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Аплет перемикання користувачів" +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "Виберіть розкладку клавіатури з повного переліку наявних розкладок." -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "Змінити налаштування облікого запису та стан" +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Нещодавно вибрані розкладки клавіатури" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Меню для швидкого перемикання користувачів" +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "Встановити перелік розкладок клавіатури, що будуть показані за " +#~ "замовчуванням у вікні входу." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Перемикач користувачів" +#~ msgid "Manager" +#~ msgstr "Керівник" -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Фабрика аплету перемикання користувачів" +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "Об'єкт керівника користувача, яким керується користувач." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Редагувати особисту _інформацію" +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Аплет перемикання користувачів є вільним програмним забезпеченням; ви " +#~ "можете розповсюджувати та/або змінювати його в рамках GNU General Public " +#~ "License що видана Free Software Foundation; або версії 2 ліцензії або (на " +#~ "ваш вибір) пізнішою версією." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Про" +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Ця програма розповсюджується з надією, що буде корисною, але БЕЗ БУДЬ-" +#~ "ЯКИХ ЗОБОВ'ЯЗАНЬ; навіть без зобов'язань КОМЕРЦІЙНИХ СПРОМОЖНОСТЕЙ або " +#~ "КОРИСНОСТІ ДЛЯ ЗАДАНОЇ МЕТИ. Дивіться General Public License для " +#~ "подробиць." -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Редагувати користувачів та групи" +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Вам слід отримати копію GNU General Public License разом з цією " +#~ "програмиою; якщо ні, напишіть до Free Software Foundation, Inc., 51 " +#~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " -#: ../utils/gdmflexiserver.c:61 -msgid "Only the VERSION command is supported" -msgstr "Підтримується лише команда VERSION" +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Меню для швидкого перемикання між користувачами." -#: ../utils/gdmflexiserver.c:61 -msgid "COMMAND" -msgstr "КОМАНДА" +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Yuri Syrota \n" +#~ "Maxim Dziumanenko \n" +#~ "Oleksandr Kovalenko " -#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 -#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" -msgstr "Пропущено - збережено для сумістності" +#~ msgid "Can't lock screen: %s" +#~ msgstr "Неможливо заблокувати екран: %s" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -msgid "Debugging output" -msgstr "Налагоджувальний вивід" +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Неможливо тимчасово встановити зберігач екрану у порожній екран: %s" -#: ../utils/gdmflexiserver.c:68 -msgid "Version of this application" -msgstr "Версія цього додатку" +#~ msgid "Can't logout: %s" +#~ msgstr "Неможливо вийти: %s" -#: ../utils/gdmflexiserver.c:675 -#, c-format -msgid "Could not identify the current session." -msgstr "Неможливо розпізнати поточний сеанс." +#~ msgid "Available" +#~ msgstr "Доступий" -#. Option parsing -#: ../utils/gdmflexiserver.c:711 -msgid "- New GDM login" -msgstr "- Новий вхід gdm" +#~ msgid "Invisible" +#~ msgstr "Невидимий" -#: ../utils/gdmflexiserver.c:767 -msgid "Unable to start new display" -msgstr "Не вдається запустити новий дисплей" +#~ msgid "Busy" +#~ msgstr "Зайнятий" -#: ../utils/gdm-screenshot.c:216 -msgid "Screenshot taken" -msgstr "Знімок зроблено" +#~ msgid "Away" +#~ msgstr "Відійшов" -#. Option parsing -#: ../utils/gdm-screenshot.c:281 -msgid "Take a picture of the screen" -msgstr "Зробити знімок екрану" +#~ msgid "Account Information" +#~ msgstr "Інформація про обліковий запис" + +#~ msgid "System Preferences" +#~ msgstr "Параметри системи" + +#~ msgid "Lock Screen" +#~ msgstr "Заблокувати" + +#~ msgid "Switch User" +#~ msgstr "Змінити користувача" + +#~ msgid "Quit..." +#~ msgstr "Вийти..." + +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgid "User Switch Applet" +#~ msgstr "Аплет перемикання користувачів" + +#~ msgid "Change account settings and status" +#~ msgstr "Змінити налаштування облікого запису та стан" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Меню для швидкого перемикання користувачів" + +#~ msgid "User Switcher" +#~ msgstr "Перемикач користувачів" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Фабрика аплету перемикання користувачів" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Редагувати особисту _інформацію" +#~ msgid "_About" +#~ msgstr "_Про" +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Редагувати користувачів та групи" diff -Nru gdm-2.32.1/po/vi.po gdm-3.0.0/po/vi.po --- gdm-2.32.1/po/vi.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/vi.po 2011-04-04 14:37:16.000000000 +0000 @@ -1,16 +1,16 @@ # Vietnamese translation for GDM2. # Copyright © 2010 GNOME i18n Project for Vietnamese. # This file is distributed under the same license as the gdm2 package. -# Nguyễn Thái Ngọc Duy , 2002-2004. +# Nguyễn Thái Ngọc Duy , 2002-2004,2011. # Clytie Siddall , 2005-2010. # msgid "" msgstr "" "Project-Id-Version: gdm2 GNOME TRUNK\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" -"POT-Creation-Date: 2010-02-08 22:00+0000\n" -"PO-Revision-Date: 2010-03-22 23:28+0930\n" -"Last-Translator: Clytie Siddall \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 13:45+0000\n" +"PO-Revision-Date: 2011-03-26 17:02+0700\n" +"Last-Translator: Nguyễn Thái Ngọc Duy \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,29 +18,23 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.8\n" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "« /dev/urandom » không phải là một thiết bị ký tự" -#: ../daemon/factory-slave-main.c:177 -#: ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 -#: ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "Display ID" msgstr "Mã số bộ trình bày" -#: ../daemon/factory-slave-main.c:177 -#: ../daemon/product-slave-main.c:181 -#: ../daemon/simple-slave-main.c:183 -#: ../daemon/xdmcp-chooser-slave-main.c:183 +#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 +#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 msgid "ID" msgstr "Mã số" -#: ../daemon/factory-slave-main.c:189 -#: ../daemon/product-slave-main.c:193 -#: ../daemon/simple-slave-main.c:195 -#: ../daemon/xdmcp-chooser-slave-main.c:195 +#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 +#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 msgid "GNOME Display Manager Slave" msgstr "Trình quản lý bộ trình bày GNOME phụ" @@ -49,89 +43,90 @@ msgid "could not find user \"%s\" on system" msgstr "không tìm thấy người dùng « %s » trên hệ thống" -#: ../daemon/gdm-factory-slave.c:203 -#: ../daemon/gdm-simple-slave.c:225 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "Không thể sơ khởi hệ thống đăng nhập" -#: ../daemon/gdm-factory-slave.c:235 -#: ../daemon/gdm-simple-slave.c:261 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "Không thể xác thực người dùng" -#: ../daemon/gdm-factory-slave.c:257 -#: ../daemon/gdm-simple-slave.c:315 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "Không thể cho phép người dùng" -#: ../daemon/gdm-factory-slave.c:279 -#: ../daemon/gdm-simple-slave.c:443 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "Không thể thiết lập thông tin xác thực" -#: ../daemon/gdm-factory-slave.c:302 -#: ../daemon/gdm-simple-slave.c:473 -#| msgid "Unable to authorize user" +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "Không thể mở buổi hợp" -#: ../daemon/gdm-factory-slave.c:683 -#: ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1151 -msgid "Could not start the X server (your graphical environment) due to some internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." -msgstr "Không thể khởi chạy trình phục vụ X (môi trường đồ họa) do nguyên nhân nội bộ. Hãy liên lạc với quản trị hệ thống của bạn hoặc kiểm tra syslog (bản ghi hệ thống) để chẩn đoán lỗi. Trong khi đợi, bộ trình bày này sẽ bị tắt. Hãy khởi chạy lại GDM khi vấn đề đã được tháo gỡ." +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 +#| msgid "" +#| "Could not start the X server (your graphical environment) due to some " +#| "internal error. Please contact your system administrator or check your " +#| "syslog to diagnose. In the meantime this display will be disabled. " +#| "Please restart GDM when the problem is corrected." +msgid "" +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Không thể khởi chạy trình phục vụ X (môi trường đồ họa) do nguyên nhân nội " +"bộ. Hãy liên lạc với quản trị hệ thống của bạn hoặc kiểm tra syslog (bản ghi " +"hệ thống) để chẩn đoán lỗi. Trong khi đợi, bộ trình bày này sẽ bị tắt. Hãy " +"khởi chạy lại GDM khi vấn đề đã được tháo gỡ." -#: ../daemon/gdm-server.c:246 +#: ../daemon/gdm-server.c:250 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: lỗi kết nối đến bộ trình bày mẹ « %s »." -#: ../daemon/gdm-server.c:361 +#: ../daemon/gdm-server.c:365 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "Máy phục vụ nên được người dùng %s khởi tạo, nhưng người dùng đó không tồn tại" +msgstr "" +"Máy phục vụ nên được người dùng %s khởi tạo, nhưng người dùng đó không tồn " +"tại" -#: ../daemon/gdm-server.c:372 -#: ../daemon/gdm-welcome-session.c:554 +#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "Không thể đặt mã số nhóm thành %d" -#: ../daemon/gdm-server.c:378 -#: ../daemon/gdm-welcome-session.c:560 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () bị lỗi đối với %s" -#: ../daemon/gdm-server.c:384 -#: ../daemon/gdm-welcome-session.c:566 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "Không thể đặt mã số người dùng thành %d" -#: ../daemon/gdm-server.c:392 -#: ../daemon/gdm-welcome-session.c:574 -msgid "Couldn't set groupid to 0" -msgstr "Không thể đặt mã số nhóm thành 0" - -#: ../daemon/gdm-server.c:431 -#, c-format -msgid "%s: Could not open logfile for display %s!" -msgstr "%s: không thể mở tập tin ghi lưu cho bộ trình bày %s !" - -#: ../daemon/gdm-server.c:442 -#: ../daemon/gdm-server.c:448 -#: ../daemon/gdm-server.c:454 +#: ../daemon/gdm-server.c:435 +#, c-format +#| msgid "%s: Could not open logfile for display %s!" +msgid "%s: Could not open log file for display %s!" +msgstr "%s: Không thể mở tập tin ghi lưu cho bộ trình bày %s!" + +#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 +#: ../daemon/gdm-server.c:458 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: gặp lỗi khi đặt %s thành %s" -#: ../daemon/gdm-server.c:469 +#: ../daemon/gdm-server.c:478 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: không thể đặt mức ưu tiên của máy phục vụ thành %d: %s" -#: ../daemon/gdm-server.c:621 +#: ../daemon/gdm-server.c:631 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: lệnh máy phục vụ rỗng cho bộ trình bày %s." @@ -160,223 +155,231 @@ msgid "The display device" msgstr "Thiết bị trình bày, v.d. màn hình" -#: ../daemon/gdm-session-worker.c:1298 +#: ../daemon/gdm-session-worker.c:1066 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "gặp lỗi khi bắt đầu cuộc thoại với hệ thống xác thực — %s" -#: ../daemon/gdm-session-worker.c:1299 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "lỗi chung" -#: ../daemon/gdm-session-worker.c:1300 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "tràn bộ nhớ" -#: ../daemon/gdm-session-worker.c:1301 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "lỗi lập trình viên ứng dụng" -#: ../daemon/gdm-session-worker.c:1302 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "lỗi không rõ" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "Tên người dùng:" -#: ../daemon/gdm-session-worker.c:1315 +#: ../daemon/gdm-session-worker.c:1083 #, c-format -msgid "error informing authentication system of preferred username prompt - %s" -msgstr "gặp lỗi khi báo hệ thống xác thực về dấu nhắc tên người dùng đã muốn — %s" +#| msgid "" +#| "error informing authentication system of preferred username prompt - %s" +msgid "error informing authentication system of preferred username prompt: %s" +msgstr "gặp lỗi khi báo hệ thống xác thực về dấu nhắc tên người dùng đã muốn: %s" -#: ../daemon/gdm-session-worker.c:1329 +#: ../daemon/gdm-session-worker.c:1097 #, c-format -msgid "error informing authentication system of user's hostname - %s" -msgstr "gặp lỗi khi báo hệ thống xác thực về tên máy của người dùng — %s" +#| msgid "error informing authentication system of user's hostname - %s" +msgid "error informing authentication system of user's hostname: %s" +msgstr "gặp lỗi khi báo hệ thống xác thực về tên máy của người dùng: %s" -#: ../daemon/gdm-session-worker.c:1344 +#: ../daemon/gdm-session-worker.c:1112 #, c-format -msgid "error informing authentication system of user's console - %s" -msgstr "gặp lỗi khi báo hệ thống xác thực về bàn giao tiếp của người dùng — %s" +#| msgid "error informing authentication system of user's console - %s" +msgid "error informing authentication system of user's console: %s" +msgstr "gặp lỗi khi báo hệ thống xác thực về bàn giao tiếp của người dùng: %s" -#: ../daemon/gdm-session-worker.c:1357 +#: ../daemon/gdm-session-worker.c:1125 #, c-format -msgid "error informing authentication system of display string - %s" -msgstr "gặp lỗi khi báo hệ thống xác thực về chuỗi display — %s" +#| msgid "error informing authentication system of display string - %s" +msgid "error informing authentication system of display string: %s" +msgstr "gặp lỗi khi báo hệ thống xác thực về chuỗi display: %s" -#: ../daemon/gdm-session-worker.c:1372 +#: ../daemon/gdm-session-worker.c:1140 #, c-format -msgid "error informing authentication system of display xauth credentials - %s" -msgstr "gặp lỗi khi báo hệ thống xác thực về thông tin xác thực xauth — %s" +#| msgid "" +#| "error informing authentication system of display xauth credentials - %s" +msgid "error informing authentication system of display xauth credentials: %s" +msgstr "gặp lỗi khi báo hệ thống xác thực về thông tin xác thực xauth: %s" -#: ../daemon/gdm-session-worker.c:1661 -#: ../daemon/gdm-session-worker.c:1680 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "không có sẵn tài khoản người dùng" -#: ../daemon/gdm-session-worker.c:1707 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "Không thể chuyển đổi sang người dùng" -#: ../daemon/gdm-welcome-session.c:532 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "Người dùng %s không tồn tại" -#: ../daemon/gdm-welcome-session.c:539 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "Nhóm %s không tồn tại" -#: ../daemon/gdm-xdmcp-display-factory.c:596 +#: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Không thể tạo ổ cắm !" -#: ../daemon/gdm-xdmcp-display-factory.c:865 +#: ../daemon/gdm-xdmcp-display-factory.c:873 #, c-format msgid "Denied XDMCP query from host %s" msgstr "Đã từ chối truy vấn XDMCP từ máy %s" -#: ../daemon/gdm-xdmcp-display-factory.c:1023 -#: ../daemon/gdm-xdmcp-display-factory.c:1247 +#: ../daemon/gdm-xdmcp-display-factory.c:1031 +#: ../daemon/gdm-xdmcp-display-factory.c:1255 msgid "Could not extract authlist from packet" msgstr "Không thể trích lấy authlist (danh sách xác thực) ra gói tin" -#: ../daemon/gdm-xdmcp-display-factory.c:1036 -#: ../daemon/gdm-xdmcp-display-factory.c:1262 +#: ../daemon/gdm-xdmcp-display-factory.c:1044 +#: ../daemon/gdm-xdmcp-display-factory.c:1270 msgid "Error in checksum" msgstr "Lỗi tổng kiểm tra" -#: ../daemon/gdm-xdmcp-display-factory.c:1515 +#: ../daemon/gdm-xdmcp-display-factory.c:1523 msgid "Bad address" msgstr "Địa chỉ sai" -#: ../daemon/gdm-xdmcp-display-factory.c:1599 +#: ../daemon/gdm-xdmcp-display-factory.c:1607 #, c-format msgid "%s: Could not read display address" msgstr "%s: không thể đọc địa chỉ bộ trình bày" -#: ../daemon/gdm-xdmcp-display-factory.c:1607 +#: ../daemon/gdm-xdmcp-display-factory.c:1615 #, c-format msgid "%s: Could not read display port number" msgstr "%s: không thể đọc số hiệu cổng bộ trình bày" -#: ../daemon/gdm-xdmcp-display-factory.c:1616 +#: ../daemon/gdm-xdmcp-display-factory.c:1624 #, c-format msgid "%s: Could not extract authlist from packet" msgstr "%s: không thể trích lấy authlist (danh sách xác thực) ra gói tin" -#: ../daemon/gdm-xdmcp-display-factory.c:1636 +#: ../daemon/gdm-xdmcp-display-factory.c:1644 #, c-format msgid "%s: Error in checksum" msgstr "%s: lỗi tổng kiểm tra" -#: ../daemon/gdm-xdmcp-display-factory.c:2155 +#: ../daemon/gdm-xdmcp-display-factory.c:2200 #, c-format msgid "%s: Got REQUEST from banned host %s" msgstr "%s: nhận được tín hiệu REQUEST (yêu cầu) từ máy bị cấm %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2165 -#: ../daemon/gdm-xdmcp-display-factory.c:2521 -#: ../daemon/gdm-xdmcp-display-factory.c:2775 +#: ../daemon/gdm-xdmcp-display-factory.c:2210 +#: ../daemon/gdm-xdmcp-display-factory.c:2568 +#: ../daemon/gdm-xdmcp-display-factory.c:2822 #, c-format msgid "%s: Could not read Display Number" msgstr "%s: không thể đọc Số hiệu bộ trình bày (Display Number)" -#: ../daemon/gdm-xdmcp-display-factory.c:2172 +#: ../daemon/gdm-xdmcp-display-factory.c:2217 #, c-format msgid "%s: Could not read Connection Type" msgstr "%s: không thể đọc kiểu kết nối (Connection Type)" -#: ../daemon/gdm-xdmcp-display-factory.c:2179 +#: ../daemon/gdm-xdmcp-display-factory.c:2224 #, c-format msgid "%s: Could not read Client Address" msgstr "%s: không thể đọc địa chỉ máy khách (Client Address)" -#: ../daemon/gdm-xdmcp-display-factory.c:2187 +#: ../daemon/gdm-xdmcp-display-factory.c:2232 #, c-format msgid "%s: Could not read Authentication Names" msgstr "%s: không thể đọc các tên xác thực (Authentication Names)" -#: ../daemon/gdm-xdmcp-display-factory.c:2196 +#: ../daemon/gdm-xdmcp-display-factory.c:2241 #, c-format msgid "%s: Could not read Authentication Data" msgstr "%s: không thể đọc dữ liệu xác thực (Authentication Data)" -#: ../daemon/gdm-xdmcp-display-factory.c:2206 +#: ../daemon/gdm-xdmcp-display-factory.c:2251 #, c-format msgid "%s: Could not read Authorization List" msgstr "%s: không thể đọc danh sách xác thực (Authorization List)" -#: ../daemon/gdm-xdmcp-display-factory.c:2225 +#: ../daemon/gdm-xdmcp-display-factory.c:2270 #, c-format msgid "%s: Could not read Manufacturer ID" msgstr "%s: không thể đọc mã số nhà sản xuất (Manufacturer ID)" -#: ../daemon/gdm-xdmcp-display-factory.c:2252 +#: ../daemon/gdm-xdmcp-display-factory.c:2297 #, c-format msgid "%s: Failed checksum from %s" msgstr "%s: lỗi tổng kiểm tra (checksum) từ %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2505 +#: ../daemon/gdm-xdmcp-display-factory.c:2552 #, c-format msgid "%s: Got Manage from banned host %s" msgstr "%s: nhận được tín hiệu Manage (quản lý) từ máy bị cấm %s." -#: ../daemon/gdm-xdmcp-display-factory.c:2514 -#: ../daemon/gdm-xdmcp-display-factory.c:2782 +#: ../daemon/gdm-xdmcp-display-factory.c:2561 +#: ../daemon/gdm-xdmcp-display-factory.c:2829 #, c-format msgid "%s: Could not read Session ID" msgstr "%s: không thể đọc được mã số phiên chạy (Session ID)" -#: ../daemon/gdm-xdmcp-display-factory.c:2528 +#: ../daemon/gdm-xdmcp-display-factory.c:2575 #, c-format msgid "%s: Could not read Display Class" msgstr "%s: không thể đọc hạng trình bày (Display Class)" -#: ../daemon/gdm-xdmcp-display-factory.c:2634 -#: ../daemon/gdm-xdmcp-display-factory.c:2684 -#: ../daemon/gdm-xdmcp-display-factory.c:2690 +#: ../daemon/gdm-xdmcp-display-factory.c:2681 +#: ../daemon/gdm-xdmcp-display-factory.c:2731 +#: ../daemon/gdm-xdmcp-display-factory.c:2737 #, c-format msgid "%s: Could not read address" msgstr "%s: không thể đọc địa chỉ" -#: ../daemon/gdm-xdmcp-display-factory.c:2765 +#: ../daemon/gdm-xdmcp-display-factory.c:2812 #, c-format msgid "%s: Got KEEPALIVE from banned host %s" msgstr "%s: nhận được tín hiệu KEEPALIVE (giữ kết nối) từ máy bị cấm %s" -#: ../daemon/gdm-xdmcp-display-factory.c:2854 +#: ../daemon/gdm-xdmcp-display-factory.c:2902 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" msgstr "GdmXdmcpDisplayFactory: không thể đọc phần đầu XDMCP !" -#: ../daemon/gdm-xdmcp-display-factory.c:2860 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 +#: ../daemon/gdm-xdmcp-display-factory.c:2908 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" msgstr "XMDCP: phiên bản XDMCP không đúng !" -#: ../daemon/gdm-xdmcp-display-factory.c:2866 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 +#: ../daemon/gdm-xdmcp-display-factory.c:2914 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" msgstr "XMDCP: không thể phân tích địa chỉ" -#: ../daemon/gdm-xdmcp-display-factory.c:3311 +#: ../daemon/gdm-xdmcp-display-factory.c:3359 #, c-format msgid "Could not get server hostname: %s!" msgstr "Không thể lấy tên máy của máy phục vụ : %s !" -#: ../daemon/main.c:237 -#: ../daemon/main.c:250 +#: ../daemon/main.c:237 ../daemon/main.c:250 #, c-format -msgid "Cannot write PID file %s: possibly out of diskspace: %s" -msgstr "Không thể ghi tập tin PID %s, có thể do tràn sức chứa trên đĩa: %s" +#| msgid "Cannot write PID file %s: possibly out of diskspace: %s" +msgid "Cannot write PID file %s: possibly out of disk space: %s" +msgstr "Không thể ghi tập tin PID %s, có thể do hết đĩa: %s" #: ../daemon/main.c:271 #, c-format msgid "Logdir %s does not exist or isn't a directory." -msgstr "Thư mục Logdir %s (thư mục bản ghi) không tồn tại hoặc không phải là một thư mục." +msgstr "" +"Thư mục Logdir %s (thư mục bản ghi) không tồn tại hoặc không phải là một thư " +"mục." #: ../daemon/main.c:287 #, c-format @@ -386,17 +389,22 @@ #: ../daemon/main.c:291 #, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "Thư mục Authdir (thư mục xác thực) %s không phải là một thư mục. Hủy bỏ." +msgstr "" +"Thư mục Authdir (thư mục xác thực) %s không phải là một thư mục. Hủy bỏ." #: ../daemon/main.c:365 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "Thư mục Authdir %s (thư mục xác thực) không được người dùng %d, nhóm %d sở hữu. Hủy bỏ." +msgstr "" +"Thư mục Authdir %s (thư mục xác thực) không được người dùng %d, nhóm %d sở " +"hữu. Hủy bỏ." #: ../daemon/main.c:372 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "Thư mục Authdir (thư mục xác thực) %s có quyền truy nhập %o không đúng: nên là %o. Hủy bỏ." +msgstr "" +"Thư mục Authdir (thư mục xác thực) %s có quyền truy nhập %o không đúng: nên " +"là %o. Hủy bỏ." #: ../daemon/main.c:409 #, c-format @@ -421,8 +429,9 @@ msgstr "Xem mọi cảnh báo là nghiêm trọng" #: ../daemon/main.c:534 -msgid "Exit after a time - for debugging" -msgstr "Thoát sau một khoảng thời gian — để gỡ lỗi" +#| msgid "Exit after a time - for debugging" +msgid "Exit after a time (for debugging)" +msgstr "Thoát sau một khoảng thời gian (để gỡ lỗi)" #: ../daemon/main.c:535 msgid "Print GDM version" @@ -433,21 +442,23 @@ msgstr "Trình quản lý bộ trình bày GNOME" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:611 -#| msgid "Only root wants to run GDM" +#: ../daemon/main.c:616 msgid "Only the root user can run GDM" msgstr "Chỉ người chủ (root) có quyền chạy GDM" -#: ../daemon/session-worker-main.c:156 +#. Translators: worker is a helper process that does the work +#. of starting up a session +#: ../daemon/session-worker-main.c:158 msgid "GNOME Display Manager Session Worker" msgstr "Hàm làm việc từng phiên chạy của trình quản lý bộ trình bày GNOME" #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT SPI Registry Wrapper" -msgstr "Đại diện Thanh ghi AT SPI" +#| msgid "AT SPI Registry Wrapper" +msgid "AT-SPI Registry Wrapper" +msgstr "Đại diện Thanh ghi AT-SPI" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "Cửa sổ Đăng nhập" @@ -459,6 +470,10 @@ msgid "Power management daemon" msgstr "Trình Quản lý Năng lượng" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "Bộ kiểm tra tăng tốt GNOME Session" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "Trình Thiết lập GNOME" @@ -472,11 +487,13 @@ msgstr "Phóng to từng phần màn hình" #: ../data/greeter-autostart/gok.desktop.in.h:1 -msgid "GNOME Onscreen Keyboard" +#| msgid "GNOME Onscreen Keyboard" +msgid "GNOME On-Screen Keyboard" msgstr "Bàn phím Màn hình GNOME" #: ../data/greeter-autostart/gok.desktop.in.h:2 -msgid "Use an onscreen keyboard" +#| msgid "Use an onscreen keyboard" +msgid "Use an on-screen keyboard" msgstr "Dùng bàn phím trên màn hình" #: ../data/greeter-autostart/metacity.desktop.in.h:1 @@ -492,52 +509,50 @@ msgstr "Trình bày thông tin trên màn hình dạng tiếng nói hoặc chữ nổi" #: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 -#| msgid "Authentication Dialog" msgid "PolicyKit Authentication Agent" msgstr "Tác nhân Xác thực PolicyKit" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Chọn hệ thống" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213 -#| msgid "XMCP: Could not create XDMCP buffer!" +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: không thể tạo vùng đệm XDMCP !" -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" msgstr "Không thể đọc phần đầu XDMCP." -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Giá trị" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "phần trăm thời gian hoàn tất" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1281 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "Chuỗi bị động" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1282 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "Chuỗi cần dùng trong nhãn nếu người dùng chưa chọn mục" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1290 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "Chuỗi hoạt động" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1291 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "Chuỗi cần dùng trong nhãn nếu người dùng đã chọn mục" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1300 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "Danh sách hiện rõ" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1301 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "Có nên hiển thị danh sách lựa chọn hay không" @@ -545,7 +560,6 @@ #. * the date and time with seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 -#| msgid "%l:%M:%S %p" msgid "%a %b %e, %l:%M:%S %p" msgstr "%a %b %e, %l:%M:%S %p" @@ -553,7 +567,6 @@ #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 -#| msgid "%l:%M %p" msgid "%a %b %e, %l:%M %p" msgstr "%a %b %e, %l:%M %p" @@ -561,144 +574,138 @@ #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 -#| msgid "%l:%M:%S %p" msgid "%a %l:%M:%S %p" msgstr "%a %l:%M:%S %p" -#. translators: This is the time format to use for the date -#. -#: ../gui/simple-greeter/gdm-clock-widget.c:87 -#: ../gui/simple-greeter/gdm-clock-widget.c:94 -#, c-format -msgid "%x" -msgstr "%x" - #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 -#| msgid "%l:%M %p" msgid "%a %l:%M %p" msgstr "%a %l:%M %p" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 -msgid "Automatically logging in..." -msgstr "Đang tự động đăng nhập..." - -#. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:570 -msgid "Cancelling..." -msgstr "Đang huỷ..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +#| msgid "Automatically logging in..." +msgid "Automatically logging in…" +msgstr "Đang tự động đăng nhập…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:870 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "Chọn ngôn ngữ, rồi bấm nút Đăng nhập" +#. need to wait for response from backend +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +#| msgid "Cancelling..." +msgid "Cancelling…" +msgstr "Đang thôi…" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "Tự chọn" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "Phiên làm việc tự chọn" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +#| msgid "Panel" +msgid "Cancel" +msgstr "Thôi" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Tên máy tính" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -msgid "Log In" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#| msgid "Log In" +msgid "Login" msgstr "Đăng nhập" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +msgid "Unlock" +msgstr "Bỏ khoá" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "Phiên bản" -#: ../gui/simple-greeter/gdm-greeter-panel.c:852 -msgid "Panel" -msgstr "Bảng" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:923 -msgid "Shutdown Options..." -msgstr "Tùy chọn Tắt máy..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:945 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "Ngưng máy" -#: ../gui/simple-greeter/gdm-greeter-panel.c:950 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "Khởi động lại" -#: ../gui/simple-greeter/gdm-greeter-panel.c:954 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "Tắt máy" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "Không rõ thời gian còn lại" + +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "Bảng" + +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "Ngôn ngữ" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 msgid "_Languages:" msgstr "_Ngôn ngữ :" -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275 -#: ../gui/simple-greeter/gdm-language-option-widget.c:274 +#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 msgid "_Language:" msgstr "_Ngôn ngữ :" #. translators: This brings up a dialog #. * with a list of languages to choose from #. -#: ../gui/simple-greeter/gdm-language-option-widget.c:243 +#: ../gui/simple-greeter/gdm-language-option-widget.c:231 +#| msgctxt "language" +#| msgid "Other..." msgctxt "language" -msgid "Other..." -msgstr "Khác..." +msgid "Other…" +msgstr "Khác…" -#: ../gui/simple-greeter/gdm-language-option-widget.c:244 +#: ../gui/simple-greeter/gdm-language-option-widget.c:232 msgid "Choose a language from the full list of available languages." msgstr "Hãy chọn một ngôn ngữ trong danh sách các ngôn ngữ sẵn sàng." -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-language-option-widget.c:262 +#| msgid "Languages" +msgid "Language" +msgstr "Ngôn ngữ" + +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "Chưa ghi rõ" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "Bố trí bàn phím" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201 -#: ../gui/simple-greeter/gdm-layout-option-widget.c:266 -msgid "_Keyboard:" -msgstr "_Bàn phím:" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:235 -msgctxt "keyboard" -msgid "Other..." -msgstr "Khác..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:236 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "Hãy chọn một bố trí bàn phím trong danh sách các bố trí bàn phím sẵn sàng." - -#: ../gui/simple-greeter/gdm-option-widget.c:507 +#: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Chuỗi nhãn" -#: ../gui/simple-greeter/gdm-option-widget.c:508 +#: ../gui/simple-greeter/gdm-option-widget.c:506 msgid "The text to use as a label" msgstr "Chuỗi văn bản cần dùng làm nhãn" -#: ../gui/simple-greeter/gdm-option-widget.c:515 +#: ../gui/simple-greeter/gdm-option-widget.c:513 msgid "Icon name" msgstr "Tên biểu tượng" -#: ../gui/simple-greeter/gdm-option-widget.c:516 +#: ../gui/simple-greeter/gdm-option-widget.c:514 msgid "The icon to use with the label" msgstr "Biểu tượng cần dùng với nhãn đó" -#: ../gui/simple-greeter/gdm-option-widget.c:524 +#: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" msgstr "Mục mặc định" -#: ../gui/simple-greeter/gdm-option-widget.c:525 -#| msgid "The id of the default item" +#: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" msgstr "Mã số của mục mặc định" @@ -712,28 +719,29 @@ #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format -msgid "Remote Login (Connecting to %s...)" -msgstr "Đang nhập từ xa (Đang kết nối tới %s...)" +#| msgid "Remote Login (Connecting to %s...)" +msgid "Remote Login (Connecting to %s…)" +msgstr "Đăng nhập từ xa (Đang kết nối tới %s…)" #: ../gui/simple-greeter/gdm-remote-login-window.c:202 #, c-format msgid "Remote Login (Connected to %s)" -msgstr "Đang nhập từ xa (Có kết nối tới %s)" +msgstr "Đăng nhập từ xa (Đã kết nối tới %s)" #: ../gui/simple-greeter/gdm-remote-login-window.c:281 msgid "Remote Login" -msgstr "Đang nhập từ xa" +msgstr "Đăng nhập từ xa" #: ../gui/simple-greeter/gdm-session-option-widget.c:162 -msgid "_Sessions:" -msgstr "_Phiên chạy:" +#| msgid "_Sessions:" +msgid "Session" +msgstr "Phiên làm việc" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 msgid "Banner message text" msgstr "Chuỗi thông điệp băng cờ" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 -#| msgid "Banner message text" msgid "Banner message text when chooser is empty" msgstr "Chuỗi thông điệp băng cờ khi bộ chọn vẫn trống" @@ -770,123 +778,128 @@ msgstr "Tên biểu tượng cần dùng cho biểu hình trình chào mừng" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "Bố trí bàn phím được chọn gần đây" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "Ngôn ngữ được chọn gần đây" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 +#| msgid "" +#| "Set to a list of languages to be shown by default at the login window." +msgid "Set to a list of languages to be shown by default in the login window." +msgstr "Đặt danh sách ngôn ngữ hiển thị mặc định tại cửa sổ đăng nhập." + #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to a list of keyboard layouts to be shown by default at the login window." -msgstr "Đặt danh sách bố trí bàn phím hiển thị mặc định tại cửa sổ đăng nhập." +msgid "Set to the themed icon name to use for the greeter logo." +msgstr "" +"Đặt thành tên biểu tượng theo sắc thái cần dùng cho biểu hình trình chào " +"mừng." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to a list of languages to be shown by default at the login window." -msgstr "Đặt danh sách ngôn ngữ hiển thị mặc định tại cửa sổ đăng nhập." +msgid "Set to true to disable showing known users in the login window." +msgstr "" +"Lập thành đúng để tắt hiển thị các người dùng đã biết trong cửa sổ đăng nhập." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "Set to the themed icon name to use for the greeter logo." -msgstr "Đặt thành tên biểu tượng theo sắc thái cần dùng cho biểu hình trình chào mừng." +msgid "Set to true to disable showing the restart buttons in the login window." +msgstr "" +"Lập thành đúng để tắt hiển thị các cái nút khởi động lại trong cửa sổ đăng " +"nhập." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -#| msgid "Set to TRUE to disable showing known users in the login window." -msgid "Set to true to disable showing known users in the login window." -msgstr "Lập thành đúng để tắt hiển thị các người dùng đã biết trong cửa sổ đăng nhập." +#| msgid "Set to true to enable the xrandr settings manager plugin." +msgid "Set to true to enable the XRandR settings manager plugin." +msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập XRandR." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 -#| msgid "" -#| "Set to TRUE to disable showing the restart buttons in the login window." -msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "Lập thành đúng để tắt hiển thị các cái nút khởi động lại trong cửa sổ đăng nhập." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -#| msgid "Set to True to enable the background settings manager plugin." msgid "Set to true to enable the background settings manager plugin." msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập nền." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 -#| msgid "Set to True to enable the media-keys settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập các phím nhạc/phim." +msgstr "" +"Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập các phím nhạc/phim." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 -#| msgid "Set to True to enable the on-screen keyboard." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "Lập thành đúng để hiệu lực bàn phím trên màn hình." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 -#| msgid "" -#| "Set to True to enable the plugin to manage the accessibility keyboard " -#| "settings." -msgid "Set to true to enable the plugin to manage the accessibility keyboard settings." -msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý các thiết lập bàn phím của khả năng truy cập." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +msgid "" +"Set to true to enable the plugin to manage the accessibility keyboard " +"settings." +msgstr "" +"Lập thành đúng để hiệu lực phần bổ sung quản lý các thiết lập bàn phím của " +"khả năng truy cập." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -#| msgid "Set to True to enable the screen magnifier." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "Lập thành đúng để hiệu lực kính lúp trên màn hình." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 -#| msgid "Set to True to enable the screen reader." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "Lập thành đúng để hiệu lực trình đọc trên màn hình." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 -#| msgid "Set to True to enable the sound settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập âm thanh." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -#| msgid "Set to True to enable the xrandr settings manager plugin." -msgid "Set to true to enable the xrandr settings manager plugin." -msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập xrandr." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 -#| msgid "Set to True to enable the xsettings settings manager plugin." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "Lập thành đúng để hiệu lực phần bổ sung quản lý thiết lập xsettings." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "Đặt thành Đúng (True) để hiển thị chuỗi thông điệp trên băng cờ." +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#| msgid "Set to true to use compiz as the window manager." +msgid "Set to true to use Compiz as the window manager." +msgstr "Đặt thành Đúng (True) để dùng phần mềm Compiz làm bộ quản lý cửa sổ." + +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#| msgid "" +#| "Text banner message to show on the login window when the user chooser is " +#| "empty, instead of banner_message_text." +msgid "" +"Text banner message to show in the login window when the user chooser is " +"empty, instead of banner_message_text." +msgstr "" +"Chuỗi thông điệp băng cờ cần hiển thị trên cửa sổ đăng nhập khi bộ chọn " +"người dùng vẫn trống, thay cho banner_message_text." + #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Set to true to use compiz as the window manager." -msgstr "Đặt thành Đúng (True) để dùng phần mềm compiz làm bộ quản lý cửa sổ." +#| msgid "Text banner message to show on the login window." +msgid "Text banner message to show in the login window." +msgstr "Thông điệp băng cờ cần hiển thị trên cửa sổ đăng nhập." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -#| msgid "Text banner message to show on the login window." -msgid "Text banner message to show on the login window when the user chooser is empty, instead of banner_message_text." -msgstr "Chuỗi thông điệp băng cờ cần hiển thị trên cửa sổ đăng nhập khi bộ chọn người dùng vẫn trống, thay cho banner_message_text." +#| msgid "True if the xrandr settings manager plugin is enabled." +msgid "True if the XRandR settings manager plugin is enabled." +msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập XRandR đã được hiệu lực." #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "Text banner message to show on the login window." -msgstr "Thông điệp băng cờ cần hiển thị trên cửa sổ đăng nhập." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the background settings manager plugin is enabled." msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập nền đã được hiệu lực." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." -msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập các phím nhạc/phim (media-keys) đã được hiệu lực." +msgstr "" +"Đúng (True) nếu phần bổ sung quản lý thiết lập các phím nhạc/phim (media-" +"keys) đã được hiệu lực." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." -msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập âm thanh đã được hiệu lực." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "True if the xrandr settings manager plugin is enabled." -msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập xandr đã được hiệu lực." +msgstr "" +"Đúng (True) nếu phần bổ sung quản lý thiết lập âm thanh đã được hiệu lực." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." -msgstr "Đúng (True) nếu phần bổ sung quản lý thiết lập xsettings đã được hiệu lực." +msgstr "" +"Đúng (True) nếu phần bổ sung quản lý thiết lập xsettings đã được hiệu lực." -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 -msgid "Use compiz as the window manager" -msgstr "Dùng compiz làm bộ quản lý cửa sổ" +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#| msgid "Use compiz as the window manager" +msgid "Use Compiz as the window manager" +msgstr "Dùng Compiz làm bộ quản lý cửa sổ" #: ../gui/simple-greeter/gdm-timer.c:149 msgid "Duration" @@ -909,174 +922,53 @@ msgstr "Nó đang chạy chưa?" #: ../gui/simple-greeter/gdm-timer.c:166 -#| msgid "Whether or not the timer is currently ticking" msgid "Whether the timer is currently ticking" msgstr "Bộ đếm thời gian đang chạy hay không" -#: ../gui/simple-greeter/gdm-user.c:245 -msgid "Manager" -msgstr "Quản lý" - -#: ../gui/simple-greeter/gdm-user.c:246 -msgid "The user manager object this user is controlled by." -msgstr "Đối tượng quản lý người dùng có điều khiển người dùng này." +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#, c-format +msgid "Log in as %s" +msgstr "Đăng nhập dưới %s" #. translators: This option prompts #. * the user to type in a username #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 +#| msgctxt "user" +#| msgid "Other..." msgctxt "user" -msgid "Other..." -msgstr "Khác..." +msgid "Other…" +msgstr "Khác…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "Chọn tài khoản khác" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "Khách" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180 -msgid "Login as a temporary guest" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +#| msgid "Login as a temporary guest" +msgid "Log in as a temporary guest" msgstr "Đăng nhập như khách tạm" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "Tự động Đăng nhập" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -msgid "Automatically login to the system after selecting options" +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +#| msgid "Automatically login to the system after selecting options" +msgid "Automatically log into the system after selecting options" msgstr "Tự động đăng nhập vào hệ thống sau khi bật các tùy chọn thích hợp" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385 -#, c-format -msgid "Log in as %s" -msgstr "Đăng nhập dưới %s" - -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "Đã đăng nhập" -#: ../gui/user-switch-applet/applet.c:164 -msgid "The User Switch Applet 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." -msgstr "Tiểu dụng Chuyển đổi Người dùng (User Switch Applet) là phần mềm tự do; bạn có thể phát hành lại nó và/hoặc sửa đổi nó với điều kiện của Giấy Phép Công Cộng GNU như được xuất bản bởi Tổ Chức Phần Mềm Tự Do; hoặc phiên bản 2 của Giấy Phép này, hoặc (tùy chọn) bất kỳ phiên bản sau nào." - -#: ../gui/user-switch-applet/applet.c:168 -msgid "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." -msgstr "Chương trình này được phát hành vì mong muốn nó có ích, nhưng KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý KHẢ NĂNG BÁN HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT. Xem Giấy Phép Công Cộng GNU để biết thêm chi tiết." - -#: ../gui/user-switch-applet/applet.c:172 -msgid "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 " -msgstr "" -"Bạn đã nhận một bản sao của Giấy Phép Công Cộng GNU cùng với chương trình này; nếu không, hãy viết thư cho Tổ Chức Phần Mềm Tự Do,\n" -"Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor,\n" -"Boston, MA 02110-1301, USA (Mỹ)." - -#: ../gui/user-switch-applet/applet.c:186 -msgid "A menu to quickly switch between users." -msgstr "Một trình đơn để chuyển đổi nhanh giữa các người dùng." - -#: ../gui/user-switch-applet/applet.c:190 -msgid "translator-credits" -msgstr "Nhóm Việt hóa Gnome " - -#: ../gui/user-switch-applet/applet.c:649 -#: ../gui/user-switch-applet/applet.c:788 -#: ../gui/user-switch-applet/applet.c:827 -#, c-format -msgid "Can't lock screen: %s" -msgstr "Không thể khoá màn hình: %s" - -#: ../gui/user-switch-applet/applet.c:671 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "Không thể đặt tạm thời ảnh bảo vệ màn hình thành màn hình trống: %s" - -#: ../gui/user-switch-applet/applet.c:886 -#, c-format -msgid "Can't logout: %s" -msgstr "Không thể đăng xuất: %s" - -#: ../gui/user-switch-applet/applet.c:970 -msgid "Available" -msgstr "Sẵn sàng" - -#: ../gui/user-switch-applet/applet.c:971 -msgid "Invisible" -msgstr "Vô hinh" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Busy" -msgstr "Bận" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Away" -msgstr "Vắng mặt" - -#: ../gui/user-switch-applet/applet.c:1133 -#| msgid "Account Information..." -msgid "Account Information" -msgstr "Thông tin Tài khoản" - -#: ../gui/user-switch-applet/applet.c:1145 -#| msgid "System Preferences..." -msgid "System Preferences" -msgstr "Tùy thích Hệ thống" - -#: ../gui/user-switch-applet/applet.c:1161 -msgid "Lock Screen" -msgstr "Khoá màn hình" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1172 -msgid "Switch User" -msgstr "Chuyển đổi Người dùng" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1183 -msgid "Quit..." -msgstr "Thoát..." - -#: ../gui/user-switch-applet/applet.c:1304 -msgid "Unknown" -msgstr "Không rõ" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "Tiểu dụng Chuyển đổi Người dùng" - -#: ../gui/user-switch-applet/applet.c:1436 -msgid "Change account settings and status" -msgstr "Sửa đổi thiết lập tài khoản và trạng thái" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "Một trình đơn để chuyển đổi nhanh giữa các người dùng" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "Bộ Chuyển đổi Người dùng" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "Bộ tạo Tiểu dụng Chuyển đổi Người dùng" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "Sửa thông t_in cá nhân" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "_Giới thiệu" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "_Sửa Người dùng và Nhóm" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "Chỉ hỗ trợ lệnh VERSION (phiên bản)" @@ -1085,15 +977,13 @@ msgid "COMMAND" msgstr "CÂU_LỆNH" -#: ../utils/gdmflexiserver.c:62 -#: ../utils/gdmflexiserver.c:63 -#: ../utils/gdmflexiserver.c:65 -#: ../utils/gdmflexiserver.c:66 -msgid "Ignored - retained for compatibility" +#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +#| msgid "Ignored - retained for compatibility" +msgid "Ignored — retained for compatibility" msgstr "Bỏ qua - tồn tại vì mục đích tương thích" -#: ../utils/gdmflexiserver.c:64 -#: ../utils/gdm-screenshot.c:43 +#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 msgid "Debugging output" msgstr "Kết xuất gỡ lỗi" @@ -1115,12 +1005,153 @@ msgid "Unable to start new display" msgstr "Không thể bắt đầu bộ trình bày mới." -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Đã chụp ảnh màn hình" #. Option parsing -#: ../utils/gdm-screenshot.c:281 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "Chụp ảnh màn hình" +#~ msgid "Couldn't set groupid to 0" +#~ msgstr "Không thể đặt mã số nhóm thành 0" + +#~ msgid "%x" +#~ msgstr "%x" + +#~ msgid "Shutdown Options..." +#~ msgstr "Tùy chọn Tắt máy..." + +#~ msgid "Keyboard layouts" +#~ msgstr "Bố trí bàn phím" + +#~ msgid "_Keyboard:" +#~ msgstr "_Bàn phím:" + +#~ msgctxt "keyboard" +#~ msgid "Other..." +#~ msgstr "Khác..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "" +#~ "Hãy chọn một bố trí bàn phím trong danh sách các bố trí bàn phím sẵn sàng." + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "Bố trí bàn phím được chọn gần đây" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default at the login " +#~ "window." +#~ msgstr "" +#~ "Đặt danh sách bố trí bàn phím hiển thị mặc định tại cửa sổ đăng nhập." + +#~ msgid "Manager" +#~ msgstr "Quản lý" + +#~ msgid "The user manager object this user is controlled by." +#~ msgstr "Đối tượng quản lý người dùng có điều khiển người dùng này." + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "Tiểu dụng Chuyển đổi Người dùng (User Switch Applet) là phần mềm tự do; " +#~ "bạn có thể phát hành lại nó và/hoặc sửa đổi nó với điều kiện của Giấy " +#~ "Phép Công Cộng GNU như được xuất bản bởi Tổ Chức Phần Mềm Tự Do; hoặc " +#~ "phiên bản 2 của Giấy Phép này, hoặc (tùy chọn) bất kỳ phiên bản sau nào." + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "Chương trình này được phát hành vì mong muốn nó có ích, nhưng KHÔNG CÓ " +#~ "BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý KHẢ NĂNG BÁN HAY KHẢ " +#~ "NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT. Xem Giấy Phép Công Cộng GNU để biết thêm " +#~ "chi tiết." + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "Bạn đã nhận một bản sao của Giấy Phép Công Cộng GNU cùng với chương trình " +#~ "này; nếu không, hãy viết thư cho Tổ Chức Phần Mềm Tự Do,\n" +#~ "Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor,\n" +#~ "Boston, MA 02110-1301, USA (Mỹ)." + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "Một trình đơn để chuyển đổi nhanh giữa các người dùng." + +#~ msgid "translator-credits" +#~ msgstr "Nhóm Việt hóa Gnome " + +#~ msgid "Can't lock screen: %s" +#~ msgstr "Không thể khoá màn hình: %s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "Không thể đặt tạm thời ảnh bảo vệ màn hình thành màn hình trống: %s" + +#~ msgid "Can't logout: %s" +#~ msgstr "Không thể đăng xuất: %s" + +#~ msgid "Available" +#~ msgstr "Sẵn sàng" + +#~ msgid "Invisible" +#~ msgstr "Vô hinh" + +#~ msgid "Busy" +#~ msgstr "Bận" + +#~ msgid "Away" +#~ msgstr "Vắng mặt" + +#~| msgid "Account Information..." +#~ msgid "Account Information" +#~ msgstr "Thông tin Tài khoản" + +#~| msgid "System Preferences..." +#~ msgid "System Preferences" +#~ msgstr "Tùy thích Hệ thống" + +#~ msgid "Lock Screen" +#~ msgstr "Khoá màn hình" + +#~ msgid "Switch User" +#~ msgstr "Chuyển đổi Người dùng" + +#~ msgid "Quit..." +#~ msgstr "Thoát..." + +#~ msgid "Unknown" +#~ msgstr "Không rõ" + +#~ msgid "User Switch Applet" +#~ msgstr "Tiểu dụng Chuyển đổi Người dùng" + +#~ msgid "Change account settings and status" +#~ msgstr "Sửa đổi thiết lập tài khoản và trạng thái" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "Một trình đơn để chuyển đổi nhanh giữa các người dùng" + +#~ msgid "User Switcher" +#~ msgstr "Bộ Chuyển đổi Người dùng" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "Bộ tạo Tiểu dụng Chuyển đổi Người dùng" + +#~ msgid "Edit Personal _Information" +#~ msgstr "Sửa thông t_in cá nhân" + +#~ msgid "_About" +#~ msgstr "_Giới thiệu" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "_Sửa Người dùng và Nhóm" diff -Nru gdm-2.32.1/po/zh_CN.po gdm-3.0.0/po/zh_CN.po --- gdm-2.32.1/po/zh_CN.po 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/po/zh_CN.po 2011-04-04 14:37:16.000000000 +0000 @@ -6,22 +6,25 @@ # Tao Wei , 2009. # Aron Xu , 2010. # Fan Qijiang , 2010. +# Wei Li , 2011. +# Lele Long , 2011. # msgid "" msgstr "" "Project-Id-Version: gdm master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gdm&component=general\n" -"POT-Creation-Date: 2010-07-20 18:41+0000\n" -"PO-Revision-Date: 2010-07-23 11:51+0800\n" -"Last-Translator: Eleanor Chen \n" +"product=gdm&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-03-17 21:48+0000\n" +"PO-Revision-Date: 2011-03-18 22:01+0800\n" +"Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \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" -#: ../common/gdm-common.c:437 +#: ../common/gdm-common.c:456 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom 不是字符设备" @@ -46,28 +49,28 @@ msgid "could not find user \"%s\" on system" msgstr "无法在系统中找到用户 \"%s\"" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "无法初始化登录系统" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "无法验证用户" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "无法授权给用户" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "无法建立信任证书" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "无法打开会话" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -88,17 +91,17 @@ msgstr "服务器是以用户 %s 身份创建的，但此用户不存在" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "无法将组 ID 设置为 %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups() 执行 %s 失败" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "无法将用户 ID 设置为 %d" @@ -148,71 +151,71 @@ msgid "The display device" msgstr "显示设备" -#: ../daemon/gdm-session-worker.c:1309 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "初始化与验证系统的会话出错:%s" +msgid "error initiating conversation with authentication system - %s" +msgstr "使用认证系统初始化会话出错 - %s" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "一般性错误" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "内存耗尽" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "应用程序编程错误" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "未知错误" -#: ../daemon/gdm-session-worker.c:1320 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "用户名：" -#: ../daemon/gdm-session-worker.c:1326 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "将首选用户名提示符通知验证系统时出错:%s" -#: ../daemon/gdm-session-worker.c:1340 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "将用户主机名通知验证系统时出错:%s" -#: ../daemon/gdm-session-worker.c:1355 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "将用户终端通知验证系统时出错:%s" -#: ../daemon/gdm-session-worker.c:1368 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "将显示字符串通知验证系统时出错:%s" -#: ../daemon/gdm-session-worker.c:1383 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "将显示 xauth 证书通知验证系统时发生错误:%s" -#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "无可用用户帐户" -#: ../daemon/gdm-session-worker.c:1719 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "无法切换到用户" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "用户 %s 不存在。" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "组 %s 不存在。" @@ -434,7 +437,7 @@ msgstr "AT-SPI 注册表包装器" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "登录窗口" @@ -446,6 +449,10 @@ msgid "Power management daemon" msgstr "电源管理守护程序" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME 会话加速检查器" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME 设置守护程序" @@ -482,7 +489,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit 的认证代理" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "选择系统" @@ -494,35 +501,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP：无法读取 XDMCP 头信息！" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "值" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "完成时间的百分比" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1459 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "非活动文本" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1460 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "用户尚未选择任何条目前在标签中使用的文本" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1468 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "活动文本" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "用户选择一个条目时在标签中使用的文本" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "列表可见" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "选择器列表是否可见" @@ -554,65 +561,69 @@ msgid "%a %l:%M %p" msgstr "%A %H:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "正在自动登录..." -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "选择语言，单击“登录”" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:689 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "正在取消..." +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "自定义" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "自定义会话" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "取消" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "计算机名" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "登录" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "解锁" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "版本" -#: ../gui/simple-greeter/gdm-greeter-panel.c:740 -msgid "Panel" -msgstr "面板" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:805 -msgid "Shutdown Options…" -msgstr "关闭选项..." - -#: ../gui/simple-greeter/gdm-greeter-panel.c:827 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "挂起" -#: ../gui/simple-greeter/gdm-greeter-panel.c:832 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "重新启动" -#: ../gui/simple-greeter/gdm-greeter-panel.c:836 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "关机" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1111 -msgctxt "customsession" -msgid "Custom" -msgstr "自定义" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "剩余时间未知" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1112 -msgid "Custom session" -msgstr "自定义会话" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "面板" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "语言" @@ -640,35 +651,10 @@ msgid "Language" msgstr "语言" -#: ../gui/simple-greeter/gdm-languages.c:699 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "未指定" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "键盘布局" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "键盘(_K)：" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "其它..." - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "从可用布局的完全清单中选择某键盘布局" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "键盘" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "标签文本" @@ -760,112 +746,103 @@ msgstr "用于欢迎屏幕徽标的图标名" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "最近选过的键盘布局" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "最近选过的语言" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "设置在登录窗口默认显示的键盘布局清单" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "设置在登录窗口默认显示的语言清单" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "设置用于欢迎屏幕徽标的主题图标名" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "设置为真将禁止在登录窗口中显示已知用户" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "设置为真将禁止在登录窗口中显示重启动按钮" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "设置为真以启用 XRandR 设置管理器插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "设置为真以启用背景设置管理器插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "设置为真以启用多媒体键管理器插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "设置为真以启用屏幕键盘。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "设置为真以启用管理辅助功能键盘设置的插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "设置为真以启用屏幕放大镜。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "设置为真以启用屏幕读取器。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "设置为真以启用声音设置管理器插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "设置为真以启用 xsettings 设置管理器插件。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "设置为“真(true)”以显示横幅信息文字。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "设置为“真(true)”以使用 compiz 作为窗口管理器。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "" "用户选择器为空时显示在登录窗口的文本横幅信息，用来替代 banner_message_text。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "显示在登录窗口的文本横幅信息。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "为真(true)表示 XRandR 设置管理器插件已启用。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "为真(true)时表示背景设置管理器插件已启用。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "为真(true)表示多媒体键设置管理器插件已启用。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "为真(true)表示声音设置管理器插件已启用。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "为真(true)时表示 xsettings 设置管理器插件已启用。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "使用 Compiz 作为窗口管理器" @@ -893,8 +870,8 @@ msgid "Whether the timer is currently ticking" msgstr "是否计时器正在运行" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:472 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "作为 %s 登录" @@ -904,171 +881,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "其他..." -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "选择不同的帐户" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "来宾" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "作为临时来宾登录" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "自动登录" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "选定选项后自动登录到系统" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:984 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "当前已登录" -#: ../gui/user-switch-applet/applet.c:162 -msgid "" -"The User Switch Applet 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." -msgstr "" -"用户切换小工具是自由软件；你可以遵照自由软件基金会出版的GNU通用公共许可证条款" -"来修改和重新发布这一程序。你可以使用许可证的第二版，或者（根据你的选择）用任" -"何更新的版本。" - -#: ../gui/user-switch-applet/applet.c:166 -msgid "" -"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." -msgstr "" -"发布这一程序是希望他有用，但没有任何担保。甚至没有任何适合特定目的的隐含担" -"保。更多详情，请参阅GNU通用公共许可证。" - -#: ../gui/user-switch-applet/applet.c:170 -msgid "" -"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 " -msgstr "" -"你应该和这个程序一起收到了GNU通用公共许可证的副本，如果没有，写信给Free " -"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" -"1301, USA" - -#: ../gui/user-switch-applet/applet.c:184 -msgid "A menu to quickly switch between users." -msgstr "一个用于在用户间快速切换的菜单" - -#: ../gui/user-switch-applet/applet.c:188 -msgid "translator-credits" -msgstr "" -"Wang Li , 2002\n" -"Funda Wang , 2003, 2004\n" -"甘露(Gan Lu) , 2008, 2009\n" -"Tao Wei , 2009\n" -"Aron Xu , 2010\n" -"Fan Qijiang , 2010" - -#: ../gui/user-switch-applet/applet.c:658 -#: ../gui/user-switch-applet/applet.c:787 -#: ../gui/user-switch-applet/applet.c:829 -#, c-format -msgid "Can't lock screen: %s" -msgstr "无法锁定屏幕：%s" - -#: ../gui/user-switch-applet/applet.c:680 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "无法临时设置屏保为空白屏幕：%s" - -#: ../gui/user-switch-applet/applet.c:888 -#, c-format -msgid "Can't log out: %s" -msgstr "无法注销：%s" - -#: ../gui/user-switch-applet/applet.c:972 -msgid "Available" -msgstr "可用" - -#: ../gui/user-switch-applet/applet.c:973 -msgid "Invisible" -msgstr "隐身" - -#: ../gui/user-switch-applet/applet.c:974 -msgid "Busy" -msgstr "忙碌" - -#: ../gui/user-switch-applet/applet.c:975 -msgid "Away" -msgstr "离开" - -#: ../gui/user-switch-applet/applet.c:1122 -msgid "Account Information" -msgstr "账户信息" - -#: ../gui/user-switch-applet/applet.c:1134 -msgid "System Preferences" -msgstr "系统首选项" - -#: ../gui/user-switch-applet/applet.c:1148 -msgid "Lock Screen" -msgstr "锁定屏幕" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1159 -msgid "Switch User" -msgstr "切换用户" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1170 -msgid "Quit…" -msgstr "退出..." - -#: ../gui/user-switch-applet/applet.c:1276 -msgid "Unknown" -msgstr "未知" - -#: ../gui/user-switch-applet/applet.c:1389 -msgid "User Switch Applet" -msgstr "用户切换小程序" - -#: ../gui/user-switch-applet/applet.c:1404 -msgid "Change account settings and status" -msgstr "改变账户设置和状态" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "一个可在用户间快速切换的菜单" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "用户切换器" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "用户切换小程序工厂" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "编辑个人信息(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "关于(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "编辑用户和组(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "只支持 VERSION 命令" @@ -1104,15 +945,145 @@ msgid "Unable to start new display" msgstr "无法启动新显示" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "已经截屏" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "抓取屏幕的一张截图" +#~ msgid "Shutdown Options…" +#~ msgstr "关闭选项..." + +#~ msgid "Keyboard layouts" +#~ msgstr "键盘布局" + +#~ msgid "_Keyboard:" +#~ msgstr "键盘(_K)：" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "其它..." + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "从可用布局的完全清单中选择某键盘布局" + +#~ msgid "Keyboard" +#~ msgstr "键盘" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "最近选过的键盘布局" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "设置在登录窗口默认显示的键盘布局清单" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "用户切换小工具是自由软件；你可以遵照自由软件基金会出版的GNU通用公共许可证" +#~ "条款来修改和重新发布这一程序。你可以使用许可证的第二版，或者（根据你的选" +#~ "择）用任何更新的版本。" + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "发布这一程序是希望他有用，但没有任何担保。甚至没有任何适合特定目的的隐含担" +#~ "保。更多详情，请参阅GNU通用公共许可证。" + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "你应该和这个程序一起收到了GNU通用公共许可证的副本，如果没有，写信给Free " +#~ "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " +#~ "02110-1301, USA" + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "一个用于在用户间快速切换的菜单" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "Wang Li , 2002\n" +#~ "Funda Wang , 2003, 2004\n" +#~ "甘露(Gan Lu) , 2008, 2009\n" +#~ "Tao Wei , 2009\n" +#~ "Aron Xu , 2010\n" +#~ "Fan Qijiang , 2010" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "无法锁定屏幕：%s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "无法临时设置屏保为空白屏幕：%s" + +#~ msgid "Can't log out: %s" +#~ msgstr "无法注销：%s" + +#~ msgid "Available" +#~ msgstr "可用" + +#~ msgid "Invisible" +#~ msgstr "隐身" + +#~ msgid "Busy" +#~ msgstr "忙碌" + +#~ msgid "Away" +#~ msgstr "离开" + +#~ msgid "Account Information" +#~ msgstr "账户信息" + +#~ msgid "System Preferences" +#~ msgstr "系统首选项" + +#~ msgid "Lock Screen" +#~ msgstr "锁定屏幕" + +#~ msgid "Switch User" +#~ msgstr "切换用户" + +#~ msgid "Quit…" +#~ msgstr "退出..." + +#~ msgid "User Switch Applet" +#~ msgstr "用户切换小程序" + +#~ msgid "Change account settings and status" +#~ msgstr "改变账户设置和状态" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "一个可在用户间快速切换的菜单" + +#~ msgid "User Switcher" +#~ msgstr "用户切换器" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "用户切换小程序工厂" + +#~ msgid "Edit Personal _Information" +#~ msgstr "编辑个人信息(_I)" + +#~ msgid "_About" +#~ msgstr "关于(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "编辑用户和组(_E)" + +#~ msgid "Unknown" +#~ msgstr "未知" + #~ msgid "Manager" #~ msgstr "管理器" diff -Nru gdm-2.32.1/po/zh_HK.po gdm-3.0.0/po/zh_HK.po --- gdm-2.32.1/po/zh_HK.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/zh_HK.po 2011-04-04 14:37:16.000000000 +0000 @@ -12,11 +12,11 @@ # msgid "" msgstr "" -"Project-Id-Version: gdm2 2.32.0\n" +"Project-Id-Version: gdm 2.91.92\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-12 19:46+0800\n" -"PO-Revision-Date: 2010-12-12 19:47+0800\n" -"Last-Translator: Wei-Lun Chao \n" +"POT-Creation-Date: 2011-03-24 18:41+0800\n" +"PO-Revision-Date: 2011-03-24 18:41+0800\n" +"Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" "Language: \n" "MIME-Version: 1.0\n" @@ -49,28 +49,28 @@ msgid "could not find user \"%s\" on system" msgstr "在系統中找不到使用者「%s」" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "無法初始化登入系統" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "無法驗證使用者" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "無法驗證使用者" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "無法建立證書" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "無法開啟作業階段" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -89,17 +89,17 @@ msgstr "伺服器應以使用者 %s 的身分衍生，但該使用者不存在" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "無法設定 groupid 為 %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s 的 initgroups () 失敗。" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "無法設定 userid 為 %d" @@ -149,71 +149,71 @@ msgid "The display device" msgstr "顯示裝置" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "驗證系統初始化交談發生錯誤：%s" +msgid "error initiating conversation with authentication system - %s" +msgstr "驗證系統初始化交談發生錯誤 - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "一般性失敗" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "記憶體耗盡" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "應用程式錯誤" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "不明的錯誤" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "使用者名稱:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "以首選的使用者名稱提示通知驗證系統時發生錯誤： %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "以使用者的主機名稱通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "以使用者的主控臺通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "以顯示字串通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "以顯示 xauth 證書通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "沒有可用的使用者帳號" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "無法改變為使用者" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "使用者 %s 不存在" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "羣組 %s 不存在" @@ -436,7 +436,7 @@ msgstr "AT-SPI 註冊表包裹器" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1648 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "登入畫面" @@ -448,6 +448,10 @@ msgid "Power management daemon" msgstr "電源管理伺服程式" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME 作業階段加速檢查程式" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME 設定值伺服程式" @@ -484,7 +488,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit 驗證代理程式" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "選擇系統" @@ -496,35 +500,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP：無法讀取 XDMCP 標頭！" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "數值" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "完成時間百分比" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "未使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "若使用者尚未挑選任何項目，要在標籤中使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "使用中的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "若使用者已挑選某個項目，要在標籤中使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "清單可見性" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "是否顯示選擇程式清單" @@ -556,65 +560,69 @@ msgid "%a %l:%M %p" msgstr "%a %p %l:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "正在自動登入…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "選擇語言並按下「登入」" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "正在取消…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "自選" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "自選作業階段" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "取消" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "電腦名稱" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "登入" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "解鎖" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "版本" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "面板" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "關機選項…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "暫停" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "重新啟動" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "關閉電腦" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "自選" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "剩餘時間不明" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "自選作業階段" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "面板" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "語言" @@ -642,35 +650,10 @@ msgid "Language" msgstr "語言" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "未指定" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "鍵盤配置" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "鍵盤(_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "其他…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "從完整的可用鍵盤配置清單中選擇鍵盤配置。" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "鍵盤" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "標籤文字" @@ -762,111 +745,102 @@ msgstr "給歡迎標誌使用的圖示名稱" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "目前選取的鍵盤配置" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "目前選取的語言" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "設定預設在登入視窗中顯示鍵盤配置的清單。" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "設定預設在登入視窗中顯示語言的清單。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "設定用於歡迎標誌的主題圖示名稱。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "設為 true 則不在登入視窗中顯示已知的使用者。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "設為 true 則不在登入視窗中顯示重新啟動按鈕。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "設為 true 則啟用 XRandR 設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "設為 true 則啟用背景設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "設為 true 則啟用媒體按鍵設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "設為 true 則啟用螢幕鍵盤。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "設為 true 則啟用設定管理鍵盤無障礙功能設定值的外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "設為 true 則啟用螢幕放大鏡。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "設為 true 則啟用螢幕閱讀器。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "設為 true 則啟用音效設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "設為 true 則啟用 xsettings 設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "設為 true 則顯示橫幅訊息文字。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "設為 true 則使用 Compiz 作為視窗管理程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." msgstr "當選擇程式是空的時要顯示於登入視窗的文字橫幅訊息，用來取代 banner_message_text。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "要顯示於登入視窗的文字橫幅訊息。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "若啟用 XRandR 設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "若啟用背景設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "若啟用媒體按鍵設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "若啟用音效設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "若啟用 xsettings 設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "使用 Compiz 作為視窗管理程式" @@ -894,8 +868,8 @@ msgid "Whether the timer is currently ticking" msgstr "計時器現在是否在計時" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "以 %s 身分登入" @@ -905,160 +879,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "其他…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "選擇不同的帳號" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "訪客" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "以臨時訪客的身分登入" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "自動登入" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "在選取選項後自動登入系統" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "現在已經登入" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "使用者切換程式是自由軟件，你可以遵照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。" - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "發布這一程式的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。" - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給： the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "用來快速切換使用者的選單。" - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"如對翻譯有任何意見，請送一封電子郵件給\n" -"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n" -"zh-l10n@lists.linux.org.tw\n" -"\n" -"Chao-Hsiung Liao , 2003, 05\n" -"Craig Jeffares , 2004\n" -"Joe Man , 2001" - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "無法鎖定螢幕：%s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "不能暫時將螢幕保護程式設為空白畫面：%s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "不能登出：%s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "可使用" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "隱形" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "忙碌" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "離開" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "帳號資訊" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "系統偏好設定" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "鎖定螢幕" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "切換使用者" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "結束…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "使用者切換面板程式" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "改變帳號設定值與狀態" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "用來快速切換使用者的選單" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "使用者切換程式" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "使用者切換面板程式工廠" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "編輯個人資料(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "關於(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "編輯使用者與羣組(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "只支援 VERSION 指令" @@ -1094,15 +943,143 @@ msgid "Unable to start new display" msgstr "無法啟動新的顯示畫面" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "拍下截圖" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "照下螢幕的圖片" +#~ msgid "Shutdown Options…" +#~ msgstr "關機選項…" + +#~ msgid "Keyboard layouts" +#~ msgstr "鍵盤配置" + +#~ msgid "_Keyboard:" +#~ msgstr "鍵盤(_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "其他…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "從完整的可用鍵盤配置清單中選擇鍵盤配置。" + +#~ msgid "Keyboard" +#~ msgstr "鍵盤" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "目前選取的鍵盤配置" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "設定預設在登入視窗中顯示鍵盤配置的清單。" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "使用者切換程式是自由軟體，您可以遵照自由軟體基金會 (Free Software " +#~ "Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第" +#~ "二版來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。" + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "發布這一程式的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含" +#~ "的擔保。更詳細的情況請參閱 GNU 通用公共許可證。" + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信" +#~ "給： the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " +#~ "Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "用來快速切換使用者的選單。" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "如對翻譯有任何意見，請送一封電子郵件給\n" +#~ "以下地址，GNOME 翻譯團隊會盡快回覆您：\n" +#~ "zh-l10n@lists.linux.org.tw\n" +#~ "\n" +#~ "Chao-Hsiung Liao , 2003, 05\n" +#~ "Craig Jeffares , 2004\n" +#~ "Joe Man , 2001" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "無法鎖定螢幕：%s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "不能暫時將螢幕保護程式設為空白畫面：%s" + +#~ msgid "Can't log out: %s" +#~ msgstr "不能登出：%s" + +#~ msgid "Available" +#~ msgstr "可使用" + +#~ msgid "Invisible" +#~ msgstr "隱形" + +#~ msgid "Busy" +#~ msgstr "忙碌" + +#~ msgid "Away" +#~ msgstr "離開" + +#~ msgid "Account Information" +#~ msgstr "帳號資訊" + +#~ msgid "System Preferences" +#~ msgstr "系統偏好設定" + +#~ msgid "Lock Screen" +#~ msgstr "鎖定螢幕" + +#~ msgid "Switch User" +#~ msgstr "切換使用者" + +#~ msgid "Quit…" +#~ msgstr "結束…" + +#~ msgid "User Switch Applet" +#~ msgstr "使用者切換面板程式" + +#~ msgid "Change account settings and status" +#~ msgstr "改變帳號設定值與狀態" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "用來快速切換使用者的選單" + +#~ msgid "User Switcher" +#~ msgstr "使用者切換程式" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "使用者切換面板程式工廠" + +#~ msgid "Edit Personal _Information" +#~ msgstr "編輯個人資訊(_I)" + +#~ msgid "_About" +#~ msgstr "關於(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "編輯使用者與群組(_E)" + #~ msgid "Unknown" #~ msgstr "不明" diff -Nru gdm-2.32.1/po/zh_TW.po gdm-3.0.0/po/zh_TW.po --- gdm-2.32.1/po/zh_TW.po 2011-03-07 17:40:37.000000000 +0000 +++ gdm-3.0.0/po/zh_TW.po 2011-04-04 14:37:16.000000000 +0000 @@ -12,11 +12,11 @@ # msgid "" msgstr "" -"Project-Id-Version: gdm2 2.32.0\n" +"Project-Id-Version: gdm 2.91.92\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-12 19:46+0800\n" -"PO-Revision-Date: 2010-10-16 12:00+0800\n" -"Last-Translator: Wei-Lun Chao \n" +"POT-Creation-Date: 2011-03-24 18:41+0800\n" +"PO-Revision-Date: 2011-03-24 08:44+0800\n" +"Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: \n" "MIME-Version: 1.0\n" @@ -49,28 +49,28 @@ msgid "could not find user \"%s\" on system" msgstr "在系統中找不到使用者「%s」" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258 +#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 msgid "Unable to initialize login system" msgstr "無法初始化登入系統" -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294 +#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 msgid "Unable to authenticate user" msgstr "無法驗證使用者" -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351 +#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 msgid "Unable to authorize user" msgstr "無法驗證使用者" -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480 +#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 msgid "Unable to establish credentials" msgstr "無法建立證書" -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510 +#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 msgid "Unable to open session" msgstr "無法開啟作業階段" -#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1196 +#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 +#: ../daemon/gdm-simple-slave.c:1366 msgid "" "Could not start the X server (your graphical environment) due to an internal " "error. Please contact your system administrator or check your syslog to " @@ -91,17 +91,17 @@ msgstr "伺服器應以使用者 %s 的身分衍生，但該使用者不存在" #: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618 +#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 #, c-format msgid "Couldn't set groupid to %d" msgstr "無法設定 groupid 為 %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604 +#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 #, c-format msgid "initgroups () failed for %s" msgstr "%s 的 initgroups () 失敗。" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610 +#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 #, c-format msgid "Couldn't set userid to %d" msgstr "無法設定 userid 為 %d" @@ -151,71 +151,71 @@ msgid "The display device" msgstr "顯示裝置" -#: ../daemon/gdm-session-worker.c:1310 +#: ../daemon/gdm-session-worker.c:1066 #, c-format -msgid "error initiating conversation with authentication system: %s" -msgstr "驗證系統初始化交談發生錯誤：%s" +msgid "error initiating conversation with authentication system - %s" +msgstr "驗證系統初始化交談發生錯誤 - %s" -#: ../daemon/gdm-session-worker.c:1311 +#: ../daemon/gdm-session-worker.c:1067 msgid "general failure" msgstr "一般性失敗" -#: ../daemon/gdm-session-worker.c:1312 +#: ../daemon/gdm-session-worker.c:1068 msgid "out of memory" msgstr "記憶體耗盡" -#: ../daemon/gdm-session-worker.c:1313 +#: ../daemon/gdm-session-worker.c:1069 msgid "application programmer error" msgstr "應用程式錯誤" -#: ../daemon/gdm-session-worker.c:1314 +#: ../daemon/gdm-session-worker.c:1070 msgid "unknown error" msgstr "不明的錯誤" -#: ../daemon/gdm-session-worker.c:1321 +#: ../daemon/gdm-session-worker.c:1077 msgid "Username:" msgstr "使用者名稱:" -#: ../daemon/gdm-session-worker.c:1327 +#: ../daemon/gdm-session-worker.c:1083 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "以首選的使用者名稱提示通知驗證系統時發生錯誤： %s" -#: ../daemon/gdm-session-worker.c:1341 +#: ../daemon/gdm-session-worker.c:1097 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "以使用者的主機名稱通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1356 +#: ../daemon/gdm-session-worker.c:1112 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "以使用者的主控臺通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1369 +#: ../daemon/gdm-session-worker.c:1125 #, c-format msgid "error informing authentication system of display string: %s" msgstr "以顯示字串通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1384 +#: ../daemon/gdm-session-worker.c:1140 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "以顯示 xauth 證書通知驗證系統時發生錯誤：%s" -#: ../daemon/gdm-session-worker.c:1681 ../daemon/gdm-session-worker.c:1698 +#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 #, c-format msgid "no user account available" msgstr "沒有可用的使用者帳號" -#: ../daemon/gdm-session-worker.c:1725 +#: ../daemon/gdm-session-worker.c:1506 msgid "Unable to change to user" msgstr "無法改變為使用者" -#: ../daemon/gdm-welcome-session.c:548 +#: ../daemon/gdm-welcome-session.c:549 #, c-format msgid "User %s doesn't exist" msgstr "使用者 %s 不存在" -#: ../daemon/gdm-welcome-session.c:555 +#: ../daemon/gdm-welcome-session.c:556 #, c-format msgid "Group %s doesn't exist" msgstr "群組 %s 不存在" @@ -438,7 +438,7 @@ msgstr "AT-SPI 註冊表包裹器" #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1648 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 msgid "Login Window" msgstr "登入畫面" @@ -450,6 +450,10 @@ msgid "Power management daemon" msgstr "電源管理伺服程式" +#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 +msgid "GNOME Session Acceleration Checker" +msgstr "GNOME 作業階段加速檢查程式" + #: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 msgid "GNOME Settings Daemon" msgstr "GNOME 設定值伺服程式" @@ -486,7 +490,7 @@ msgid "PolicyKit Authentication Agent" msgstr "PolicyKit 驗證代理程式" -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 +#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "選擇系統" @@ -498,35 +502,35 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP：無法讀取 XDMCP 標頭！" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "數值" -#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251 +#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 msgid "percentage of time complete" msgstr "完成時間百分比" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1469 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 msgid "Inactive Text" msgstr "未使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1470 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" msgstr "若使用者尚未挑選任何項目，要在標籤中使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1478 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" msgstr "使用中的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1479 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" msgstr "若使用者已挑選某個項目，要在標籤中使用的文字" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1488 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" msgstr "清單可見性" -#: ../gui/simple-greeter/gdm-chooser-widget.c:1489 +#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 msgid "Whether the chooser list is visible" msgstr "是否顯示選擇程式清單" @@ -558,65 +562,69 @@ msgid "%a %l:%M %p" msgstr "%a %p %l:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:290 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 msgid "Automatically logging in…" msgstr "正在自動登入…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:576 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 msgid "Select language and click Log In" msgstr "選擇語言並按下「登入」" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:694 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 msgid "Cancelling…" msgstr "正在取消…" +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +msgctxt "customsession" +msgid "Custom" +msgstr "自訂" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +msgid "Custom session" +msgstr "自訂作業階段" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 +msgid "Cancel" +msgstr "取消" + +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "電腦名稱" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 msgid "Login" msgstr "登入" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "解鎖" -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Version" msgstr "版本" -#: ../gui/simple-greeter/gdm-greeter-panel.c:738 -msgid "Panel" -msgstr "面板" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:803 -msgid "Shutdown Options…" -msgstr "關機選項…" - -#: ../gui/simple-greeter/gdm-greeter-panel.c:825 +#: ../gui/simple-greeter/gdm-greeter-panel.c:907 msgid "Suspend" msgstr "暫停" -#: ../gui/simple-greeter/gdm-greeter-panel.c:830 +#: ../gui/simple-greeter/gdm-greeter-panel.c:912 msgid "Restart" msgstr "重新啟動" -#: ../gui/simple-greeter/gdm-greeter-panel.c:834 +#: ../gui/simple-greeter/gdm-greeter-panel.c:916 msgid "Shut Down" msgstr "關閉電腦" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1109 -msgctxt "customsession" -msgid "Custom" -msgstr "自訂" +#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +msgid "Unknown time remaining" +msgstr "剩餘時間不明" -#: ../gui/simple-greeter/gdm-greeter-panel.c:1110 -msgid "Custom session" -msgstr "自訂作業階段" +#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +msgid "Panel" +msgstr "面板" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201 +#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 msgid "Languages" msgstr "語言" @@ -644,35 +652,10 @@ msgid "Language" msgstr "語言" -#: ../gui/simple-greeter/gdm-languages.c:698 +#: ../gui/simple-greeter/gdm-languages.c:709 msgid "Unspecified" msgstr "未指定" -#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191 -msgid "Keyboard layouts" -msgstr "鍵盤配置" - -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202 -#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203 -msgid "_Keyboard:" -msgstr "鍵盤(_K):" - -#. translators: This brings up a dialog of -#. * available keyboard layouts -#. -#: ../gui/simple-greeter/gdm-layout-option-widget.c:223 -msgctxt "keyboard" -msgid "Other…" -msgstr "其他…" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:224 -msgid "Choose a keyboard layout from the full list of available layouts." -msgstr "從完整的可用鍵盤配置清單中選擇鍵盤配置。" - -#: ../gui/simple-greeter/gdm-layout-option-widget.c:254 -msgid "Keyboard" -msgstr "鍵盤" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "標籤文字" @@ -764,81 +747,72 @@ msgstr "給歡迎標誌使用的圖示名稱" #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected keyboard layouts" -msgstr "目前選取的鍵盤配置" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Recently selected languages" msgstr "目前選取的語言" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "" -"Set to a list of keyboard layouts to be shown by default in the login window." -msgstr "設定預設在登入視窗中顯示鍵盤配置的清單。" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 msgid "Set to a list of languages to be shown by default in the login window." msgstr "設定預設在登入視窗中顯示語言的清單。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 msgid "Set to the themed icon name to use for the greeter logo." msgstr "設定用於歡迎標誌的主題圖示名稱。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 msgid "Set to true to disable showing known users in the login window." msgstr "設為 true 則不在登入視窗中顯示已知的使用者。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "設為 true 則不在登入視窗中顯示重新啟動按鈕。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 msgid "Set to true to enable the XRandR settings manager plugin." msgstr "設為 true 則啟用 XRandR 設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 msgid "Set to true to enable the background settings manager plugin." msgstr "設為 true 則啟用背景設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 msgid "Set to true to enable the media-keys settings manager plugin." msgstr "設為 true 則啟用媒體按鍵設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 msgid "Set to true to enable the on-screen keyboard." msgstr "設為 true 則啟用螢幕鍵盤。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 msgid "" "Set to true to enable the plugin to manage the accessibility keyboard " "settings." msgstr "設為 true 則啟用設定管理鍵盤無障礙功能設定值的外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 msgid "Set to true to enable the screen magnifier." msgstr "設為 true 則啟用螢幕放大鏡。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 msgid "Set to true to enable the screen reader." msgstr "設為 true 則啟用螢幕閱讀器。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 msgid "Set to true to enable the sound settings manager plugin." msgstr "設為 true 則啟用音效設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 msgid "Set to true to enable the xsettings settings manager plugin." msgstr "設為 true 則啟用 xsettings 設定管理外掛程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 msgid "Set to true to show the banner message text." msgstr "設為 true 則顯示橫幅訊息文字。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 msgid "Set to true to use Compiz as the window manager." msgstr "設為 true 則使用 Compiz 作為視窗管理程式。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 msgid "" "Text banner message to show in the login window when the user chooser is " "empty, instead of banner_message_text." @@ -846,31 +820,31 @@ "當選擇程式是空的時要顯示於登入視窗的文字橫幅訊息，用來取代 " "banner_message_text。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 msgid "Text banner message to show in the login window." msgstr "要顯示於登入視窗的文字橫幅訊息。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 msgid "True if the XRandR settings manager plugin is enabled." msgstr "若啟用 XRandR 設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 msgid "True if the background settings manager plugin is enabled." msgstr "若啟用背景設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 msgid "True if the media-keys settings manager plugin is enabled." msgstr "若啟用媒體按鍵設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 msgid "True if the sound settings manager plugin is enabled." msgstr "若啟用音效設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 msgid "True if the xsettings settings manager plugin is enabled." msgstr "若啟用 xsettings 設定管理外掛程式則為 True。" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36 +#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 msgid "Use Compiz as the window manager" msgstr "使用 Compiz 作為視窗管理程式" @@ -898,8 +872,8 @@ msgid "Whether the timer is currently ticking" msgstr "計時器現在是否在計時" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:484 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 #, c-format msgid "Log in as %s" msgstr "以 %s 身分登入" @@ -909,168 +883,35 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgctxt "user" msgid "Other…" msgstr "其他…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 msgid "Choose a different account" msgstr "選擇不同的帳號" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Guest" msgstr "訪客" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 msgid "Log in as a temporary guest" msgstr "以臨時訪客的身分登入" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatic Login" msgstr "自動登入" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 msgid "Automatically log into the system after selecting options" msgstr "在選取選項後自動登入系統" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:996 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 msgid "Currently logged in" msgstr "現在已經登入" -#: ../gui/user-switch-applet/applet.c:163 -msgid "" -"The User Switch Applet 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." -msgstr "" -"使用者切換程式是自由軟體，您可以遵照自由軟體基金會 (Free Software " -"Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版" -"來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。" - -#: ../gui/user-switch-applet/applet.c:167 -msgid "" -"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." -msgstr "" -"發布這一程式的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的" -"擔保。更詳細的情況請參閱 GNU 通用公共許可證。" - -#: ../gui/user-switch-applet/applet.c:171 -msgid "" -"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 " -msgstr "" -"您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給： " -"the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " -"MA 02110-1301, USA " - -#: ../gui/user-switch-applet/applet.c:185 -msgid "A menu to quickly switch between users." -msgstr "用來快速切換使用者的選單。" - -#: ../gui/user-switch-applet/applet.c:189 -msgid "translator-credits" -msgstr "" -"如對翻譯有任何意見，請送一封電子郵件給\n" -"以下地址，GNOME 翻譯團隊會盡快回覆您：\n" -"zh-l10n@lists.linux.org.tw\n" -"\n" -"Chao-Hsiung Liao , 2003, 05\n" -"Craig Jeffares , 2004\n" -"Joe Man , 2001" - -#: ../gui/user-switch-applet/applet.c:665 -#: ../gui/user-switch-applet/applet.c:794 -#: ../gui/user-switch-applet/applet.c:836 -#, c-format -msgid "Can't lock screen: %s" -msgstr "無法鎖定螢幕：%s" - -#: ../gui/user-switch-applet/applet.c:687 -#, c-format -msgid "Can't temporarily set screensaver to blank screen: %s" -msgstr "不能暫時將螢幕保護程式設為空白畫面：%s" - -#: ../gui/user-switch-applet/applet.c:895 -#, c-format -msgid "Can't log out: %s" -msgstr "不能登出：%s" - -#: ../gui/user-switch-applet/applet.c:979 -msgid "Available" -msgstr "可使用" - -#: ../gui/user-switch-applet/applet.c:980 -msgid "Invisible" -msgstr "隱形" - -#: ../gui/user-switch-applet/applet.c:981 -msgid "Busy" -msgstr "忙碌" - -#: ../gui/user-switch-applet/applet.c:982 -msgid "Away" -msgstr "離開" - -#: ../gui/user-switch-applet/applet.c:1128 -msgid "Account Information" -msgstr "帳號資訊" - -#: ../gui/user-switch-applet/applet.c:1140 -msgid "System Preferences" -msgstr "系統偏好設定" - -#: ../gui/user-switch-applet/applet.c:1154 -msgid "Lock Screen" -msgstr "鎖定螢幕" - -#. Only show if not locked down -#: ../gui/user-switch-applet/applet.c:1165 -msgid "Switch User" -msgstr "切換使用者" - -#. Only show switch user if there are other users -#: ../gui/user-switch-applet/applet.c:1176 -msgid "Quit…" -msgstr "結束…" - -#: ../gui/user-switch-applet/applet.c:1422 -msgid "User Switch Applet" -msgstr "使用者切換面板程式" - -#: ../gui/user-switch-applet/applet.c:1437 -msgid "Change account settings and status" -msgstr "改變帳號設定值與狀態" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 -msgid "A menu to quickly switch between users" -msgstr "用來快速切換使用者的選單" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 -msgid "User Switcher" -msgstr "使用者切換程式" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 -msgid "User Switcher Applet Factory" -msgstr "使用者切換面板程式工廠" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 -msgid "Edit Personal _Information" -msgstr "編輯個人資訊(_I)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 -msgid "_About" -msgstr "關於(_A)" - -#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 -msgid "_Edit Users and Groups" -msgstr "編輯使用者與群組(_E)" - #: ../utils/gdmflexiserver.c:61 msgid "Only the VERSION command is supported" msgstr "只支援 VERSION 指令" @@ -1106,15 +947,143 @@ msgid "Unable to start new display" msgstr "無法啟動新的顯示畫面" -#: ../utils/gdm-screenshot.c:216 +#: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "拍下截圖" #. Option parsing -#: ../utils/gdm-screenshot.c:283 +#: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" msgstr "照下螢幕的圖片" +#~ msgid "Shutdown Options…" +#~ msgstr "關機選項…" + +#~ msgid "Keyboard layouts" +#~ msgstr "鍵盤配置" + +#~ msgid "_Keyboard:" +#~ msgstr "鍵盤(_K):" + +#~ msgctxt "keyboard" +#~ msgid "Other…" +#~ msgstr "其他…" + +#~ msgid "Choose a keyboard layout from the full list of available layouts." +#~ msgstr "從完整的可用鍵盤配置清單中選擇鍵盤配置。" + +#~ msgid "Keyboard" +#~ msgstr "鍵盤" + +#~ msgid "Recently selected keyboard layouts" +#~ msgstr "目前選取的鍵盤配置" + +#~ msgid "" +#~ "Set to a list of keyboard layouts to be shown by default in the login " +#~ "window." +#~ msgstr "設定預設在登入視窗中顯示鍵盤配置的清單。" + +#~ msgid "" +#~ "The User Switch Applet 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." +#~ msgstr "" +#~ "使用者切換程式是自由軟體，您可以遵照自由軟體基金會 (Free Software " +#~ "Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第" +#~ "二版來修改和重新發布這一程式，或者自由選擇使用任何更新的版本。" + +#~ msgid "" +#~ "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." +#~ msgstr "" +#~ "發布這一程式的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含" +#~ "的擔保。更詳細的情況請參閱 GNU 通用公共許可證。" + +#~ msgid "" +#~ "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 " +#~ msgstr "" +#~ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信" +#~ "給： the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " +#~ "Boston, MA 02110-1301, USA " + +#~ msgid "A menu to quickly switch between users." +#~ msgstr "用來快速切換使用者的選單。" + +#~ msgid "translator-credits" +#~ msgstr "" +#~ "如對翻譯有任何意見，請送一封電子郵件給\n" +#~ "以下地址，GNOME 翻譯團隊會盡快回覆您：\n" +#~ "zh-l10n@lists.linux.org.tw\n" +#~ "\n" +#~ "Chao-Hsiung Liao , 2003, 05\n" +#~ "Craig Jeffares , 2004\n" +#~ "Joe Man , 2001" + +#~ msgid "Can't lock screen: %s" +#~ msgstr "無法鎖定螢幕：%s" + +#~ msgid "Can't temporarily set screensaver to blank screen: %s" +#~ msgstr "不能暫時將螢幕保護程式設為空白畫面：%s" + +#~ msgid "Can't log out: %s" +#~ msgstr "不能登出：%s" + +#~ msgid "Available" +#~ msgstr "可使用" + +#~ msgid "Invisible" +#~ msgstr "隱形" + +#~ msgid "Busy" +#~ msgstr "忙碌" + +#~ msgid "Away" +#~ msgstr "離開" + +#~ msgid "Account Information" +#~ msgstr "帳號資訊" + +#~ msgid "System Preferences" +#~ msgstr "系統偏好設定" + +#~ msgid "Lock Screen" +#~ msgstr "鎖定螢幕" + +#~ msgid "Switch User" +#~ msgstr "切換使用者" + +#~ msgid "Quit…" +#~ msgstr "結束…" + +#~ msgid "User Switch Applet" +#~ msgstr "使用者切換面板程式" + +#~ msgid "Change account settings and status" +#~ msgstr "改變帳號設定值與狀態" + +#~ msgid "A menu to quickly switch between users" +#~ msgstr "用來快速切換使用者的選單" + +#~ msgid "User Switcher" +#~ msgstr "使用者切換程式" + +#~ msgid "User Switcher Applet Factory" +#~ msgstr "使用者切換面板程式工廠" + +#~ msgid "Edit Personal _Information" +#~ msgstr "編輯個人資訊(_I)" + +#~ msgid "_About" +#~ msgstr "關於(_A)" + +#~ msgid "_Edit Users and Groups" +#~ msgstr "編輯使用者與群組(_E)" + #~ msgid "Unknown" #~ msgstr "不明" diff -Nru gdm-2.32.1/tests/Makefile.in gdm-3.0.0/tests/Makefile.in --- gdm-2.32.1/tests/Makefile.in 2011-03-28 16:55:37.000000000 +0000 +++ gdm-3.0.0/tests/Makefile.in 2011-04-04 14:39:29.000000000 +0000 @@ -39,8 +39,11 @@ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -102,8 +105,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@ diff -Nru gdm-2.32.1/utils/gdmflexiserver.c gdm-3.0.0/utils/gdmflexiserver.c --- gdm-2.32.1/utils/gdmflexiserver.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/utils/gdmflexiserver.c 2011-04-04 14:37:16.000000000 +0000 @@ -116,7 +116,7 @@ screen = gdk_screen_get_default (); - if (! gdk_spawn_command_line_on_screen (screen, command, &error)) { + if (! g_spawn_command_line_async (command, &error)) { g_warning ("Cannot lock screen: %s", error->message); g_error_free (error); } @@ -125,7 +125,7 @@ if (! use_gscreensaver) { command = g_strdup ("xscreensaver-command -throttle"); - if (! gdk_spawn_command_line_on_screen (screen, command, &error)) { + if (! g_spawn_command_line_async (command, &error)) { g_warning ("Cannot disable screensaver engines: %s", error->message); g_error_free (error); } diff -Nru gdm-2.32.1/utils/gdm-screenshot.c gdm-3.0.0/utils/gdm-screenshot.c --- gdm-2.32.1/utils/gdm-screenshot.c 2011-03-28 16:48:50.000000000 +0000 +++ gdm-3.0.0/utils/gdm-screenshot.c 2011-04-04 14:37:16.000000000 +0000 @@ -57,8 +57,8 @@ gboolean result = FALSE; selection_atom = gdk_x11_get_xatom_by_name (SELECTION_NAME); - XGrabServer (GDK_DISPLAY ()); - if (XGetSelectionOwner (GDK_DISPLAY(), selection_atom) != None) { + XGrabServer (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + if (XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), selection_atom) != None) { goto out; } @@ -81,7 +81,7 @@ result = TRUE; out: - XUngrabServer (GDK_DISPLAY ()); + XUngrabServer (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); gdk_flush (); return result; @@ -114,13 +114,13 @@ int width; int height; - window = gdk_window_foreign_new (w); + window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), w); if (window == NULL) { return NULL; } - root = gdk_window_foreign_new (GDK_ROOT_WINDOW ()); - gdk_drawable_get_size (window, &real_width, &real_height); + root = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), GDK_ROOT_WINDOW ()); + gdk_window_get_geometry (window, NULL, NULL, &real_width, &real_height); gdk_window_get_origin (window, &x_real_orig, &y_real_orig); x_orig = x_real_orig; @@ -144,15 +144,11 @@ height = gdk_screen_height () - y_orig; } - screenshot = gdk_pixbuf_get_from_drawable (NULL, - root, - NULL, - x_orig, - y_orig, - 0, - 0, - width, - height); + screenshot = gdk_pixbuf_get_from_window (root, + x_orig, + y_orig, + width, + height); return screenshot; } diff -Nru gdm-2.32.1/utils/Makefile.in gdm-3.0.0/utils/Makefile.in --- gdm-2.32.1/utils/Makefile.in 2011-03-28 16:55:37.000000000 +0000 +++ gdm-3.0.0/utils/Makefile.in 2011-04-04 14:39:29.000000000 +0000 @@ -39,8 +39,11 @@ subdir = utils DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -99,8 +102,6 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ AT_BINDIR = @AT_BINDIR@ AT_SPI_REGISTRYD_DIR = @AT_SPI_REGISTRYD_DIR@